In git.git 'master' when I cherry-pick a commit which is eventually
empty, git gives me a friendly description of my supposed error, leaves
my cherry-pick "pending" and exits with an error code.
$ git cherry-pick a0aff2d
# On branch master
nothing to commit (working directory clean)
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
In 'next' this is broken. Now git does not tell me anything and it does
not exit with an error code. It does still leave the cherry-pick
pending, though.
$ git cherry-pick a0aff2d
$ cat /tmp/repo/.git/CHERRY_PICK_HEAD
a0aff2da3d12a9a097c02e39570611f359433c23
It bisects to this commit:
commit b27cfb0d8d4cbb6d079c70ffeadac9c0dcfff250
Author: Neil Horman <nhorman@xxxxxxxxxxxxx>
Date: Fri Apr 20 10:36:15 2012 -0400
git-cherry-pick: Add keep-redundant-commits option
The git-cherry-pick --allow-empty command by default only preserves
empty
commits that were originally empty, i.e only those commits for which
<commit>^{tree} and <commit>^^{tree} are equal. By default commits
which are
non-empty, but were made empty by the inclusion of a prior commit on
the current
history are filtered out. This option allows us to override that
behavior and
include redundant commits as empty commits in the change history.
Note that this patch changes the default behavior of git cherry-pick
slightly.
Prior to this patch all commits in a cherry-pick sequence were
applied and git
commit was run. The implication here was that, if a commit was
redundant, and
the commit did not trigger the fast forward logic, the git commit
operation, and
therefore the git cherry-pick operation would fail, displaying the
cherry pick
advice (i.e. run git commit --allow-empty). With this patch
however, such
redundant commits are automatically skipped without stopping, unless
--keep-redundant-commits is specified, in which case, they are
automatically
applied as empty commits.
Signed-off-by: Neil Horman <nhorman@xxxxxxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
I don't have time to chase it any further today. Hopefully someone can
see the flub and straighten it out before I get a chance to look again.
If not, I'll probably forget anyway.
Phil
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html