From: Jeff King <peff@peff.net>
To: Junio C Hamano <junkio@cox.net>
Cc: Paul Mackerras <paulus@samba.org>, git@vger.kernel.org
Subject: [PATCH] gitk: pass --no-left-right to rev-list
Date: Tue, 19 Dec 2006 05:05:35 -0500 [thread overview]
Message-ID: <20061219100534.GA9206@coredump.intra.peff.net> (raw)
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 <peff@peff.net>
---
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"
--
next reply other threads:[~2006-12-19 10:05 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-12-19 10:05 Jeff King [this message]
2006-12-19 10:28 ` [PATCH] gitk: pass --no-left-right to rev-list Junio C Hamano
2006-12-19 10:47 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061219100534.GA9206@coredump.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox