diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-04-26 23:31:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-04-26 23:31:59 (GMT) |
| commit | 7b19149425264e642718a1774d084d9126e22a56 (patch) | |
| tree | 678cad9aec3bc58449655c744a96a4254906987d | |
| parent | d17c7c41a5bfed8d796c479825a7fa274805ab41 (diff) | |
| parent | fedd5c79ff855a4e3859e5c3fa5784942185436b (diff) | |
| download | git-seen.zip git-seen.tar.gz git-seen.tar.bz2 | |
Merge branch 'bc/zsh-compatibility' into seenseen
* 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 97e3763..734d15a 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 ffaf693..fb8c517 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 && |