X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=cherry-picked-commitlog.patch;h=eedf491d40d59467e289c563768f98f32e8db9e6;hb=f0d8046bb0834c79035273ee743a7c0931877c6b;hp=fee97a7ac0c39d644af9475123fa2b6345ced676;hpb=8ce45cecd69aec45857c13326772dd0c28a27378;p=packages%2Fgit-core.git

diff --git a/cherry-picked-commitlog.patch b/cherry-picked-commitlog.patch
index fee97a7..eedf491 100644
--- a/cherry-picked-commitlog.patch
+++ b/cherry-picked-commitlog.patch
@@ -1,13 +1,11 @@
-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 {} {
+--- git-2.29.0/gitk-git/gitk.orig	2020-10-19 21:40:17.774293686 +0200
++++ git-2.29.0/gitk-git/gitk	2020-10-19 21:43:33.023626764 +0200
+@@ -9711,7 +9711,7 @@
      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)} \
+         notbusy cherrypick
+         if {[regexp -line \
+                  {Entry '(.*)' (would be overwritten by merge|not uptodate)} \