Changes since v5:
* Remove spaces between redirect to conform with git style.
Usman Akinyemi (2):
t3404: avoid losing exit status with focus on `git show` and `git
cat-file`
t3404: employing test_line_count() to replace test
t/t3404-rebase-interactive.sh | 75 +++++++++++++++++++++++------------
1 file changed, 50 insertions(+), 25 deletions(-)
base-commit: 90fe3800b92a49173530828c0a17951abd30f0e1
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1805%2FUnique-Usman%2Favoid_git_pipes-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1805/Unique-Usman/avoid_git_pipes-v6
Pull-Request: https://github.com/git/git/pull/1805
Range-diff vs v5:
1: bfff7937cd2 = 1: bfff7937cd2 t3404: avoid losing exit status with focus on `git show` and `git cat-file`
2: 0ce40300fa3 ! 2: b3d3deced25 t3404: employing test_line_count() to replace test
@@ t/t3404-rebase-interactive.sh: test_expect_success 'stop on conflicting pick' '
test "$(git diff --name-status |
sed -n -e "/^U/s/^U[^a-z]*//p")" = file1 &&
- test 4 = $(grep -v "^#" < .git/rebase-merge/done | wc -l) &&
-+ grep -v "^#" < .git/rebase-merge/done >actual &&
+- test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
++ grep -v "^#" <.git/rebase-merge/done >actual &&
+ test_line_count = 4 actual &&
- test 0 = $(grep -c "^[^#]" < .git/rebase-merge/git-rebase-todo)
++ test 0 = $(grep -c "^[^#]" <.git/rebase-merge/git-rebase-todo)
'
+ test_expect_success 'show conflicted patch' '
@@ t/t3404-rebase-interactive.sh: test_expect_success 'multi-squash only fires up editor once' '
) &&
test $base = $(git rev-parse HEAD^) &&
--
gitgitgadget
