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>
Anders Kaseorg committed
Jan 19, 2011 at 14:45 UTC
b74307f6a551d50e9b1aa121a326d32ff1827a93
1 file changed
+1
-1
gitk
+1
-1
@@ -9065,7 +9065,7 @@ proc cherrypick {} {
9065
to file '%s'.\nPlease commit, reset or stash\
9066
your changes and try again." $fname]
9067
} elseif {[regexp -line \
9068
- {^(CONFLICT \(.*\):|Automatic cherry-pick failed)} \
9068
+ {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
9069
$err]} {
9070
if {[confirm_popup [mc "Cherry-pick failed because of merge\
9071
conflict.\nDo you wish to run git citool to\