Skip to contentSkip to conversation

merge and resolve: Output short hashes and .. in "Updating ..."

PATCH In review Santi Béjar 1 participant 1 message Jun 15, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 merge and resolve: Output short hashes and .. in "Updating ..."

---
 git-merge.sh   |    2 +-
 git-resolve.sh |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
git-merge.sh +1 -1
index 5b34b4d..49c46d5 100755
@@ -197,7 +197,7 @@ f,*)
 	;;
 ?,1,"$head",*)
 	# Again the most common case of merging one remote.
-	echo "Updating from $head to $1"
+	echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $1)"
 	git-update-index --refresh 2>/dev/null
 	new_head=$(git-rev-parse --verify "$1^0") &&
 	git-read-tree -u -v -m $head "$new_head" &&
git-resolve.sh +1 -1
index 729ec65..36b90e3 100755
@@ -46,7 +46,7 @@ case "$common" in
 	exit 0
 	;;
 "$head")
-	echo "Updating from $head to $merge"
+	echo "Updating $(git-rev-parse --short $head)..$(git-rev-parse --short $merge)"
 	git-read-tree -u -m $head $merge || exit 1
 	git-update-ref -m "resolve $merge_name: Fast forward" \
 		HEAD "$merge" "$head"
Signature · 1 line
1.4.2.1.g38049