From: Anders Kaseorg <andersk@MIT.EDU>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Anders Kaseorg <andersk@mit.edu>
Subject: [PATCH 1/4] gitk: Update cherry-pick error message parsing
Date: Fri, 19 Nov 2010 02:38:17 -0500 [thread overview]
Message-ID: <1290152300-21393-1-git-send-email-andersk@mit.edu> (raw)
Commit 981ff5c37ae20687c98d98c8689d5e89016026d2 changed the error
message from git cherry-pick from
Automatic cherry-pick failed. [...advice...]
to
error: could not apply 7ab78c9... Do something neat.
[...advice...]
Update gitk’s regex to match this, restoring the ability to launch git
citool to resolve conflicted cherry-picks.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
gitk-git/gitk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 1b0e09a..dbc8f86 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -9002,7 +9002,7 @@ proc cherrypick {} {
to file '%s'.\nPlease commit, reset or stash\
your changes and try again." $fname]
} elseif {[regexp -line \
- {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \
+ {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
$err]} {
if {[confirm_popup [mc "Cherry-pick failed because of merge\
conflict.\nDo you wish to run git citool to\
--
1.7.3.2
next reply other threads:[~2010-11-19 7:38 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-19 7:38 Anders Kaseorg [this message]
2010-11-19 7:38 ` [PATCH 2/4] gitk: Remove unused $cdate array Anders Kaseorg
2010-11-19 7:38 ` [PATCH 3/4] gitk: Remember time zones from author and commit timestamps Anders Kaseorg
2010-11-19 7:38 ` [PATCH 4/4] gitk: Allow displaying " Anders Kaseorg
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=1290152300-21393-1-git-send-email-andersk@mit.edu \
--to=andersk@mit.edu \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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;
as well as URLs for NNTP newsgroup(s).