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

Re: [PATCH 2/5] completion: complete REVERT_HEAD and BISECT_HEAD

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 14, 2023, 20:25 UTC
Message-ID
<xmqq4jpiqki4.fsf@gitster.g>
In-Reply-To
<f3a47758f9dce20c29ffb776bffaf73e238c20d1.1681495119.git.gitgitgadget@gmail.com>
"Philippe Blain via GitGitGadget" <gitgitgadget@gmail.com> writes:
Show 23 quoted lines
> From: Philippe Blain <levraiphilippeblain@gmail.com>
>
> The pseudorefs REVERT_HEAD and BISECT_HEAD are not suggested
> by the __git_refs function. Add them there.
>
> Signed-off-by: Philippe Blain <levraiphilippeblain@gmail.com>
> ---
>  contrib/completion/git-completion.bash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index dc95c34cc85..bcda376735c 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -767,7 +767,7 @@ __git_refs ()
>  			track=""
>  			;;
>  		*)
> -			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
> +			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD REVERT_HEAD BISECT_HEAD; do
>  				case "$i" in
>  				$match*|$umatch*)
>  					if [ -e "$dir/$i" ]; then

This does obvious change to add two completion possibilities reusing exactly the same logic we have been using.

A tangent related to my earlier "didn't we plan to limit them to *_HEAD at some point?" is that we could turn the loop around and do something like

		for i in HEAD $(cd "$dir" && echo *_HEAD)
		do
			case "$i" in
			$match*|$umatch*)
				if test -f "$dir/$i"
				then
					...
which could be a lot more future-proof, once we have such a rule.

But that is a tangent that we should wait until the current series settles.

Thanks.
Previous: Philippe Blain via GitGitGadgetNext: Philippe Blain via GitGitGadget
Message 11 of 35 in “Document 'AUTO_MERGE' and more special refs”
  1. 0/5 Document 'AUTO_MERGE' and more special refsPhilippe Blain via GitGitGadget, Apr 14, 2023
  2. 1/5 revisions.txt: document more special refsPhilippe Blain via GitGitGadget, Apr 14, 2023
  3. Junio C HamanoApr 14, 2023
  4. Felipe ContrerasApr 15, 2023
  5. Victoria DyeApr 14, 2023
  6. Taylor BlauApr 14, 2023
  7. Felipe ContrerasApr 15, 2023
  8. 3/5 git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain via GitGitGadget, Apr 14, 2023
  9. Junio C HamanoApr 14, 2023
  10. 2/5 completion: complete REVERT_HEAD and BISECT_HEADPhilippe Blain via GitGitGadget, Apr 14, 2023
  11. Junio C HamanoApr 14, 2023
  12. 5/5 completion: complete AUTO_MERGEPhilippe Blain via GitGitGadget, Apr 14, 2023
  13. 4/5 Documentation: document AUTO_MERGEPhilippe Blain via GitGitGadget, Apr 14, 2023
  14. Taylor BlauApr 14, 2023
  15. Eric SunshineApr 15, 2023
  16. Elijah NewrenApr 15, 2023
  17. Eric SunshineApr 15, 2023
  18. Elijah NewrenApr 16, 2023
  19. Elijah NewrenApr 15, 2023
  20. Philippe BlainApr 15, 2023
  21. Elijah NewrenApr 15, 2023
  22. Junio C HamanoApr 14, 2023
  23. Victoria DyeApr 14, 2023
  24. Elijah NewrenApr 15, 2023
  25. Chris TorekApr 16, 2023
  26. 0/6 Document 'AUTO_MERGE' and more special refsPhilippe Blain via GitGitGadget, May 22, 2023
  27. 1/6 revisions.txt: use description list for special refsPhilippe Blain via GitGitGadget, May 22, 2023
  28. 2/6 revisions.txt: document more special refsPhilippe Blain via GitGitGadget, May 22, 2023
  29. 4/6 git-merge.txt: modernize word choice in "True merge" sectionPhilippe Blain via GitGitGadget, May 22, 2023
  30. 3/6 completion: complete REVERT_HEAD and BISECT_HEADPhilippe Blain via GitGitGadget, May 22, 2023
  31. 5/6 Documentation: document AUTO_MERGEPhilippe Blain via GitGitGadget, May 22, 2023
  32. 6/6 completion: complete AUTO_MERGEPhilippe Blain via GitGitGadget, May 22, 2023
  33. Elijah NewrenJun 1, 2023
  34. Junio C HamanoJun 1, 2023
  35. Junio C HamanoJun 1, 2023

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.