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

Re: [PATCH 6/7] stage: add 'diff' subcommand

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
Aug 11, 2021, 17:17 UTC
Message-ID
<6114062dc362d_30a208f9@natae.notmuch>
In-Reply-To
<xmqqzgto9dkd.fsf@gitster.g>
Junio C Hamano wrote:
Show 5 quoted lines
> A more notable aspect of the above list is not the similarity but
> difference from the rest of Git.  The above organizes various
> operations on the staging area in a single command as its operating
> modes, so you'd use "git stage --diff" for comparing with the
> staging area but use something else ("git commit --diff HEAD"???).
It is not different from the rest of git:
 * git branch --delete
 * git tag --delete
 * git remote remove
 * git stash drop
 * git worktree remove
 * git submodule add
 * git config --edit
 * git notes remove
 * git bundle create
 * git bisect start

Plus it's not unusual for commands and options to be redundant, especially when they attempt to simplify or improve the user interface, starting with `git checkout` / `git switch`.

Show 11 quoted lines
> It is a good example that illustrates that the proposed organization
> may not help learning or using the system for operations that also
> apply to other things like commit and working tree (in other words,
> "git stage --grep" may not be such a good idea for the same reason
> as "git stage --diff").  But if it were limited to operations that
> apply only to the index (e.g. "git add" and "git rm"), it may be an
> improvement (I think we added "git stage" synonym exactly for that
> reason, already).
> 
> Having said that, if we added "git stage --remove", there may be
> complaints that say "the stage command does too many things",
Or there might not.
> just like those that caused "checkout" to be split into "restore"
> (check out contents for selected paths in order to work on the current
> branch) and "switch" (check out a branch in order to start working on
> it).  I dunno.

I don't see many people complaining that `git branch` does "too many things", neither `git stash` or any of the commands listed above.

Moreover, you are not addressing the most interesting thing my proposal enables:

  git stage --edit
-- 
Felipe Contreras
Previous: Junio C HamanoNext: Jeff King
Message 11 of 24 in “[un]stage: officially start moving to "staging area"”
  1. 0/7 [un]stage: officially start moving to "staging area"Felipe Contreras, Aug 11, 2021
  2. 1/7 stage: add proper 'stage' commandFelipe Contreras, Aug 11, 2021
  3. 2/7 stage: add helper to run commandsFelipe Contreras, Aug 11, 2021
  4. 3/7 stage: add 'add' subcommandFelipe Contreras, Aug 11, 2021
  5. 4/7 stage: add 'remove' subcommandFelipe Contreras, Aug 11, 2021
  6. 5/7 unstage: add 'unstage' commandFelipe Contreras, Aug 11, 2021
  7. 6/7 stage: add 'diff' subcommandFelipe Contreras, Aug 11, 2021
  8. Bagas SanjayaAug 11, 2021
  9. Felipe ContrerasAug 11, 2021
  10. Junio C HamanoAug 11, 2021
  11. Felipe ContrerasAug 11, 2021
  12. Jeff KingAug 11, 2021
  13. Felipe ContrerasAug 11, 2021
  14. Jeff KingAug 11, 2021
  15. Felipe ContrerasAug 11, 2021
  16. Michael J GruberAug 11, 2021
  17. Jeff KingAug 11, 2021
  18. Michael J GruberAug 11, 2021
  19. Jeff KingAug 11, 2021
  20. Junio C HamanoAug 11, 2021
  21. Felipe ContrerasAug 11, 2021
  22. 7/7 stage: add 'edit' commandFelipe Contreras, Aug 11, 2021
  23. Michael J GruberAug 11, 2021
  24. Felipe ContrerasAug 11, 2021

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.