From: Johannes Sixt <j6t@kdbg.org>
Date: Wed, 29 Dec 2010 21:31:32 GMT
Subject: Re: [PATCH 18/31] rebase: extract merge code to new source file
Message-ID: <201012292231.33333.j6t@kdbg.org>
In-Reply-To: <1293528648-21873-19-git-send-email-martin.von.zweigbergk@gmail.com>

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?

> +	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.)

-- Hannes