Thread (2 messages) flat view 2 messages, 2 authors, 2016-08-11
STALE3674d

[PATCH] gitk: pass --no-left-right to rev-list

From: Jeff King <hidden>
Date: 2016-08-11 19:47:29
Subsystem: the rest · Maintainer: Linus Torvalds

Now that rev-list does left-right marking by default on symmetric
differences, command lines like this:
  gitk master...origin
produce an error.

Signed-off-by: Jeff King <redacted>
---
I think there are three fixes:
  1. this patch (avoid using left-right)
  2. gitk can detect and parse the new format
  3. revert automatic use of left-right
The third makes the most sense to me.

People do use symmetric difference with various porcelains. For example,
I typically carry a few local patches in 'master'. My daily
sit-down-with-git workflow is:
  git-fetch
  gitk master...origin
  git-rebase origin
where the second step gives me a nice graph of what's new and which
patches I'm still carrying.

That means that porcelains which use git-rev-list are _all_ going to
break.

 gitk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitk b/gitk
index 3dabc69..ec61a37 100755
--- a/gitk
+++ b/gitk
@@ -33,7 +33,7 @@ proc start_rev_list {view} {
 	set order "--date-order"
     }
     if {[catch {
-	set fd [open [concat | git rev-list --header $order \
+	set fd [open [concat | git rev-list --no-left-right --header $order \
 			  --parents --boundary --default HEAD $args] r]
     } err]} {
 	puts stderr "Error executing git rev-list: $err"
-- 
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help