{"thread":{"id":"25029","subject":"combined diff seems to ignore diff attribute","startedAt":"2010-09-08T00:33:02Z","lastAt":"2010-09-08T04:32:28Z","messageCount":2,"participants":["Jay Soffian","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"150261","messageId":"AANLkTinbaQbS=pU44sSCf7+_3bLrREpehYQCiV5CFuVB@mail.gmail.com","threadId":"25029","inReplyTo":null,"subject":"combined diff seems to ignore diff attribute","fromName":"Jay Soffian","fromEmail":"jaysoffian@gmail.com","sentAt":"2010-09-08T00:33:02Z","receivedAt":"2010-09-08T00:33:02Z","isPatch":false,"sender":{"key":"jaysoffian@gmail.com","avatar":"https://avatars.githubusercontent.com/u/155970?v=4"},"body":"I want to squelch the output of a particular file type because it's\ntoo noisy (Mac OS X xib files). So I added:\n\n*.xib -diff\n\nto .git/info/attributes\n\nwhich works fine except for --cc output. Is this a bug, oversight, or\nmy stupidity?\n\n$ git log -p --cc\ncommit fdffb6081c2c09f55e2fdb6a02905054484965ed\nMerge: 947da38 dcce084\nAuthor: Jay Soffian <jaysoffian@gmail.com>\nDate:   Tue Sep 7 20:28:44 2010 -0400\n\n    Merge branch 'side'\n\n    * side:\n      side\n\n    Conflicts:\n        file.xib\n\ndiff --cc file.xib\nindex 1f7391f,2299c37..0f8f0c9\n--- a/file.xib\n+++ b/file.xib\n@@@ -1,1 -1,1 +1,1 @@@\n- master\n -side\n++master side\n\ncommit dcce0846b493edc0ab4301fae6c3910a6dd31ed8\nAuthor: Jay Soffian <jaysoffian@gmail.com>\nDate:   Tue Sep 7 20:28:17 2010 -0400\n\n    side\n\ndiff --git a/file.xib b/file.xib\nindex e69de29..2299c37 100644\nBinary files a/file.xib and b/file.xib differ\n\ncommit 947da38b8ec84527aa60c0e8bca7279e6b2bb0af\nAuthor: Jay Soffian <jaysoffian@gmail.com>\nDate:   Tue Sep 7 20:28:09 2010 -0400\n\n    master\n\ndiff --git a/file.xib b/file.xib\nindex e69de29..1f7391f 100644\nBinary files a/file.xib and b/file.xib differ\n\ncommit 419c5c0dc0ae4d548227d85ded2d8abc42001720\nAuthor: Jay Soffian <jaysoffian@gmail.com>\nDate:   Tue Sep 7 20:27:49 2010 -0400\n\n    initial\n\ndiff --git a/file.xib b/file.xib\nnew file mode 100644\nindex 0000000..e69de29\n"},{"id":"150276","messageId":"7vvd6gonxf.fsf@alter.siamese.dyndns.org","threadId":"25029","inReplyTo":"AANLkTinbaQbS=pU44sSCf7+_3bLrREpehYQCiV5CFuVB@mail.gmail.com","subject":"Re: combined diff seems to ignore diff attribute","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2010-09-08T04:32:28Z","receivedAt":"2010-09-08T04:32:28Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jay Soffian <jaysoffian@gmail.com> writes:\n\n> which works fine except for --cc output. Is this a bug, oversight, or\n> my stupidity?\n\nIt is \"meh\"; when we wrote -c/--cc we weren't interested in \"-diff\"\nattribute at all.\n\nIt shouldn't be a rocket science to come up with a patch that skips such a\npath before running --cc, I would think.\n"}]}