{"thread":{"id":"31930","subject":"confused by git diff --exit-code","startedAt":"2012-10-24T10:33:21Z","lastAt":"2012-10-24T10:33:21Z","messageCount":1,"participants":["Bogolisk"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"201805","messageId":"loom.20121024T122128-688@post.gmane.org","threadId":"31930","inReplyTo":null,"subject":"confused by git diff --exit-code","fromName":"Bogolisk","fromEmail":"bogolisk@gmail.com","sentAt":"2012-10-24T10:33:21Z","receivedAt":"2012-10-24T10:33:21Z","isPatch":false,"sender":{"key":"bogolisk@gmail.com","avatar":null},"body":"With merge conflicts in the work-tree, diff's exit-code seems inconsistent. I \nthought --quiet implied --exit-code\n\n\n/others/foo$ git diff --quiet\n/others/foo$ echo $?\n1\n\n/others/foo$ git diff --exit-code\ndiff --cc foo.txt\nindex f3dc283,bea67fd..0000000\n--- a/foo.txt\n+++ b/foo.txt\n/others/foo$ echo $?\n0\n\n/others/foo$ git diff --cc --quiet\n/others/foo$ echo $?\n0\n\n/others/foo$ git diff --cc --exit-code\ndiff --cc foo.txt\nindex f3dc283,bea67fd..0000000\n--- a/foo.txt\n+++ b/foo.txt\n/others/foo$ echo $?\n0\n"}]}