Re: [PATCH v8 4/4] git-rebase: add keep_empty flag
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Jul 18, 2012, 06:20 UTC
- Message-ID
- <CAOeW2eEchYzRYYUBySKg5xYY3vBDy8GVcAd=ay-HoAGDLZtORw@mail.gmail.com>
- In-Reply-To
- <1334932577-31232-5-git-send-email-nhorman@tuxdriver.com>
On Fri, Apr 20, 2012 at 7:36 AM, Neil Horman <nhorman@tuxdriver.com> wrote:
Show 16 quoted lines
> pick_one () {
> ff=--ff
> +
> case "$1" in -n) sha1=$2; ff= ;; *) sha1=$1 ;; esac
> case "$force_rebase" in '') ;; ?*) ff= ;; esac
> output git rev-parse --verify $sha1 || die "Invalid commit name: $sha1"
> +
> + if is_empty_commit "$sha1"
> + then
> + empty_args="--allow-empty"
> + fi
> +
> test -d "$rewritten" &&
> pick_one_preserving_merges "$@" && return
> - output git cherry-pick $ff "$@"
> + output git cherry-pick $empty_args $ff "$@"The is_empty_commit check seems to mean that if $sha1 is an "empty" commit, we pass the --allow-empty option to cherry-pick. If it's not empty, we don't. The word "allow" in "allow-empty" suggests that even if the commit is not empty, cherry-pick would not mind. So, can we always pass "allow-empty" to cherry-pick (i.e. even if the commit to pick is not empty)?
Sorry I'm commenting so late; I didn't have time to look at your patches when you sent them, but I'm currently working on the code touched by this patch.