checkout: add tests for -b and --track

Test git checkout -b with and without --track and demonstrate unexpected
error messages when it's given an extra (i.e. unsupported) path
argument.  In both cases it reports:

   $ git checkout -b foo origin/master bar
   fatal: 'bar' is not a commit and a branch 'foo' cannot be created from it

The problem is that the start point we gave for the new branch is
"origin/master" and "bar" is just some extra argument -- it could even
be a valid commit, which would make the message even more confusing.  We
have more fitting error messages in git commit, but get confused; use
the text of the rights ones in the tests.

Reported-by: Dana Dahlstrom <dahlstrom@google.com>
Original-test-by: Jeff King <peff@peff.net>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 21583154d8e0d029168cfe87624cad89eeb765ef..b166cb302f94f685561763dbe2efda89e9ec115b 100755 (executable)
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -260,4 +260,14 @@ test_expect_success 'checkout -b to a new branch preserves mergeable changes des
        test_cmp expect actual
 '
 
+test_expect_success 'checkout -b rejects an invalid start point' '
+       test_must_fail git checkout -b branch4 file1 2>err &&
+       test_i18ngrep "is not a commit" err
+'
+
+test_expect_failure 'checkout -b rejects an extra path argument' '
+       test_must_fail git checkout -b branch5 branch1 file1 2>err &&
+       test_i18ngrep "Cannot update paths and switch to branch" err
+'
+
 test_done

diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
new file mode 100755 (executable)
index 0000000..d0b41d7
--- /dev/null
+++ b/t/t2027-checkout-track.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+test_description='tests for git branch --track'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+       test_commit one &&
+       test_commit two
+'
+
+test_expect_success 'checkout --track -b creates a new tracking branch' '
+       git checkout --track -b branch1 master &&
+       test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+       test $(git config --get branch.branch1.remote) = . &&
+       test $(git config --get branch.branch1.merge) = refs/heads/master
+'
+
+test_expect_failure 'checkout --track -b rejects an extra path argument' '
+       test_must_fail git checkout --track -b branch2 master one.t 2>err &&
+       test_i18ngrep "cannot be used with updating paths" err
+'
+
+test_done