Johan Herland wrote:
> The DWIM mode of checkout allows you to run "git checkout foo" when there is
> no existing local ref or path called "foo" and there is exactly one remote
> with a remote-tracking branch called "foo".
Thanks for testing this. I'm surprised no one suggested a test since
v1.7.0-rc0~51^2~6 (2009-10-18).
Maybe it would also be worthwhile to also test --no-guess? (c.f.
46148dd7, 2009-10-18)
[...]
> +++ b/t/t2024-checkout-dwim.sh
> @@ -0,0 +1,66 @@
[...]
> +# Arguments: <branch> <remote> <remote-tracking>
> +#
> +# Verify that we have checked out <branch>, and that it is at the same
> +# commit as <remote-tracking>, and that has appropriate tracking config
> +# setup against <remote>
> +test_tracking_branch() {
> + branch=$1 &&
> + remote=$2 &&
> + remote_track=$3 &&
> + test "refs/heads/$branch" = "$(git rev-parse --symbolic-full-name HEAD)" &&
> + test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify "$remote_track")" &&
> + test "$remote" = "$(git config "branch.$branch.remote")" &&
> + test "refs/heads/$branch" = "$(git config "branch.$branch.merge")"
Stylistic tweaks:
* setting all local vars on one line
* avoiding command substitution so we notice if commands fail
* using test_cmp in place of test $foo = $bar for better output
when the test fails
# Is the current branch "refs/heads/$1"?
test_branch () {
printf "%s\n" "refs/heads/$1" >expect.HEAD &&
git symbolic-ref HEAD >actual.HEAD &&
test_cmp expect.HEAD actual.HEAD
}
# Is branch "refs/heads/$1" set to pull from "$2/$3"?
test_branch_upstream () {
printf "%s\n" "$2" "refs/heads/$3" >expect.upstream &&
{
git config "branch.$1.remote" &&
git config "branch.$1.merge"
} >actual.upstream &&
test_cmp expect.upstream actual.upstream
}
test_tracking_branch () {
branch=$1 remote=$2 remote_branch=$3 &&
test_branch "$branch" &&
test_cmp_rev "refs/remotes/$remote/$remote_branch" HEAD &&
test_branch_upstream "$branch" "$remote" "$remote_branch"
}
> +}
> +
> +test_expect_success 'setup' '
> + (git init repo_a &&
> + cd repo_a &&
> + test_commit a_master &&
> + git checkout -b foo &&
> + test_commit a_foo &&
> + git checkout -b bar &&
> + test_commit a_bar
> + ) &&
> + (git init repo_b &&
> + cd repo_b &&
> + test_commit b_master &&
> + git checkout -b foo &&
> + test_commit b_foo &&
> + git checkout -b baz &&
> + test_commit b_baz
> + ) &&
> + git remote add repo_a repo_a &&
> + git remote add repo_b repo_b &&
> + git config remote.repo_b.fetch \
> + "+refs/heads/*:refs/remotes/other_b/*" &&
> + git fetch --all
Style: indenting code in subshells.
test_expect_success 'setup' '
git init repo_a &&
(
cd repo_a &&
test_commit a_master &&
git checkout -b foo &&
test_commit a_foo &&
git checkout -b bar &&
test_commit a_bar
) &&
git init repo_b &&
(
cd repo_b &&
test_commit b_master &&
git checkout -b foo &&
test_commit b_foo &&
git checkout -b baz &&
test_commit b_baz
) &&
git remote add repo_a repo_a &&
git remote add repo_b repo_b &&
git config remote.repo_b.fetch \
"+refs/heads/*:refs/remotes/other_b/*" &&
git fetch --all
'
> +'
> +
> +test_expect_success 'checkout of non-existing branch fails' '
> + test_must_fail git checkout xyzzy
> +'
Maybe, to defend against state from previous tests and confirm that
the checkout didn't do anything:
git checkout -B master &&
test_might_fail git branch -D xyzzy &&
test_must_fail git checkout xyzzy &&
test_must_fail git rev-parse --verify refs/heads/xyzzy &&
test_branch master
> +
> +test_expect_success 'checkout of branch from multiple remotes fails' '
> + test_must_fail git checkout foo
> +'
Likewise:
git checkout -B master &&
test_might_fail git branch -D foo &&
test_must_fail git checkout foo &&
test_must_fail git rev-parse --verify refs/heads/foo &&
test_branch master
> +
> +test_expect_success 'checkout of branch from a single remote succeeds #1' '
> + git checkout bar &&
> + test_tracking_branch bar repo_a refs/remotes/repo_a/bar
git checkout -B master &&
test_might_fail git branch -D bar &&
git checkout bar &&
test_branch bar &&
test_cmp_rev remotes/repo_a/bar HEAD &&
test_branch_upstream bar repo_a bar
> +test_expect_success 'checkout of branch from a single remote succeeds #2' '
> + git checkout baz &&
> + test_tracking_branch baz repo_b refs/remotes/other_b/baz
git checkout -B master &&
test_might_fail git branch -D baz &&
git checkout baz &&
test_branch baz &&
test_cmp_rev remotes/other_b/baz HEAD &&
test_branch_upstream baz repo_b baz
And for --no-guess:
test_expect_success '--no-guess suppresses branch auto-vivification' '
git checkout -B master &&
test_might_fail git branch -D bar &&
test_must_fail git checkout --no-guess bar &&
test_must_fail git rev-parse --verify refs/heads/bar &&
test_branch master
'
Sane?
Thanks,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html