[minor BUG] cherry-pick -x doesn't work if a conflict occurs

Hello,

when hitting a conflict cherry-pick suggests using

	git commit -c $sha1

but the resulting (suggested) commit log doesn't have the extra reference requested by -x.

Best regards Uwe

29 dec 2010 kl. 15:16 skrev Uwe Kleine-König:

The man page says -x only takes effect when you do not have a conflict, so there is no bug.

-- robin

On Wed, Jan 05, 2011 at 07:31:05AM +0100, Robin Rosenberg wrote:

ah, I wonder if this is intended or just documenting a short-coming :-)

Uwe

2011/1/5 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>:

I think it's intended as it's no longer the original commit, but personally I think it should be configurable (I'd like -x to be configurable as well). For now, I use the following "recommit" script after a cherry-pick conflict.

#!/bin/sh # Used after a cherry-pick conflicts to commit with the original # authorship (commit -c) but keep the newly generated commit message # self=$(cd "$(dirname "$0")" && pwd -P)/$(basename "$0") . "$(git --exec-path)/git-sh-setup" require_work_tree cd_to_toplevel test -f .git/MERGE_MSG || die "No .git/MERGE_MSG"

if test "$GIT_EDITOR" = "$self"
then
  cat .git/MERGE_MSG > .GIT/COMMIT_EDITMSG
  exit 0
fi

if sha1=$(sed -ne \
  's/^(cherry picked from commit \([a-f0-9]\{40\}\))$/\1/p' .git/MERGE_MSG)
then
  export GIT_EDITOR="$self"
  git commit -c $sha1
fi

j.

2011/1/5 Jay Soffian <jaysoffian@gmail.com>:

Ah, seems to be a documented short-coming after-all:

  http://thread.gmane.org/gmane.comp.version-control.git/61737/focus=61933

j.

Jay Soffian <jaysoffian@gmail.com> writes:

Well, it is not.

Shawn might have accepted a documentation patch as such during my absence, but when I originally wrote the "cherry-picked-from", it was a conscious design decision not to carry the information forward in a conflicted case, and the reasoning was exactly what you wrote in your first response.

Because -x has become an optional feature that a user has to explicitly ask, I however tend to agree with Uwe that it may make sense to throw the original commit object name in the commit log template these days. That would allow the user to edit it further and say something like "Originally done by Foo in commit 1234, forward ported with conflict resolution."