aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2020-11-11 17:02:22 -0800
committerDaniel Borkmann <daniel@iogearbox.net>2020-11-13 17:46:24 +0100
commit7d4c8853661a71e8fcc3205a009335bc0c0bf41e (patch)
treeb5813673dd10dae19b611be556949a8d06e707bb
parente3b0c435d06c8a245c34a8c316374da1da38e52f (diff)
downloadpw-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-xpw-apply2
1 files changed, 1 insertions, 1 deletions
diff --git a/pw-apply b/pw-apply
index 21db5f9..dafa36d 100755
--- a/pw-apply
+++ b/pw-apply
@@ -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 ;;