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

Re: Rebase options via git pull

From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date
May 17, 2021, 12:42 UTC
Message-ID
<YKJkmws18M6oJZXy@danh.dev>
In-Reply-To
<87k0nxv8tt.fsf@osv.gnss.ru>
On 2021-05-17 15:33:18+0300, Sergey Organov <sorganov@gmail.com> wrote:
Show 24 quoted lines
> >> Probably add generic cmd.<cmd>.opts config support, so that I can say:
> >>
> >>   git -c cmd.rebase.opts="--no-fork-point --empty=keep" pull --rebase
> >>
> >> Thoughts?
> >
> > It's been discussed before (but I did not dig up the discussions,
> > sorry). It's been considered a bad idea, because our commands are a
> > mixture of plumbing/porcelain commands and switches, so we want to be
> > able to reliably invoke say ls-tree with some switches internally,
> > without config tripping us up.
> >
> > Of course we could make this sort of thing work by selectively ignoring
> > the config, but such a thing would be equal in complexity to the effort
> > of assering that it's safe to introduce new rebase.* config in the
> > codebase for every switch it has now, but with a less friendly interface
> > both for git itself and users.
> 
> I don't see much complexity here. We'd then just need to effectively
> invoke ls-tree internally like this:
> 
>    git -c 'cmd.ls-tree.opts=' ls-tree
> 
> Not a big deal.
It's a big deal.

Scripts was written with plumbing command and expect stable output. If such change can be accepted, a lot of scripts will begin to fail.

Show 12 quoted lines
> > I.e. instead of rebase.noForkPoint=<bool> we'd need to to getopt parsing
> > on some cmd.rebase.opts string.
> 
> As this is meant to be generic, then yes, every command will first parse
> corresponding config option, then command-line options, rebase not being
> any different.
> 
> >
> > I don't see why in this case what I suggested elsewhere in the thread
> > wouldn't be viable, i.e. you specify --rebase or --merge to "pull", and
> > that affects how we interpret the rest of the options. I haven't tried
> > it though, so there may be hidden gotchas there I haven't thought of.

I didn't follow that sub-thread. However, I think we can extend git-pull with a dedicated option prefix for options that would be passed down to git-merge or git-rebase. Sililar to -W of CCLD (as in gcc -W,--as-needed)

-- 
Danh
Previous: Sergey OrganovNext: Sergey Organov
Message 11 of 13 in “Rebase options via git pull”
  1. Sergey OrganovMay 13, 2021
  2. Junio C HamanoMay 13, 2021
  3. Ævar Arnfjörð BjarmasonMay 14, 2021
  4. Sergey OrganovMay 15, 2021
  5. Alex HenrieMay 14, 2021
  6. Đoàn Trần Công DanhMay 14, 2021
  7. Alex HenrieMay 14, 2021
  8. Sergey OrganovMay 14, 2021
  9. Ævar Arnfjörð BjarmasonMay 17, 2021
  10. Sergey OrganovMay 17, 2021
  11. Đoàn Trần Công DanhMay 17, 2021
  12. Sergey OrganovMay 17, 2021
  13. Đoàn Trần Công DanhMay 17, 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.