{"thread":{"id":"4640","subject":"Is anybody actually using git-cherry.sh?","startedAt":"2006-06-23T16:22:05Z","lastAt":"2006-06-23T20:43:26Z","messageCount":3,"participants":["Johannes Schindelin","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"22365","messageId":"Pine.LNX.4.63.0606231818140.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4640","inReplyTo":null,"subject":"Is anybody actually using git-cherry.sh?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-06-23T16:22:05Z","receivedAt":"2006-06-23T16:22:05Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nfrom git-cherry.sh:\n\n-- snip --\nfor c in $inup\ndo\n        git-diff-tree -p $c\ndone | git-patch-id |\nwhile read id name\ndo\n        echo $name >>$patch/$id\ndone\n-- snap --\n\nAFAICS this _must_ be broken. git-diff-tree -p <ent> does not emit \n\"diff-tree <sha1>\", and neither \"commit <sha1>\" lines. So this code would \nyield just one file, treating all diffs as one huge diff. A quick fix \nwould be this change (without the patch I sent out earlier):\n\n+\techo \"diff-tree $c\"\n \tgit-diff-tree -p $c\n\nAm I wrong?\n\nCiao,\nDscho\n"},{"id":"22367","messageId":"20060623180658.GA24022@coredump.intra.peff.net","threadId":"4640","inReplyTo":"Pine.LNX.4.63.0606231818140.29667@wbgn013.biozentrum.uni-wuerzburg.de","subject":"Re: Is anybody actually using git-cherry.sh?","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2006-06-23T18:06:58Z","receivedAt":"2006-06-23T18:06:58Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Jun 23, 2006 at 06:22:05PM +0200, Johannes Schindelin wrote:\n\n> from git-cherry.sh:\n> \n> -- snip --\n> for c in $inup\n> do\n>         git-diff-tree -p $c\n> done | git-patch-id |\n> while read id name\n> do\n>         echo $name >>$patch/$id\n> done\n> -- snap --\n>\n> AFAICS this _must_ be broken.  git-diff-tree -p <ent> does not emit\n> \"diff-tree <sha1>\", and neither \"commit <sha1>\" lines. So this code\n> would yield just one file, treating all diffs as one huge diff. A\n> quick fix would be this change (without the patch I sent out earlier):\n\nMaybe I don't understand what you're saying, but it works fine here\n(using latest head of master):\n  $ for c in origin origin^; do git-diff-tree -p $c; done | git-patch-id\n  1511e4e276ccc98ecf0ea31dad1bc9010869fdaf f60349aa786d519368938d7b6e5bb2006eccb0cf\n  86ce7eeedd87a78cd8cac79adb6d4d968ece9e53 50f575fc9836704d45a5f732125b8f58103425a4\n\nIt looks like patch-id does a flush whenever a sha1 is found at the\nbeginning of a line; diff-tree lines simply have the 'diff-tree ' part\nignored.\n\n-Peff\n"},{"id":"22372","messageId":"Pine.LNX.4.63.0606232242500.29667@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"4640","inReplyTo":"20060623180658.GA24022@coredump.intra.peff.net","subject":"Re: Is anybody actually using git-cherry.sh?","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-06-23T20:43:26Z","receivedAt":"2006-06-23T20:43:26Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Peff,\n\nOn Fri, 23 Jun 2006, Jeff King wrote:\n\n> It looks like patch-id does a flush whenever a sha1 is found at the \n> beginning of a line; diff-tree lines simply have the 'diff-tree ' part \n> ignored.\n\nAh! Everything makes sense now. Thanks!\n\nCiao,\nDscho\n"}]}