Skip to content

Commit

Permalink
pull: do not abuse 'break' inside a shell 'case'
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jacek Konieczny authored and Junio C Hamano committed Jun 12, 2014
1 parent bce14aa commit 8f92c77
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 8f92c77

Please sign in to comment.