diff options
| author |  Jacek Konieczny <jajcus@jajcus.net> | 2014-06-11 10:47:45 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-06-12 12:15:49 -0700 |
| commit | 8f92c7755ef2e2802e24eeb3a7de1727045950c0 (patch) | |
| tree | 0fd731fb104419de86f1bb34227ef71594fa0ef1 /git-pull.sh | |
| parent | Sync with 1.9.4 (diff) | |
| download | tgif-8f92c7755ef2e2802e24eeb3a7de1727045950c0.tar.xz | |
pull: 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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh index 6cd8ebc534..7358fac864 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 |