mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
![René Scharfe](/assets/img/avatar_default.png)
When we try to create a branch "foo" based on "origin/master" and give git commit -b an extra unsupported argument "bar", it confusingly reports: $ git checkout -b foo origin/master bar fatal: 'bar' is not a commit and a branch 'foo' cannot be created from it $ git checkout --track -b foo origin/master bar fatal: 'bar' is not a commit and a branch 'foo' cannot be created from it That's wrong, because it very well understands that "origin/master" is supposed to be the start point for the new branch and not "bar". Check if we got a commit and show more fitting messages in that case instead: $ git checkout -b foo origin/master bar fatal: Cannot update paths and switch to branch 'foo' at the same time. $ git checkout --track -b foo origin/master bar fatal: '--track' cannot be used with updating paths Original-patch-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>
25 lines
657 B
Bash
Executable file
25 lines
657 B
Bash
Executable file
#!/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_success '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
|