commit 8ce45cecd69aec45857c13326772dd0c28a27378
Author: Paweł Sikora <pawel.sik...@agmk.net>
Date: Thu Feb 21 22:19:00 2013 +0100
make gitk's cherry-pick commitlog more user friendly.
cherry-picked-commitlog.patch | 13 +++++++++++++
git-core.spec | 2 ++
2 files changed, 15 insertions(+)
---
diff --git a/git-core.spec b/git-core.spec
index e5f7471..03bdb90 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -24,6 +24,7 @@ Source6: %{name}.init
Patch0: %{name}-tests.patch
Patch1: %{name}-key-bindings.patch
Patch2: %{name}-sysconfdir.patch
+Patch3: cherry-picked-commitlog.patch
URL: http://git-scm.com/
BuildRequires: autoconf >= 2.59
BuildRequires: automake
@@ -379,6 +380,7 @@ Ta wtyczka dostarcza podświetlanie składni dla treści
commitów gita.
%patch0 -p1
%patch1 -p0
%patch2 -p1
+%patch3 -p1
%build
%{__aclocal}
diff --git a/cherry-picked-commitlog.patch b/cherry-picked-commitlog.patch
new file mode 100644
index 0000000..fee97a7
--- /dev/null
+++ b/cherry-picked-commitlog.patch
@@ -0,0 +1,13 @@
+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)} \
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/8ce45cecd69aec45857c13326772dd0c28a27378
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
