diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-05-02 10:29:20 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-02 10:29:20 -0700 |
| commit | 10222b247262ea87938c5bbd29026f28e0961426 (patch) | |
| tree | 2714b8088ac0d5d43f13b2150ae30055bda635f2 | |
| parent | 3016062ebfecee1cbbe3374b05d4e30db12c631b (diff) | |
| parent | fedd5c79ff855a4e3859e5c3fa5784942185436b (diff) | |
| download | git-10222b247262ea87938c5bbd29026f28e0961426.tar.gz | |
Merge branch 'bc/zsh-compatibility' into next
zsh can pretend to be a normal shell pretty well except for some
glitches that we tickle in some of our scripts. Work them around
so that "vimdiff" and our test suite works well enough with it.
* bc/zsh-compatibility:
vimdiff: make script and tests work with zsh
t4046: avoid continue in &&-chain for zsh
| -rw-r--r-- | mergetools/vimdiff | 3 | ||||
| -rwxr-xr-x | t/t4046-diff-unmerged.sh | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 97e376329b..734d15a03b 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -72,7 +72,6 @@ gen_cmd_aux () { nested=0 nested_min=100 - # Step 1: # # Increase/decrease "start"/"end" indices respectively to get rid of @@ -87,7 +86,7 @@ gen_cmd_aux () { IFS=# for c in $(echo "$LAYOUT" | sed 's:.:&#:g') do - if test "$c" = " " + if test -z "$c" || test "$c" = " " then continue fi diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh index ffaf69335f..fb8c51746e 100755 --- a/t/t4046-diff-unmerged.sh +++ b/t/t4046-diff-unmerged.sh @@ -20,13 +20,15 @@ test_expect_success setup ' for t in o x do path="$b$o$t" && - case "$path" in ooo) continue ;; esac && - paths="$paths$path " && - p=" $path" && - case "$b" in x) echo "$m1$p" ;; esac && - case "$o" in x) echo "$m2$p" ;; esac && - case "$t" in x) echo "$m3$p" ;; esac || - return 1 + if test "$path" != ooo + then + paths="$paths$path " && + p=" $path" && + case "$b" in x) echo "$m1$p" ;; esac && + case "$o" in x) echo "$m2$p" ;; esac && + case "$t" in x) echo "$m3$p" ;; esac || + return 1 + fi done done done >ls-files-s.expect && |