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

Re: [PATCH 2/4] branch: check for bisects and rebases

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 8, 2022, 22:03 UTC
Message-ID
<xmqqsfoeq0co.fsf@gitster.g>
In-Reply-To
<18bad9b0c496fc0ceab1e567aee83f2160ae5d75.1654718942.git.gitgitgadget@gmail.com>
"Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 38 quoted lines
> diff --git a/t/t2407-worktree-heads.sh b/t/t2407-worktree-heads.sh
> index dd905dc1a5c..12faca7f655 100755
> --- a/t/t2407-worktree-heads.sh
> +++ b/t/t2407-worktree-heads.sh
> @@ -21,4 +21,33 @@ test_expect_success 'refuse to overwrite: checked out in worktree' '
>  	done
>  '
>  
> +test_expect_success 'refuse to overwrite: worktree in bisect' '
> +	test_when_finished test_might_fail git -C wt-4 bisect reset &&
> +
> +	(
> +		git -C wt-4 bisect start &&
> +		git -C wt-4 bisect bad HEAD &&
> +		git -C wt-4 bisect good HEAD~3
> +	) &&
> +
> +	test_must_fail git branch -f wt-4 HEAD 2>err &&
> +	grep "cannot force update the branch '\''wt-4'\'' checked out at" err
> +'
> +
> +. "$TEST_DIRECTORY"/lib-rebase.sh
> +
> +test_expect_success 'refuse to overwrite: worktree in rebase' '
> +	test_when_finished test_might_fail git -C wt-4 rebase --abort &&
> +
> +	(
> +		set_fake_editor &&
> +		FAKE_LINES="edit 1 2 3" \
> +			git -C wt-4 rebase -i HEAD~3 >rebase &&
> +		git -C wt-4 status
> +	) &&
> +
> +	test_must_fail git branch -f wt-4 HEAD 2>err &&
> +	grep "cannot force update the branch '\''wt-4'\'' checked out at" err
> +'
> +
>  test_done

Nice to see that each additional feature corresponds to each additional test.

Thanks.
Previous: Derrick Stolee via GitGitGadgetNext: Derrick Stolee via GitGitGadget
Message 11 of 28 in “Create branch_checked_out() helper”
  1. 0/4 Create branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 8, 2022
  2. 1/4 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 8, 2022
  3. Junio C HamanoJun 9, 2022
  4. Ævar Arnfjörð BjarmasonJun 13, 2022
  5. Derrick StoleeJun 14, 2022
  6. Ævar Arnfjörð BjarmasonJun 14, 2022
  7. Phillip WoodJun 14, 2022
  8. Phillip WoodJun 14, 2022
  9. Derrick StoleeJun 14, 2022
  10. 2/4 branch: check for bisects and rebasesDerrick Stolee via GitGitGadget, Jun 8, 2022
  11. Junio C HamanoJun 8, 2022
  12. 3/4 fetch: use new branch_checked_out() and add testsDerrick Stolee via GitGitGadget, Jun 8, 2022
  13. Ævar Arnfjörð BjarmasonJun 14, 2022
  14. Phillip WoodJun 14, 2022
  15. Derrick StoleeJun 14, 2022
  16. 4/4 branch: use branch_checked_out() when deleting refsDerrick Stolee via GitGitGadget, Jun 8, 2022
  17. 5/5 branch: fix branch_checked_out() leaksDerrick Stolee, Jun 13, 2022
  18. Junio C HamanoJun 13, 2022
  19. Ævar Arnfjörð BjarmasonJun 14, 2022
  20. Derrick StoleeJun 14, 2022
  21. Ævar Arnfjörð BjarmasonJun 14, 2022
  22. 0/5 Create branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 14, 2022
  23. 1/5 branch: add branch_checked_out() helperDerrick Stolee via GitGitGadget, Jun 14, 2022
  24. 2/5 branch: check for bisects and rebasesDerrick Stolee via GitGitGadget, Jun 14, 2022
  25. 3/5 fetch: use new branch_checked_out() and add testsDerrick Stolee via GitGitGadget, Jun 14, 2022
  26. 4/5 branch: use branch_checked_out() when deleting refsDerrick Stolee via GitGitGadget, Jun 14, 2022
  27. 5/5 branch: fix branch_checked_out() leaksDerrick Stolee via GitGitGadget, Jun 14, 2022
  28. Phillip WoodJun 19, 2022

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.