{"thread":{"id":"3459","subject":"git-mailinfo doesn't get installed any more","startedAt":"2006-02-24T20:06:55Z","lastAt":"2006-02-24T20:42:04Z","messageCount":2,"participants":["Tony Luck","Linus Torvalds"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"16703","messageId":"12c511ca0602241206jaea9f75pce4ca687f5b2fd3c@mail.gmail.com","threadId":"3459","inReplyTo":null,"subject":"git-mailinfo doesn't get installed any more","fromName":"Tony Luck","fromEmail":"tony.luck@intel.com","sentAt":"2006-02-24T20:06:55Z","receivedAt":"2006-02-24T20:06:55Z","isPatch":false,"sender":{"key":"tony.luck@intel.com","avatar":"https://avatars.githubusercontent.com/u/5446021?v=4"},"body":"Periodically after I upgrade git I do an \"ls -lrt /usr/local/bin\" to\nfind stray old binaries that aren't part of git anymore.  I was\na bit surprised to see that git-mailinfo had a mod-time a bit\nolder than the rest of git ... and looking at the Makefile it looks\nlike it got dropped in some rearrangement.\n\nTwo things:\n1) Can someone put it back please, git-applymbox is very unhappy\nwithout it.\n\n2) What's the cute 1-line git way to see when this was broken. I'm\nguessing that it involves using a --pickaxe.\n\nThanks\n\n-Tony\n"},{"id":"16707","messageId":"Pine.LNX.4.64.0602241224130.22647@g5.osdl.org","threadId":"3459","inReplyTo":"12c511ca0602241206jaea9f75pce4ca687f5b2fd3c@mail.gmail.com","subject":"Re: git-mailinfo doesn't get installed any more","fromName":"Linus Torvalds","fromEmail":"torvalds@osdl.org","sentAt":"2006-02-24T20:42:04Z","receivedAt":"2006-02-24T20:42:04Z","isPatch":false,"sender":{"key":"torvalds@linux-foundation.org","avatar":"https://avatars.githubusercontent.com/u/1024025?v=4"},"body":"\n\nOn Fri, 24 Feb 2006, Tony Luck wrote:\n> \n> 2) What's the cute 1-line git way to see when this was broken. I'm\n> guessing that it involves using a --pickaxe.\n\nYou've actually found an interesting misfeature in git. There's a merge \nerror, and you can't see it in the diffs by default because it wasn't due \nto a _clashing_ content thing, but two edits that were far enough away \nfrom each other.\n\nThat \"git-mailinfo\" thing is there in rev 2a3763ef, but it's not there in \nthe current Makefile. And doing a\n\n\tgit-whatchanged -p 2a3763ef.. | grep git-mailinfo\n\nresults in nothing. Which is not good.\n\nAnyway, the way to handle that is to do \"git bisect\" (and use \"grep \ngit-mailinfo Makefile\" in between bisection points to see if git-mailinfo \nis still part of the list of programs):\n\n\tgit-bisect start\n\t# bad: [20d23f554d6cd40ffa0d41ccc9416bca867667e0] gitview: Bump the rev\n\tgit-bisect bad 20d23f554d6cd40ffa0d41ccc9416bca867667e0\n\t# good: [2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc] avoid makefile override warning\n\tgit-bisect good 2a3763ef3d26eb38c0a47997b8e5fd2a7c5214cc\n\t# bad: [ee072260dbff6914c24d956bcc2d46882831f1a0] Merge branch 'jc/nostat'\n\tgit-bisect bad ee072260dbff6914c24d956bcc2d46882831f1a0\n\t# good: [551ce28fe1f2777eee7dd9c02bd44f55f4b32361] git-svn: 0.9.1: add --version and copyright/license (GPL v2+) information\n\tgit-bisect good 551ce28fe1f2777eee7dd9c02bd44f55f4b32361\n\t# good: [5508a616631fb41531b638f744bd92c701727014] New test to verify that when git-clone fails it cleans up the new directory.\n\tgit-bisect good 5508a616631fb41531b638f744bd92c701727014\n\t# bad: [712b1dd389ad5bcdbaab0279641f0970702fc1f1] Merge branch 'js/portable'\n\tgit-bisect bad 712b1dd389ad5bcdbaab0279641f0970702fc1f1\n\t# good: [d800795613a710fb18353af53730e75185861f41] gitview: Use monospace font to draw the branch and tag name\n\tgit-bisect good d800795613a710fb18353af53730e75185861f41\n\t# good: [b992933853ccffac85f7e40310167ef7b8f0432e] Fix \"gmake -j\"\n\tgit-bisect good b992933853ccffac85f7e40310167ef7b8f0432e\n\nresulting in:\n\n\t712b1dd389ad5bcdbaab0279641f0970702fc1f1 is first bad commit\n\nwhich shows that there was a bad merge by Junio.\n\nYou can use\n\n\tgit show -c -p 712b1dd389ad5bcdbaab0279641f0970702fc1f1\n\nto see why. It merged the thing perfectly fine, but sadly, incorrectly. \n\nSomebody should probably look at whether we could have done things better, \nbut I suspect that merge errors are inevitable with any automated process.\n\nAnyway, it might be worth remembering that 712b1dd3 merge for future \ntesting. Make a test-case out of it.\n\n\t\tLinus\n"}]}