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

Re: Refactoring git-rebase.sh and git-rebase--interactive.sh

From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Date
Nov 6, 2010, 02:03 UTC
Message-ID
<AANLkTinSb09oZHN8br5goeoG2b+Cgra88E1qeLqi-Y=z@mail.gmail.com>
In-Reply-To
<AANLkTimeWDbJPor9PnKgW5sD7DLjqrm-vTzEtnARvP3M@mail.gmail.com>

I have now removed all the command line processing from git-rebase--interactive.sh. I think the next step will be to align the order of the validation steps between the two script files. When that is done, I will remove one step at a time from git-rebase--interactive.sh while simultaneously moving down the call to it from git-rebase.sh.

To avoid going off in the wrong direction, I would appreciate your input
on the order of the validation steps. I was thinking about having them
in this order:
1. Check command line
2. a. If --continue, --skip or --abort requested, rebase-apply/ or
      rebase-merge/ must exist. (What if -i is also passed and
	  rebase-apply/ exists?)
   b. Otherwise, rebase-apply/ or rebase-merge/ must not exist
3. Check that references, such as upstream and onto, are valid
4. Check that working tree is clean
5. Run pre-rebase hook
What do you think?

rebase -i currently checks that GIT_COMMITTER_IDENT is set. Should that be checked and if so, should it only be checked if the rebase is interactive?

/Martin
Previous: Christian CouderNext: Martin von Zweigbergk
Message 8 of 9 in “Refactoring git-rebase.sh and git-rebase--interactive.sh”
  1. Martin von ZweigbergkNov 2, 2010
  2. Johannes SixtNov 2, 2010
  3. Christian CouderNov 3, 2010
  4. Martin von ZweigbergkNov 3, 2010
  5. Yann DirsonNov 4, 2010
  6. Pat NotzNov 4, 2010
  7. Christian CouderNov 5, 2010
  8. Martin von ZweigbergkNov 6, 2010
  9. Martin von ZweigbergkNov 7, 2010

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.