diff options
Diffstat (limited to 'doc/bugs/git-annex_smudge_fails_on_git_add')
8 files changed, 0 insertions, 148 deletions
diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_1_000d614d4dde9f2d8776155a3f7c94f2._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_1_000d614d4dde9f2d8776155a3f7c94f2._comment deleted file mode 100644 index 50976d1ff..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_1_000d614d4dde9f2d8776155a3f7c94f2._comment +++ /dev/null @@ -1,8 +0,0 @@ -[[!comment format=mdwn - username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077" - nickname="j_k_234" - subject="comment 1" - date="2016-04-10T13:47:30Z" - content=""" -Tried this on a debian stretch machine and it works fine, so it's to do with the local build on the jessie machine. I tried outtng the binary into `/usr/bin` but that didn't help. -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_2_9e9d4ff9dd5fc083d8a86595912e1191._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_2_9e9d4ff9dd5fc083d8a86595912e1191._comment deleted file mode 100644 index fb6042a89..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_2_9e9d4ff9dd5fc083d8a86595912e1191._comment +++ /dev/null @@ -1,26 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 2""" - date="2016-04-12T17:07:13Z" - content=""" -Since you're trying to use the mimetype feature, have you checked that -your git-annex is built with support for it? Run `git annex version` and -check for "MagicMime" in the build flags. - -Indeed, I'm possitive that's the problem with your build, since the stack -build disables this feature by default. Because it needs libmagic to be -installed, and stack can't install such C libraries and to get a stack -build that works everywhere, it has to be disabled by default. - -So the solution for you is to tell stack to build with the MagicMime build -flag. - -Remaining question is, why is git-annex not displaying an error in this -situation? I tried to replicate it, and it seems to display a nice -error message here: - - joey@darkstar:~/tmp/tt>git add bash - git-annex: bad annex.largefiles configuration: Parse failure: "mimetype" not supported; not built with MagicMime support - error: external filter git-annex smudge --clean %f failed 1 - error: external filter git-annex smudge --clean %f failed -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment deleted file mode 100644 index 58540a707..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_bb9c927b758fa64f999d20ac34558c63._comment +++ /dev/null @@ -1,18 +0,0 @@ -[[!comment format=mdwn - username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077" - nickname="j_k_234" - subject="comment 3" - date="2016-04-13T10:15:03Z" - content=""" -Thanks for the reply. - -I'm pretty sure that I did build with MagicMime support - see the version output on original bug report. - -These are the commands I used to build it: - -```sh - renn:~/git-annex$ git checkout debian/6.20160229-1 - renn:~/git-annex$ sudo aptitude install libmagic-dev - renn:~/git-annex$ stack install --flag git-annex:XMPP --flag git-annex:DBUS --flag git-annex:MagicMime -``` -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_f1c87d7132b0a335a4761098de8afa6d._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_f1c87d7132b0a335a4761098de8afa6d._comment deleted file mode 100644 index a639672b8..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_3_f1c87d7132b0a335a4761098de8afa6d._comment +++ /dev/null @@ -1,21 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 3""" - date="2016-04-13T16:54:01Z" - content=""" -Hmm, so it is enabled. - -So, I guess that the attempt to use the magic database is somehow failing. -Apparently in a way that doesn't cause git-annex to display a useful error -message. - -Can you check what is the behavior if you run: - - git-annex smudge --clean file < file - -That is supposed to output something on stdout, and exit successfuly. -I guess it's probably exiting nonzero, and any output would be helpful to -know. - -It may also be helpful to strace that command. -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_5_44f947f5b1174cf37f4b7f18971d97ca._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_5_44f947f5b1174cf37f4b7f18971d97ca._comment deleted file mode 100644 index c0a9d062d..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_5_44f947f5b1174cf37f4b7f18971d97ca._comment +++ /dev/null @@ -1,10 +0,0 @@ -[[!comment format=mdwn - username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077" - nickname="j_k_234" - subject="comment 5" - date="2016-04-21T09:00:49Z" - content=""" -Running the smudge command manually works. Incidentally, just noticed that running the add command a second time seems to work... - -I ran the command under strace -f and all subprocesses seem to exit with RC=0, but I can see the error message being output. Would you like me to send you the strace output (200k gzipped)? -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_6_237f8b3d8a8d2821a600aae5f5e05bef._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_6_237f8b3d8a8d2821a600aae5f5e05bef._comment deleted file mode 100644 index be806e80f..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_6_237f8b3d8a8d2821a600aae5f5e05bef._comment +++ /dev/null @@ -1,7 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 6""" - date="2016-04-22T20:02:27Z" - content=""" -Sure, email to id@joeyh.name or post a link to the file here. -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_7_dfcc8af09fb7c7658613bd7bb94a7723._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_7_dfcc8af09fb7c7658613bd7bb94a7723._comment deleted file mode 100644 index bf5e62256..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_7_dfcc8af09fb7c7658613bd7bb94a7723._comment +++ /dev/null @@ -1,48 +0,0 @@ -[[!comment format=mdwn - username="joey" - subject="""comment 7""" - date="2016-05-02T14:19:43Z" - content=""" -Relevant parts of the strace: - - [pid 21392] read(0, <unfinished ...> - [pid 21393] <... futex resumed> ) = 0 - [pid 21392] <... read resumed> "\0\0009\214moov\0\0\0lmvhd\0\0\0\0\300\\\26\256\300\\\26\267\0\0\2X"..., 32752) = 32752 - [pid 21392] write(1, "/annex/objects/SHA256E-s2589913-"..., 102 <unfinished...> - [pid 21389] <... read resumed> "/annex/objects/SHA256E-s2589913-"..., 2589913) = 102 - -21392 is git-annex smudge, and 21389 is apparently a thread belonging to git. -This shows git feeding 32752 bytes of content to git-annex smudge on stdin, and -git-annex smudge responding with the annex object. - -Notice that git-annex calculates the actual file size to be 2589913 bytes, more -than git has sent it at the time it replies. It can tell this because it stats -and hashes the actual file. - - [pid 21392] +++ exited with 0 +++ - [pid 21390] write(9, "ml\3\23<\270\315\321s\322\306\341\301e\261\312[<\2\n\17\315\16a\v\245\215(q\207\314\23"..., 2495705) = -1 EPIPE (Broken pipe) - [pid 21390] --- SIGPIPE {si_signo=SIGPIPE, si_code=SI_USER, si_pid=21389, si_uid=2001} --- - [pid 21390] close(9) = 0 - [pid 21390] write(2, "error: cannot feed the input to "..., 76error: cannot feed the input to external filter git-annex smudge --clean %f - -Now git-annex exits, and then git, tries to feed it another 2495705 bytes -of data after it's exited. - -So, it seems that the problem is git-annex is somehow doing a short read of its -stdin, and not waiting for git to feed it the full content. - -And, I see this bug now in the code: - - b <- liftIO $ B.hGetContents stdin - if isJust (parseLinkOrPointer b) - -`parseLinkOrPointer` is careful to *not* look at the whole file content, -so nothing forces the lazy bytestring read to consume all of stdin. -So, if git's writes are broken up as happened in this strace, git-annex -will exit without consuming the whole stdin. - -I've committed a fix along with this comment, so since you're building -from source, and able to reproduce this problem (which I have not -so far been able to reproduce myself) -you should be able to update and rebuild and verify the fix. -"""]] diff --git a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment b/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment deleted file mode 100644 index ad2d32830..000000000 --- a/doc/bugs/git-annex_smudge_fails_on_git_add/comment_8_b1f8142039ebf1f55afe80205bc68804._comment +++ /dev/null @@ -1,10 +0,0 @@ -[[!comment format=mdwn - username="j_k_234@b2b1aa189bf195cefd815fc0fe70e0ebbe2b8077" - nickname="j_k_234" - subject="comment 8" - date="2016-05-03T07:22:52Z" - content=""" -Thanks very much, that fixes it! - -I did have to use the stack `explicit-setup-deps` tweak to rebuild. -"""]] |