diff options
| -rw-r--r-- | Command/Move.hs | 9 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | doc/install/OSX/old_comments/comment_4_d513e21512a9b207983d38abf348d00f._comment | 16 | ||||
| -rw-r--r-- | git-annex.cabal | 2 |
4 files changed, 28 insertions, 5 deletions
diff --git a/Command/Move.hs b/Command/Move.hs index 36242f45c..41daab4b2 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -92,15 +92,16 @@ toPerform dest move key file = moveLock move key $ do ok <- upload (Remote.uuid dest) key (Just file) noRetry $ Remote.storeKey dest key (Just file) if ok - then finish + then finish True else do when fastcheck $ warning "This could have failed because --fast is enabled." stop - Right True -> finish + Right True -> finish False where - finish = do - Remote.logStatus dest key InfoPresent + finish remotechanged = do + when remotechanged $ + Remote.logStatus dest key InfoPresent if move then do whenM (inAnnex key) $ removeAnnex key diff --git a/debian/changelog b/debian/changelog index 57369ff06..c102a3f7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-annex (3.20120925) UNRELEASED; urgency=low + + * copy: Avoid updating the location log when no copy is performed. + + -- Joey Hess <joeyh@debian.org> Mon, 24 Sep 2012 19:58:07 -0400 + git-annex (3.20120924) unstable; urgency=low * assistant: New command, a daemon which does everything watch does, diff --git a/doc/install/OSX/old_comments/comment_4_d513e21512a9b207983d38abf348d00f._comment b/doc/install/OSX/old_comments/comment_4_d513e21512a9b207983d38abf348d00f._comment new file mode 100644 index 000000000..049f7e962 --- /dev/null +++ b/doc/install/OSX/old_comments/comment_4_d513e21512a9b207983d38abf348d00f._comment @@ -0,0 +1,16 @@ +[[!comment format=mdwn + username="https://www.google.com/accounts/o8/id?id=AItOawm_-2XlXNyd6cCLI4n_jaBNqVUOWwJquko" + nickname="David" + subject="installing via homebrew" + date="2012-09-05T11:11:55Z" + content=""" +I had to: + + cabal update + +before: + + cabal install git-annex + + +"""]] diff --git a/git-annex.cabal b/git-annex.cabal index d851cb879..a02505c5f 100644 --- a/git-annex.cabal +++ b/git-annex.cabal @@ -1,5 +1,5 @@ Name: git-annex -Version: 3.20120924 +Version: 3.20120925 Cabal-Version: >= 1.8 License: GPL Maintainer: Joey Hess <joey@kitenet.net> |