git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 1/2] checkout: add tests for -b and --track

From
Jeff King <peff@peff.net>
Date
May 27, 2020, 06:40 UTC
Message-ID
<20200527064056.GA4005121@coredump.intra.peff.net>
In-Reply-To
<ebe696b2-bf68-ccd1-b930-dce274ec9279@web.de>
On Sun, May 24, 2020 at 09:22:51AM +0200, René Scharfe wrote:
Show 12 quoted lines
> 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.
Did you mean "more fitting error message in git checkout"?
> Original-test-by: Jeff King <peff@peff.net>
I didn't think I really contributed much, but OK. :)
Show 17 quoted lines
> diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
> index 21583154d8..d99b699396 100755
> --- 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
> +'

OK, covering the normal case without --track, both with and without the extra arg. Makes sense.

Show 11 quoted lines
> +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
> +'

And these ones with --track, which produces a different error message. Makes sense.

-Peff
Previous: René ScharfeNext: René Scharfe
Message 6 of 16 in “'HEAD' is not a commit (according to git-checkout)”
  1. Dana DahlstromMay 21, 2020
  2. Jeff KingMay 21, 2020
  3. René ScharfeMay 23, 2020
  4. Jeff KingMay 23, 2020
  5. 1/2 checkout: add tests for -b and --trackRené Scharfe, May 24, 2020
  6. Jeff KingMay 27, 2020
  7. René ScharfeMay 28, 2020
  8. 2/2 checkout: improve error messages for -b with extra argumentRené Scharfe, May 24, 2020
  9. Jeff KingMay 27, 2020
  10. René ScharfeMay 24, 2020
  11. Junio C HamanoMay 24, 2020
  12. Jeff KingMay 27, 2020
  13. Junio C HamanoMay 27, 2020
  14. Randall S. BeckerMay 27, 2020
  15. Jeff KingMay 27, 2020
  16. René ScharfeMay 21, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.