From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 07 Jan 2010 21:10:55 GMT
Subject: Re: [PATCH (v2) 2/2] rebase -i: teach --onto A...B syntax
Message-ID: <201001072210.55727.j6t@kdbg.org>
In-Reply-To: <7vtyux3bx1.fsf@alter.siamese.dyndns.org>

On Donnerstag, 7. Januar 2010, Junio C Hamano wrote:
> I was tempted to suggest having a common helper function, 
> but as Dscho mentioned "rebase -i" implementation does not share much with
> "rebase" (even though it shares the external command line interface from
> the end user's point of view), and I don't see a readily available place
> (other than in git-sh-setup) to do so.
>
> Ideas?

1. Split git-rebase--merge.sh and git-rebase--am.sh backends off of 
git-rebase.sh. Have git-rebase.sh dispatch to 
git-rebase--{am,merge,interactive}.sh as appropriate.

2. Unify command line parsing from git-rebase--*.sh in git-rebase.sh. The 
git-rebase--*.sh can now simply refer to shell variables that were set by 
command line switches (the backends must be invoked using the . (dot) 
command).

3. Place common functionality like the one above in git-rebase.sh.

-- Hannes