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

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

From
Christian Couder <chriscool@tuxfamily.org>
Date
Nov 3, 2010, 03:24 UTC
Message-ID
<201011030424.33093.chriscool@tuxfamily.org>
In-Reply-To
<AANLkTimeWDbJPor9PnKgW5sD7DLjqrm-vTzEtnARvP3M@mail.gmail.com>
On Tuesday 02 November 2010 13:33:07 Martin von Zweigbergk wrote:
Show 6 quoted lines
> (Resending as plain text. Sorry about the spam to the guys on the CC list.)
> 
> Hi,
> 
> I have now been using Git for something like 18 months, and I think it's
> about time that I try to contribute.
Great!
Show 19 quoted lines
> So, after adding some features to git-rebase.sh (which I will send
> separate mails about), I realized I would have to add them to
> git-rebase--interactive.sh as well. Rather than doing that, I would
> prefer to first extract the common parts of these scripts and add the
> features in only one place. Since this is the first time I do anything
> on Git, I will need a lot of advice.
> 
> My main goal is to extract the commonalities in command line parsing and
> interpretation as well as validation (of command line and repository
> state, and running the pre-rebase hook).
> 
> First of all, do you agree that this should be done and is now a good
> time to do it (I'm thinking mostly about conflicts with other ongoing
> efforts)? While at GitTogether, I talked briefly to Thomas Rast about
> doing this, and he mentioned that resurrecting the git sequencer might
> be a better idea. However, I *think* much of what I was thinking about
> doing involves code that is run before the git sequencer is called. I
> wouldn't mind working on the git sequencer afterwards, unless Christian
> Couder or someone else is currently working on it.

Now that GTAC (http://www.gtac.biz) is over, I plan to work on options --continue, --abort and --skip for git cherry-pick/revert. After that I hope to be able to refactor the code so that in the end common code is used by cherry-pick/revert and rebase.

And I agree that what you want to do does not conflict with my plan. On the contrary it might help in the end. Go for it!

Thanks, Christian.

Previous: Johannes SixtNext: Martin von Zweigbergk
Message 3 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.