From: Anders Kaseorg <andersk@MIT.EDU>
Date: Wed, 19 Jan 2011 19:45:00 +0000 (-0500)
Subject: gitk: Update cherry-pick error message parsing
X-Git-Tag: v1.7.5-rc2~9^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b74307f6a551d50e9b1aa121a326d32ff1827a93;p=git.git

gitk: Update cherry-pick error message parsing

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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
---

diff --git a/gitk b/gitk
index 1ff4093a5..4cde0c493 100755
--- a/gitk
+++ b/gitk
@@ -9065,7 +9065,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\