{"thread":{"id":"10094","subject":"GIT_EXTERNAL_DIFF ignored after unstashing conflicts","startedAt":"2007-09-30T19:18:39Z","lastAt":"2007-09-30T19:18:39Z","messageCount":1,"participants":["Bruno Haible"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"54420","messageId":"200709302118.39406.bruno@clisp.org","threadId":"10094","inReplyTo":null,"subject":"GIT_EXTERNAL_DIFF ignored after unstashing conflicts","fromName":"Bruno Haible","fromEmail":"bruno@clisp.org","sentAt":"2007-09-30T19:18:39Z","receivedAt":"2007-09-30T19:18:39Z","isPatch":false,"sender":{"key":"bruno@clisp.org","avatar":null},"body":"Hi,\n\n\"git diff\" ignores the GIT_EXTERNAL_DIFF variable in a particular situation:\nwhen there are conflicts after \"git stash apply\".\n\nTo reproduce:\n  - Set environment variable GIT_EXTERNAL_DIFF to point to the attached\n    script.\n  - Make a clean gnulib checkout, 1 day old.\n  - Add a entry to the top of the ChangeLog.\n  - $ git pull\n    fails due a conflict.\n  - $ git stash\n  - $ git pull\n  - $ git stash apply\n  - $ git-diff | cat\n    yields:\ndiff --cc ChangeLog\nindex 443ad76,991c26b..0000000\n--- a/ChangeLog\n+++ b/ChangeLog\n@@@ -1,7 -1,6 +1,11 @@@\n  2007-09-30  Bruno Haible  <bruno@clisp.org>\n  \n++<<<<<<< Updated upstream:ChangeLog\n +      * tests/test-getaddrinfo.c (AF_UNSPEC): Provide a fallback definition.\n +      Needed on BeOS.\n++=======\n+       * Some other changes.\n++>>>>>>> Stashed changes:ChangeLog\n  \n  2007-09-30  Bruno Haible  <bruno@clisp.org>\n  \n\nThe script has not been called (witness: the echo command at its line 2).\n\nCan it be called, like in the case of \"git-diff --cached\"?\n\nBruno\n"}]}