On Sun, Apr 10, 2016 at 9:18 AM, Stephan Beyer <[email protected]> wrote:
> test_cmp_rev() from t/test-lib-functions.sh is used to make many
> tests clearer.
>
> Signed-off-by: Stephan Beyer <[email protected]>
> ---
> diff --git a/t/t3310-notes-merge-manual-resolve.sh
> b/t/t3310-notes-merge-manual-resolve.sh
> @@ -537,8 +537,8 @@ EOF
> test -f .git/NOTES_MERGE_WORKTREE/$commit_sha3 &&
> test -f .git/NOTES_MERGE_WORKTREE/$commit_sha4 &&
> # Refs are unchanged
> - test "$(git rev-parse refs/notes/m)" = "$(git rev-parse
> refs/notes/w)" &&
> - test "$(git rev-parse refs/notes/y)" = "$(git rev-parse
> NOTES_MERGE_PARTIAL^1)" &&
> + test_cmp_rev refs/notes/m refs/notes/w &&
> + test_cmp_rev refs/notes/y NOTES_MERGE_PARTIAL^1 &&
> test "$(git rev-parse refs/notes/m)" != "$(git rev-parse
> NOTES_MERGE_PARTIAL^1)" &&
Does this one deserve the same type of treatment (but prefixed with !)?
! test_cmp_rev refs/notes/m NOTES_MERGE_PARTIAL^1
I could understand avoiding this conversion if temp_cmp_rev was still
noisy upon failure, however patch 3/21 silenced it.
Aside: Would make sense for test_cmp_rev to accept an optional ! as
its first argument to signify that the revs should not match?
> # Mention refs/notes/m, and its current and expected value in output
> grep -q "refs/notes/m" output &&
> diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
> @@ -354,8 +354,8 @@ test_expect_success '--remap-to-ancestor with filename
> filters' '
> - test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
> - test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
> + test_cmp_rev moved-foo moved-bar &&
> + test_cmp_rev moved-foo master^ &&
> test $orig_invariant = $(git rev-parse invariant)
At other places in this patch, you also converted lines such as the
above, so why not here?
test_cmp_rev invariant $orig_invariant
> '
>
> @@ -372,8 +372,8 @@ test_expect_success 'automatic remapping to ancestor with
> filename filters' '
> - test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
> - test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
> + test_cmp_rev moved-foo2 moved-bar2 &&
> + test_cmp_rev moved-foo2 master^ &&
> test $orig_invariant = $(git rev-parse invariant2)
Ditto.
> '
>
> diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
> @@ -79,17 +79,16 @@ test_expect_success 'merge c1 with c2 and c3 (recursive
> in pull.octopus)' '
> test_expect_success 'merge c1 with c2 and c3 (recursive and octopus in
> pull.octopus)' '
> git reset --hard c1 &&
> git config pull.octopus "recursive octopus" &&
> git merge c2 c3 &&
> - test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
> - test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
> - test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
> - test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
> + test_cmp_rev c1 HEAD^1 &&
> + test_cmp_rev c2 HEAD^2 &&
> + test_cmp_rev c3 HEAD^3 &&
This drops the check:
! test_cmp_rev c1 HEAD &&
Is that intentional? I suppose the argument is that if c1 == HEAD^1
passes, then c1 is certainly not == HEAD?
> diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
> @@ -46,11 +46,10 @@ test_expect_success 'setup' '
> test_expect_success 'merge c1 with c2, c3, c4, c5' '
> git reset --hard c1 &&
> git merge c2 c3 c4 c5 &&
> - test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
> - test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
> - test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
> - test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
> - test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
> + test_cmp_rev c1 HEAD^1 &&
> + test_cmp_rev c2 HEAD^2 &&
> + test_cmp_rev c3 HEAD^3 &&
> + test_cmp_rev c5 HEAD^4 &&
Ditto.
> @@ -69,11 +68,10 @@ test_expect_success 'merge c1 with c2, c3, c4, c5' '
> test_expect_success 'pull c2, c3, c4, c5 into c1' '
> git reset --hard c1 &&
> git pull . c2 c3 c4 c5 &&
> - test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
> - test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
> - test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
> - test "$(git rev-parse c3)" = "$(git rev-parse HEAD^3)" &&
> - test "$(git rev-parse c5)" = "$(git rev-parse HEAD^4)" &&
> + test_cmp_rev c1 HEAD^1 &&
> + test_cmp_rev c2 HEAD^2 &&
> + test_cmp_rev c3 HEAD^3 &&
> + test_cmp_rev c5 HEAD^4 &&
Ditto.
> diff --git a/t/t7605-merge-resolve.sh b/t/t7605-merge-resolve.sh
> @@ -30,9 +30,8 @@ test_expect_success 'setup' '
> test_expect_success 'merge c1 to c2' '
> git reset --hard c1 &&
> git merge -s resolve c2 &&
> - test "$(git rev-parse c1)" != "$(git rev-parse HEAD)" &&
> - test "$(git rev-parse c1)" = "$(git rev-parse HEAD^1)" &&
> - test "$(git rev-parse c2)" = "$(git rev-parse HEAD^2)" &&
> + test_cmp_rev c1 HEAD^1 &&
> + test_cmp_rev c2 HEAD^2 &&
Ditto.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
