diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-07-20 15:22:55 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-07-20 15:23:43 -0400 |
| commit | 258a3356e6461e0164441bb3a3e202cb9ef889e6 (patch) | |
| tree | f198f34aaedeffb1af624f918a214527b066175a /Annex | |
| parent | e97cd57e1ac72d5a240852704ebaf92716fcad94 (diff) | |
--branch, stage 2
Show branch:file that is being operated on.
I had to make ActionItem a type and not a type class because
withKeyOptions' passed two different types of values when using the type
class, and I could not get the type checker to accept that.
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Drop.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Annex/Drop.hs b/Annex/Drop.hs index 000e4f84a..cd0168a9f 100644 --- a/Annex/Drop.hs +++ b/Annex/Drop.hs @@ -117,10 +117,10 @@ handleDropsFrom locs rs reason fromhere key afile preverified runner = do ) dropl fs n = checkdrop fs n Nothing $ \numcopies -> - Command.Drop.startLocal afile numcopies key preverified + Command.Drop.startLocal afile (mkActionItem afile) numcopies key preverified dropr fs r n = checkdrop fs n (Just $ Remote.uuid r) $ \numcopies -> - Command.Drop.startRemote afile numcopies key r + Command.Drop.startRemote afile (mkActionItem afile) numcopies key r slocs = S.fromList locs |