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

Re: [PATCH v3] tab completion of filenames for 'git restore'

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 16, 2022, 00:44 UTC
Message-ID
<xmqqsfribuan.fsf@gitster.g>
In-Reply-To
<pull.1227.v3.git.git.1647382437475.gitgitgadget@gmail.com>
"David Cantrell via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: David Cantrell <david@cantrell.org.uk>
> Subject: Re: [PATCH v3] tab completion of filenames for 'git restore'
Perhaps
    Subject: [PATCH v3] completion: complete modified files for 'git restore'
cf. Documentation/SubmittingPatches::[[summary-section]]
> If no --args are present after 'git restore' it assumes that you want
> to tab-complete one of the files with unstaged uncommitted changes.

Since it is our convention that the first paragraph talks about the current behaviour, i.e. without the proposed changes applied, in the present tense, I'd assume the above is what the current code does.

What do you mean by "--args" in this sentence? Dashed-options? I am getting the same set of files whose name begins with 'a' from these two:

 $ git restore a<TAB>
 $ git restore --staged a<TAB>

so, with or without --dashed-options, we complete one of the files, whether they have any modifications.

Perhaps you meant to say more like:
    When completing a non-option argument to 'git restore', the
    command line completion support offers names of the files
    present in the working tree as candidates.

to describe the status quo; to hint what the shortcoming of the current behaviour is, we may want to add a bit more, perhaps append the following at the end of that first paragraph:

    But many of these files may not have any changes, and running
    "restore" on them would be a no-op.  Listing only the files, to
    which doing "restore" is not a no-op, would reduce the clutter.
    
Then we'd continue with the solution, while explaining why the exact
choice between modified vs committable was made:
    Offer only the files that are different from the index, to match
    the default behaviour of "git restore" that checks out the
    contents last added to the index to the working tree.  We could
    instead show the files that are different between the index and
    HEAD, and that is more suittable if "git restore --staged" is
    being completed, but this should do for now.

or something. The last part is written in such a way to explicitly signal to future developers that we know we did not do a perfect job and we do not mind if they extend the logic to use something other than "--modified" when appropriate. For example, they could build on this solution to make it inspect the command line for "--staged" and "--source" and drive "diff-index" differently to grab the paths that are offered. We just do not do that at least for now, but we have no objection if other people do so in the future.

Thanks.  Will queue as-is for now.
Show 17 quoted lines
> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> index 49a328aa8a4..ba5c395d2d8 100644
> --- a/contrib/completion/git-completion.bash
> +++ b/contrib/completion/git-completion.bash
> @@ -2890,6 +2890,10 @@ _git_restore ()
>  	--*)
>  		__gitcomp_builtin restore
>  		;;
> +	*)
> +		if __git rev-parse --verify --quiet HEAD >/dev/null; then
> +			__git_complete_index_file "--modified"
> +		fi
>  	esac
>  }
>  
>
> base-commit: 1a4874565fa3b6668042216189551b98b4dc0b1b
Previous: David Cantrell via GitGitGadgetNext: David Cantrell
Message 12 of 13 in “tab completion of filenames for 'git restore'”
  1. tab completion of filenames for 'git restore'David Cantrell via GitGitGadget, Mar 11, 2022
  2. Junio C HamanoMar 13, 2022
  3. David CantrellMar 14, 2022
  4. Junio C HamanoMar 15, 2022
  5. 0/2 Improved bash tab completion for 'git restore' - adds support for auto-completing filenamesDavid Cantrell via GitGitGadget, Mar 15, 2022
  6. 2/2 if a file has been staged we don't want to list itDavid Cantrell via GitGitGadget, Mar 15, 2022
  7. Bagas SanjayaMar 16, 2022
  8. 1/2 tab completion of filenames for 'git restore'David Cantrell via GitGitGadget, Mar 15, 2022
  9. Junio C HamanoMar 15, 2022
  10. Junio C HamanoMar 15, 2022
  11. tab completion of filenames for 'git restore'David Cantrell via GitGitGadget, Mar 15, 2022
  12. Junio C HamanoMar 16, 2022
  13. David CantrellMar 17, 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.