Fix for 'break: can't break' in 'git pull'

Release: 2

diff --git a/git-core.spec b/git-core.spec
index 2fd718ff76ceae4059eee60dc086ef5ae4defa02..8839e73410799afb8cedb9a0995e6d62e934e0ce 100644 (file)
--- a/git-core.spec
+++ b/git-core.spec
@@ -14,7 +14,7 @@ Summary:      Distributed version control system focused on speed, effectivity and us
 Summary(pl.UTF-8):     Rozproszony system śledzenia treści skupiony na szybkości, wydajności i użyteczności
 Name:          git-core
 Version:       2.0.0
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Development/Tools
 Source0:       http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
@@ -31,6 +31,7 @@ Patch1:               %{name}-key-bindings.patch
 Patch2:                %{name}-sysconfdir.patch
 Patch3:                cherry-picked-commitlog.patch
 Patch4:                %{name}-svn-exit-errors.patch
+Patch5:                no-break-in-case.patch
 URL:           http://git-scm.com/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -433,6 +434,7 @@ Moduł trzeba zarejestrować poleceniem:
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__rm} {Documentation/technical,contrib/emacs,contrib/credential/gnome-keyring}/.gitignore
 

diff --git a/no-break-in-case.patch b/no-break-in-case.patch
new file mode 100644 (file)
index 0000000..f989fba
--- /dev/null
+++ b/no-break-in-case.patch
@@ -0,0 +1,30 @@
+commit 4699dca74bb07472080893b96c5e13928137d97b (HEAD, no-break-in-case)
+Author: Jacek Konieczny <jajcus@jajcus.net>
+Date:   Wed Jun 11 10:34:38 2014 +0200
+
+    Do not abuse 'break' inside a shell 'case'
+    
+    It is not C. The code would break under mksh when 'pull.ff' is set:
+    
+      $ git pull
+      /usr/lib/git-core/git-pull[67]: break: can't break
+      Already up-to-date.
+    
+    Signed-off-by: Jacek Konieczny <jajcus@jajcus.net>
+
+diff --git a/git-pull.sh b/git-pull.sh
+index cfc589d..18a394f 100755
+--- a/git-pull.sh
++++ b/git-pull.sh
+@@ -58,11 +58,9 @@ pull_ff=$(git config pull.ff)
+ case "$pull_ff" in
+ false)
+       no_ff=--no-ff
+-      break
+       ;;
+ only)
+       ff_only=--ff-only
+-      break
+       ;;
+ esac
+