diff options
author | Jakub Kicinski <kuba@kernel.org> | 2020-11-11 17:02:22 -0800 |
---|---|---|
committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-11-13 17:46:24 +0100 |
commit | 7d4c8853661a71e8fcc3205a009335bc0c0bf41e (patch) | |
tree | b5813673dd10dae19b611be556949a8d06e707bb | |
parent | e3b0c435d06c8a245c34a8c316374da1da38e52f (diff) | |
download | pw-7d4c8853661a71e8fcc3205a009335bc0c0bf41e.tar.gz |
pw-apply: fix infinite loop on passing -3
Looks like shift got lost in refactoring.
Fixes: 8d9dfabbb27f ("pw-apply: make 3 way merge optional for git-am")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
-rwxr-xr-x | pw-apply | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -88,7 +88,7 @@ mb2q_normalize="y" head_old=$(git rev-parse --verify HEAD) while true; do case "$1" in - -3 ) am_flags="$am_flags -3" ;; + -3 ) am_flags="$am_flags -3"; shift ;; -s | --series ) series="$2"; shift 2 ;; -a | --accept ) accept="1"; shift ;; -e | --do-edits ) edits="1"; shift ;; |