{"thread":{"id":"43553","subject":"[PATCH] gitk: pass --no-left-right to rev-list","startedAt":"2006-12-19T10:05:35Z","lastAt":"2006-12-19T10:47:41Z","messageCount":3,"participants":["Jeff King","Johannes Schindelin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"295457","messageId":"20061219100534.GA9206@coredump.intra.peff.net","threadId":"43553","inReplyTo":null,"subject":"[PATCH] gitk: pass --no-left-right to rev-list","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2006-12-19T10:05:35Z","receivedAt":"2006-12-19T10:05:35Z","isPatch":true,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"Now that rev-list does left-right marking by default on symmetric\ndifferences, command lines like this:\n  gitk master...origin\nproduce an error.\n\nSigned-off-by: Jeff King <peff@peff.net>\n---\nI think there are three fixes:\n  1. this patch (avoid using left-right)\n  2. gitk can detect and parse the new format\n  3. revert automatic use of left-right\nThe third makes the most sense to me.\n\nPeople do use symmetric difference with various porcelains. For example,\nI typically carry a few local patches in 'master'. My daily\nsit-down-with-git workflow is:\n  git-fetch\n  gitk master...origin\n  git-rebase origin\nwhere the second step gives me a nice graph of what's new and which\npatches I'm still carrying.\n\nThat means that porcelains which use git-rev-list are _all_ going to\nbreak.\n\n gitk |    2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/gitk b/gitk\nindex 3dabc69..ec61a37 100755\n--- a/gitk\n+++ b/gitk\n@@ -33,7 +33,7 @@ proc start_rev_list {view} {\n \tset order \"--date-order\"\n     }\n     if {[catch {\n-\tset fd [open [concat | git rev-list --header $order \\\n+\tset fd [open [concat | git rev-list --no-left-right --header $order \\\n \t\t\t  --parents --boundary --default HEAD $args] r]\n     } err]} {\n \tputs stderr \"Error executing git rev-list: $err\"\n-- \n"},{"id":"298251","messageId":"7vac1krxgw.fsf@assigned-by-dhcp.cox.net","threadId":"43553","inReplyTo":"20061219100534.GA9206@coredump.intra.peff.net","subject":"Re: [PATCH] gitk: pass --no-left-right to rev-list","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-12-19T10:28:31Z","receivedAt":"2006-12-19T10:28:31Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King <peff@peff.net> writes:\n\n> I think there are three fixes:\n>   1. this patch (avoid using left-right)\n>   2. gitk can detect and parse the new format\n>   3. revert automatic use of left-right\n> The third makes the most sense to me.\n\n1. has the problem that it requires the version of Porcelains\nand the core to be tightly linked.  2. is nice but unnecessary\nburden in the short term.  3. does not break things for anybody,\nbut if left-right output is useful on the terminal, it burdens\nthe end-user typing from the command line.\n\nSo in the longer term, 2 is probably slightly more preferrable,\nbut my philosophy is \"do not change anything unless absolutely\nnecessary\", so 3 is also sensible, at least in the short term.\n\nThanks for catching this quickly, before it hit the master.\nLet's revert 57612319.\n"},{"id":"297668","messageId":"Pine.LNX.4.63.0612191147160.19693@wbgn013.biozentrum.uni-wuerzburg.de","threadId":"43553","inReplyTo":"20061219100534.GA9206@coredump.intra.peff.net","subject":"Re: [PATCH] gitk: pass --no-left-right to rev-list","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2006-12-19T10:47:41Z","receivedAt":"2006-12-19T10:47:41Z","isPatch":true,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Tue, 19 Dec 2006, Jeff King wrote:\n\n> I think there are three fixes:\n>   1. this patch (avoid using left-right)\n>   2. gitk can detect and parse the new format\n>   3. revert automatic use of left-right\n> The third makes the most sense to me.\n\nIMHO 2. is the way to go.\n\nCiao,\n"}]}