Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
pull: do not abuse 'break' inside a shell 'case'
author
Jacek Konieczny
<jajcus@jajcus.net>
Wed, 11 Jun 2014 08:47:45 +0000
(10:47 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 12 Jun 2014 19:15:49 +0000
(12:15 -0700)
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-pull.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
bce14aa
)
diff --git
a/git-pull.sh
b/git-pull.sh
index 6cd8ebc534c174dfe613f62047424dc7491d75fa..7358fac86433b61a35ad332d680ba9b4a9d300b2 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