{"thread":{"id":"5836","subject":"git show and gitweb gives different result for kernel","startedAt":"2006-10-06T17:56:35Z","lastAt":"2006-10-06T19:08:05Z","messageCount":3,"participants":["Aneesh Kumar K.V","Martin Waitz","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"28307","messageId":"eg65cl$cvs$1@sea.gmane.org","threadId":"5836","inReplyTo":null,"subject":"git show and gitweb gives different result for kernel","fromName":"Aneesh Kumar K.V","fromEmail":"aneesh.kumar@gmail.com","sentAt":"2006-10-06T17:56:35Z","receivedAt":"2006-10-06T17:56:35Z","isPatch":false,"sender":{"key":"aneesh.kumar@gmail.com","avatar":"https://gravatar.com/avatar/0621fc0b2f14ead1e9024382f16053a808c148596da30c1b92572fa075621f68?d=mp&s=160"},"body":"Hi All,\n\n\nhttp://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=363e065c02b1273364d5356711a83e7f548fc0c8\n\ngit show 363e065c02b1273364d5356711a83e7f548fc0c8\n\ngit show  gives the correct values.\n\n-aneesh\n"},{"id":"28313","messageId":"20061006183054.GU2871@admingilde.org","threadId":"5836","inReplyTo":"eg65cl$cvs$1@sea.gmane.org","subject":"Re: git show and gitweb gives different result for kernel","fromName":"Martin Waitz","fromEmail":"tali@admingilde.org","sentAt":"2006-10-06T18:30:55Z","receivedAt":"2006-10-06T18:30:55Z","isPatch":false,"sender":{"key":"tali@admingilde.org","avatar":"https://gravatar.com/avatar/3f89b03eee362187effabe257898735b475673a12265c398ea9161259ae91553?d=mp&s=160"},"body":"hoi :)\n\nOn Fri, Oct 06, 2006 at 11:26:35PM +0530, Aneesh Kumar K.V wrote:\n> http://www.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=363e065c02b1273364d5356711a83e7f548fc0c8\n> \n> git show 363e065c02b1273364d5356711a83e7f548fc0c8\n\nwhat do you mean? the diff?\ngit show uses diff --cc so that only changes which are not in\nthe parent trees are shown.\ngitweb just diffs against the first parent, and this diff is\nlarge in your example because a new upstream Linux kernel\ngot merged into a topic branch.  But it should still be correct.\n\nBut perhaps gitweb should use --cc, too.\n\n-- \nMartin Waitz\n"},{"id":"28319","messageId":"Pine.LNX.4.64.0610061202060.3952@g5.osdl.org","threadId":"5836","inReplyTo":"20061006183054.GU2871@admingilde.org","subject":"Re: git show and gitweb gives different result for kernel","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-10-06T19:08:05Z","receivedAt":"2006-10-06T19:08:05Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 6 Oct 2006, Martin Waitz wrote:\n> \n> But perhaps gitweb should use --cc, too.\n\nBoth have their uses.\n\nFor example, the diff against the first parent is really broken in some \ncases (if a _downstream_ developer synchronizes up with the upstream, the \ndiff ends up being potentially absolutely huge, and most of the time it's \nexactly the wrogn diff to show), but in other cases it's a really \nwonderful diff.\n\nSo for the kernel, the current gitweb behaviour tends to be exactly what \nyou want if it's a merge that I did, especially if it was a smallish \nmerge. \n\nIn contrast, the default for \"git show\" (--cc) always shows something that \nmakes sense, but it's not necessarily going to always be _useful_. It just \nshows the conflicting parts, which is something that is sensible \nregardless of which way the merge went, but it obviously doesn't really \nsay anything about what the real _changes_ were.\n\nSo gitweb often shows what people want it to show, but then at other times \nit shows totally pointless stuff. While --cc always shows something \n\"relevant\" (and often that's the empty set), but it's relevant only in a \nvery specific way: it is about how the merge fixed up data conflicts, and \nthat's not necessarily anything most people are even interested in.\n\nI think it might make sense for gitweb to just have the option to show the \ndiff against any of the parents _or_ to show the conflicting parts (--cc). \nSimply because different people and different uses will have different \nideas of what they find useful.\n\n\t\tLinus\n"}]}