[packages/git-core] Version: 2.0.1

[jajcus]

commit 14ca176971a90b68a64d789b8f4324034017e918
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date:   Thu Jun 26 13:50:24 2014 +0200

    Version: 2.0.1
    
    no-break-in-case.patch applied upstream

 git-core.spec          |  8 +++-----
 no-break-in-case.patch | 30 ------------------------------
 2 files changed, 3 insertions(+), 35 deletions(-)
---
diff --git a/git-core.spec b/git-core.spec
index 8839e73..ca63de7 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -13,12 +13,12 @@
 Summary:	Distributed version control system focused on speed, effectivity and usability
 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:	2
+Version:	2.0.1
+Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.gz
-# Source0-md5:	a461ea86f5d655e449a3356ac7eb71ec
+# Source0-md5:	981f5937840716cb563be1cc6292c8d7
 Source1:	%{name}-gitweb.conf
 Source2:	%{name}-gitweb-httpd.conf
 Source3:	%{name}-gitweb-lighttpd.conf
@@ -31,7 +31,6 @@ 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
@@ -434,7 +433,6 @@ 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
deleted file mode 100644
index f989fba..0000000
--- a/no-break-in-case.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-commit 4699dca74bb07472080893b96c5e13928137d97b (HEAD, no-break-in-case)
-Author: Jacek Konieczny <jajcus at 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 at 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
- 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/14ca176971a90b68a64d789b8f4324034017e918