From: "Alexandr Miloslavskiy via GitGitGadget" <gitgitgadget@gmail.com> To: git@vger.kernel.org Cc: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com>, Junio C Hamano <gitster@pobox.com>, Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Subject: [PATCH 5/5] t2024: cover more cases Date: Thu, 28 Nov 2019 19:32:18 +0000 Message-ID: <ded493ee802805f831a498aea43e3e72a16c21bc.1574969538.git.gitgitgadget@gmail.com> (raw) In-Reply-To: <pull.479.git.1574969538.gitgitgadget@gmail.com> From: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> Signed-off-by: Alexandr Miloslavskiy <alexandr.miloslavskiy@syntevo.com> --- t/t2024-checkout-dwim.sh | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh index fa0718c730..2fe77387a6 100755 --- a/t/t2024-checkout-dwim.sh +++ b/t/t2024-checkout-dwim.sh @@ -132,6 +132,33 @@ test_expect_success 'checkout of branch from a single remote succeeds #2' ' test_branch_upstream baz repo_b baz ' +test_expect_success 'checkout of branch from a single remote succeeds with --' ' + git checkout -B master && + test_might_fail git branch -D baz && + + git checkout baz -- && + status_uno_is_clean && + test_branch baz && + test_cmp_rev remotes/other_b/baz HEAD && + test_branch_upstream baz repo_b baz +' + +test_expect_success 'dont DWIM with pathspec #1' ' + git checkout -B master && + test_might_fail git branch -D baz && + + test_must_fail git checkout baz nonExistingFile 2>err && + test_i18ngrep "did not match any file(s) known to git" err +' + +test_expect_success 'dont DWIM with pathspec #2' ' + git checkout -B master && + test_might_fail git branch -D baz && + + test_must_fail git checkout baz -- nonExistingFile 2>err && + test_i18ngrep "fatal: invalid reference: baz" err +' + test_expect_success '--no-guess suppresses branch auto-vivification' ' git checkout -B master && status_uno_is_clean && -- gitgitgadget
prev parent reply other threads:[~2019-11-28 19:32 UTC|newest] Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-28 19:32 [PATCH 0/5] parse_branchname_arg(): make code easier to understand Alexandr Miloslavskiy via GitGitGadget 2019-11-28 19:32 ` [PATCH 1/5] parse_branchname_arg(): fix dash_dash_pos, drop argcount Alexandr Miloslavskiy via GitGitGadget 2019-12-18 18:52 ` Junio C Hamano 2019-12-19 18:03 ` Alexandr Miloslavskiy 2019-11-28 19:32 ` [PATCH 2/5] parse_branchname_arg(): introduce expect_commit_only Alexandr Miloslavskiy via GitGitGadget 2019-12-18 19:18 ` Junio C Hamano 2019-12-19 18:03 ` Alexandr Miloslavskiy 2019-11-28 19:32 ` [PATCH 3/5] parse_branchname_arg(): update code comments Alexandr Miloslavskiy via GitGitGadget 2019-11-28 19:32 ` [PATCH 4/5] parse_branchname_arg(): refactor the decision making Alexandr Miloslavskiy via GitGitGadget 2019-11-28 19:32 ` Alexandr Miloslavskiy via GitGitGadget [this message]
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: http://vger.kernel.org/majordomo-info.html * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=ded493ee802805f831a498aea43e3e72a16c21bc.1574969538.git.gitgitgadget@gmail.com \ --to=gitgitgadget@gmail.com \ --cc=alexandr.miloslavskiy@syntevo.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
git@vger.kernel.org list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ git@vger.kernel.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git