From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 Aug 2012 21:50:01 +0000 (-0700)
Subject: Merge branch 'mg/rebase-i-onto-reflog-in-full'
X-Git-Tag: v1.8.0-rc0~122
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/4514de70c2e006f6b817498bf941d2b789feaaa7?ds=inline;hp=-c

Merge branch 'mg/rebase-i-onto-reflog-in-full'

The reflog entries left by "git rebase" and "git rebase -i" were
inconsistent.

* mg/rebase-i-onto-reflog-in-full:
rebase -i: use full onto sha1 in reflog
---

4514de70c2e006f6b817498bf941d2b789feaaa7
diff --combined git-rebase--interactive.sh
index 0d2056f027,905346084c..a09e8423dd
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@@ -9,7 -9,9 +9,7 @@@
  #
  # The original idea comes from Eric W. Biederman, in
  # http://article.gmane.org/gmane.comp.version-control.git/22407
 -
 -. git-sh-setup
 -
 +#
  # The file containing rebase commands, comments, and empty lines.
  # This file is created by "git rebase -i" then edited by the user.  As
  # the lines are processed, they are removed from the front of this
@@@ -165,14 -167,6 +165,14 @@@ has_action () 
  	sane_grep '^[^#]' "$1" >/dev/null
  }
  
 +is_empty_commit() {
 +	tree=$(git rev-parse -q --verify "$1"^{tree} 2>/dev/null ||
 +		die "$1: not a commit that can be picked")
 +	ptree=$(git rev-parse -q --verify "$1"^^{tree} 2>/dev/null ||
 +		ptree=4b825dc642cb6eb9a060e54bf8d69288fbee4904)
 +	test "$tree" = "$ptree"
 +}
 +
  # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
  # GIT_AUTHOR_DATE exported from the current environment.
  do_with_author () {
@@@ -197,19 -191,12 +197,19 @@@ git_sequence_editor () 
  
  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 "$@"
  }
  
  pick_one_preserving_merges () {
@@@ -415,29 -402,6 +415,29 @@@ record_in_rewritten() 
  	esac
  }
  
 +do_pick () {
 +	if test "$(git rev-parse HEAD)" = "$squash_onto"
 +	then
 +		# Set the correct commit message and author info on the
 +		# sentinel root before cherry-picking the original changes
 +		# without committing (-n).  Finally, update the sentinel again
 +		# to include these changes.  If the cherry-pick results in a
 +		# conflict, this means our behaviour is similar to a standard
 +		# failed cherry-pick during rebase, with a dirty index to
 +		# resolve before manually running git commit --amend then git
 +		# rebase --continue.
 +		git commit --allow-empty --allow-empty-message --amend \
 +			   --no-post-rewrite -n -q -C $1 &&
 +			pick_one -n $1 &&
 +			git commit --allow-empty --allow-empty-message \
 +				   --amend --no-post-rewrite -n -q -C $1 ||
 +			die_with_patch $1 "Could not apply $1... $2"
 +	else
 +		pick_one $1 ||
 +			die_with_patch $1 "Could not apply $1... $2"
 +	fi
 +}
 +
  do_next () {
  	rm -f "$msg" "$author_script" "$amend" || exit
  	read -r command sha1 rest < "$todo"
@@@ -449,14 -413,16 +449,14 @@@
  		comment_for_reflog pick
  
  		mark_action_done
 -		pick_one $sha1 ||
 -			die_with_patch $sha1 "Could not apply $sha1... $rest"
 +		do_pick $sha1 "$rest"
  		record_in_rewritten $sha1
  		;;
  	reword|r)
  		comment_for_reflog reword
  
  		mark_action_done
 -		pick_one $sha1 ||
 -			die_with_patch $sha1 "Could not apply $sha1... $rest"
 +		do_pick $sha1 "$rest"
  		git commit --amend --no-post-rewrite || {
  			warn "Could not amend commit after successfully picking $sha1... $rest"
  			warn "This is most likely due to an empty commit message, or the pre-commit hook"
@@@ -470,7 -436,8 +470,7 @@@
  		comment_for_reflog edit
  
  		mark_action_done
 -		pick_one $sha1 ||
 -			die_with_patch $sha1 "Could not apply $sha1... $rest"
 +		do_pick $sha1 "$rest"
  		warn "Stopped at $sha1... $rest"
  		exit_with_patch $sha1 0
  		;;
@@@ -493,28 -460,25 +493,28 @@@
  		author_script_content=$(get_author_ident_from_commit HEAD)
  		echo "$author_script_content" > "$author_script"
  		eval "$author_script_content"
 -		output git reset --soft HEAD^
 -		pick_one -n $sha1 || die_failed_squash $sha1 "$rest"
 +		if ! pick_one -n $sha1
 +		then
 +			git rev-parse --verify HEAD >"$amend"
 +			die_failed_squash $sha1 "$rest"
 +		fi
  		case "$(peek_next_command)" in
  		squash|s|fixup|f)
  			# This is an intermediate commit; its message will only be
  			# used in case of trouble.  So use the long version:
 -			do_with_author output git commit --no-verify -F "$squash_msg" ||
 +			do_with_author output git commit --amend --no-verify -F "$squash_msg" ||
  				die_failed_squash $sha1 "$rest"
  			;;
  		*)
  			# This is the final command of this squash/fixup group
  			if test -f "$fixup_msg"
  			then
 -				do_with_author git commit --no-verify -F "$fixup_msg" ||
 +				do_with_author git commit --amend --no-verify -F "$fixup_msg" ||
  					die_failed_squash $sha1 "$rest"
  			else
  				cp "$squash_msg" "$GIT_DIR"/SQUASH_MSG || exit
  				rm -f "$GIT_DIR"/MERGE_MSG
 -				do_with_author git commit --no-verify -e ||
 +				do_with_author git commit --amend --no-verify -F "$GIT_DIR"/SQUASH_MSG -e ||
  					die_failed_squash $sha1 "$rest"
  			fi
  			rm -f "$squash_msg" "$fixup_msg"
@@@ -569,11 -533,10 +569,10 @@@
  	test -s "$todo" && return
  
  	comment_for_reflog finish &&
- 	shortonto=$(git rev-parse --short $onto) &&
  	newhead=$(git rev-parse HEAD) &&
  	case $head_name in
  	refs/*)
- 		message="$GIT_REFLOG_ACTION: $head_name onto $shortonto" &&
+ 		message="$GIT_REFLOG_ACTION: $head_name onto $onto" &&
  		git update-ref -m "$message" $head_name $newhead $orig_head &&
  		git symbolic-ref \
  		  -m "$GIT_REFLOG_ACTION: returning to $head_name" \
@@@ -705,27 -668,6 +704,27 @@@ rearrange_squash () 
  	rm -f "$1.sq" "$1.rearranged"
  }
  
 +# Add commands after a pick or after a squash/fixup serie
 +# in the todo list.
 +add_exec_commands () {
 +	{
 +		first=t
 +		while read -r insn rest
 +		do
 +			case $insn in
 +			pick)
 +				test -n "$first" ||
 +				printf "%s" "$cmd"
 +				;;
 +			esac
 +			printf "%s %s\n" "$insn" "$rest"
 +			first=
 +		done
 +		printf "%s" "$cmd"
 +	} <"$1" >"$1.new" &&
 +	mv "$1.new" "$1"
 +}
 +
  case "$action" in
  continue)
  	# do we have anything to commit?
@@@ -751,6 -693,7 +750,6 @@@ In both case, once you're done, continu
  		fi
  		. "$author_script" ||
  			die "Error trying to find the author identity to amend commit"
 -		current_head=
  		if test -f "$amend"
  		then
  			current_head=$(git rev-parse --verify HEAD)
@@@ -758,12 -701,13 +757,12 @@@
  			die "\
  You have uncommitted changes in your working tree. Please, commit them
  first and then run 'git rebase --continue' again."
 -			git reset --soft HEAD^ ||
 -			die "Cannot rewind the HEAD"
 +			do_with_author git commit --amend --no-verify -F "$msg" -e ||
 +				die "Could not commit staged changes."
 +		else
 +			do_with_author git commit --no-verify -F "$msg" -e ||
 +				die "Could not commit staged changes."
  		fi
 -		do_with_author git commit --no-verify -F "$msg" -e || {
 -			test -n "$current_head" && git reset --soft $current_head
 -			die "Could not commit staged changes."
 -		}
  	fi
  
  	record_in_rewritten "$(cat "$state_dir"/stopped-sha)"
@@@ -835,17 -779,9 +834,17 @@@ git rev-list $merges_option --pretty=on
  	sed -n "s/^>//p" |
  while read -r shortsha1 rest
  do
 +
 +	if test -z "$keep_empty" && is_empty_commit $shortsha1
 +	then
 +		comment_out="# "
 +	else
 +		comment_out=
 +	fi
 +
  	if test t != "$preserve_merges"
  	then
 -		printf '%s\n' "pick $shortsha1 $rest" >> "$todo"
 +		printf '%s\n' "${comment_out}pick $shortsha1 $rest" >>"$todo"
  	else
  		sha1=$(git rev-parse $shortsha1)
  		if test -z "$rebase_root"
@@@ -864,7 -800,7 +863,7 @@@
  		if test f = "$preserve"
  		then
  			touch "$rewritten"/$sha1
 -			printf '%s\n' "pick $shortsha1 $rest" >> "$todo"
 +			printf '%s\n' "${comment_out}pick $shortsha1 $rest" >>"$todo"
  		fi
  	fi
  done
@@@ -897,8 -833,6 +896,8 @@@ f
  
  test -s "$todo" || echo noop >> "$todo"
  test -n "$autosquash" && rearrange_squash "$todo"
 +test -n "$cmd" && add_exec_commands "$todo"
 +
  cat >> "$todo" << EOF
  
  # Rebase $shortrevisions onto $shortonto
@@@ -918,12 -852,6 +917,12 @@@
  #
  EOF
  
 +if test -z "$keep_empty"
 +then
 +	echo "# Note that empty commits are commented out" >>"$todo"
 +fi
 +
 +
  has_action "$todo" ||
  	die_abort "Nothing to do"