Andrew's git / gitweb.git / diff
?
Sync with maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2014 19:22:38 +0000 (12:22 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 12 Jun 2014 19:22:38 +0000 (12:22 -0700)
* maint:
pull: do not abuse 'break' inside a shell 'case'

git-pull.sh patch | blob | history
diff --git a/git-pull.sh b/git-pull.sh
index cfc589dc15061c8ed1797c2d91ec420b1d6f33fe..18a394fcc4e704621c8b5e8bc92b7cbee2fd21fe 100755 (executable)
--- 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