Re: [PATCH 18/31] rebase: extract merge code to new source file
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Dec 29, 2010, 22:24 UTC
- Message-ID
- <alpine.DEB.1.10.1012292315070.7175@debian>
- In-Reply-To
- <201012292231.33333.j6t@kdbg.org>
On Wed, 29 Dec 2010, Johannes Sixt wrote:
Show 16 quoted lines
> On Dienstag, 28. Dezember 2010, Martin von Zweigbergk wrote:
> > -run_interactive_rebase () {
> > +run_specific_rebase () {
> > if [ "$interactive_rebase" = implied ]; then
> > GIT_EDITOR=:
> > export GIT_EDITOR
> > fi
> > export onto autosquash strategy strategy_opts verbose rebase_root \
> > - force_rebase action preserve_merges upstream switch_to head_name
> > - exec git-rebase--interactive
> > + force_rebase action preserve_merges upstream switch_to head_name \
> > + state_dir orig_head onto_name GIT_QUIET revisions RESOLVEMSG \
> > + allow_rerere_autoupdate
> > + export -f move_to_original_branch
>
> Is export -f portable?It seems like it isn't. What is a good way to check?
Show 9 quoted lines
> > + test "$type" != am && exec git-rebase--$type > > I'd prefer to dispatch to the final rebase type using > > . git-rebase--$type > > This way, you can avoid to export the huge list of helper variables and the > function. (And it might be faster by a millisecond - or a few dozens on > Windows.)
Makes a lot of sense. Will change. Why didn't I do that from the beginning?
Thanks, Martin