addurl: Fix bug in checking annex.largefiles expressions using largerthan, mimetype...

diff --git a/CHANGELOG b/CHANGELOG
index 3777e6d5ad18644c58cf8ee35c0dc2e5fbe095ab..de1a16fb7dcb62ef5ce0fb0d9fc4a1b072d19c3e 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+git-annex (6.20161119) UNRELEASED; urgency=medium
+
+  * addurl: Fix bug in checking annex.largefiles expressions using
+    largerthan, mimetype, and smallerthan; the first two always failed
+    to match, and the latter always matched.
+
+ -- Joey Hess <id@joeyh.name>  Mon, 21 Nov 2016 11:27:50 -0400
+
 git-annex (6.20161118) unstable; urgency=medium
 
   * git-annex.cabal: Loosen bounds on persistent to allow 2.5, which

diff --git a/Command/AddUrl.hs b/Command/AddUrl.hs
index e32ceb5684242be56ee05be994a589fcf9cea3b1..9b6ac28ea977f5e53d01c03f8275151d30098d74 100644 (file)
--- a/Command/AddUrl.hs
+++ b/Command/AddUrl.hs
@@ -341,7 +341,7 @@ cleanup u url file key mtmp = case mtmp of
        Nothing -> go
        Just tmp -> do
                largematcher <- largeFilesMatcher
-               ifM (checkFileMatcher largematcher file)
+               ifM (checkFileMatcher largematcher tmp)
                        ( go
                        , do
                                liftIO $ renameFile tmp file

diff --git a/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__.mdwn b/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__.mdwn
index 5b9c76e6932a885af0c560f5ba564b37d9e77eb8..7e900facf1fd924f70cb8945c729217d93766614 100644 (file)
--- a/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__.mdwn
+++ b/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__.mdwn
@@ -37,4 +37,4 @@ cached/staged changes:
 """]]
 
 
-
+> [[fixed|done]] --[[Joey]]

diff --git a/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__/comment_1_d598317883753baf02175a3bf866e08a._comment b/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__/comment_1_d598317883753baf02175a3bf866e08a._comment
new file mode 100644 (file)
index 0000000..e03e574
--- /dev/null
+++ b/doc/bugs/adds_file_destined_for_annex_into_git_in___39__addurl__39__/comment_1_d598317883753baf02175a3bf866e08a._comment
@@ -0,0 +1,20 @@
+[[!comment format=mdwn
+ username="joey"
+ subject="""comment 1"""
+ date="2016-11-21T15:12:54Z"
+ content="""
+It's sufficient to have "* annex.largefiles=(largerthan=100kb)"
+in .gitattributes.
+
+Even "* annex.largefiles=(largerthan=0kb)" will reproduce it.
+
+Ok, I see why.. It's running the largefile matcher on the destination file
+before it renames the temp file to it!
+
+Seems to have been broken this way ever since addurl got largefiles
+support. Testing didn't catch it because it only affects largefiles
+expressions that need to examine the file.
+
+Fixed in git. Audited other checkFileMatcher calls for this problem;
+the rest are ok.
+"""]]