[packages/git-core.git] / cherry-picked-commitlog.patch

diff --git a/gitk-git/gitk.orig b/gitk-git/gitk
index ce63a8c..4ae5a56 100755
--- a/gitk-git/gitk.orig
+++ b/gitk-git/gitk
@@ -9150,7 +9150,7 @@ proc cherrypick {} {
     update
     # Unfortunately git-cherry-pick writes stuff to stderr even when
     # no error occurs, and exec takes that as an indication of error...
-    if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
+    if {[catch {exec sh -c "git cherry-pick -x -r $rowmenuid 2>&1"} err]} {
 	notbusy cherrypick
 	if {[regexp -line \
 		 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
Commit	Line	Data
8ce45cec PS	1	diff --git a/gitk-git/gitk.orig b/gitk-git/gitk
	2	index ce63a8c..4ae5a56 100755
	3	--- a/gitk-git/gitk.orig
	4	+++ b/gitk-git/gitk
	5	@@ -9150,7 +9150,7 @@ proc cherrypick {} {
	6	update
	7	# Unfortunately git-cherry-pick writes stuff to stderr even when
	8	# no error occurs, and exec takes that as an indication of error...
	9	- if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
	10	+ if {[catch {exec sh -c "git cherry-pick -x -r $rowmenuid 2>&1"} err]} {
	11	notbusy cherrypick
	12	if {[regexp -line \
	13	{Entry '(.*)' (would be overwritten by merge\|not uptodate)} \