[PATCH 3/5] fetch & co: Use short sha1 in the output
From: Santi Béjar <hidden>
Date: 2016-06-15 22:42:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
... for brevity. Signed-off-by: Santi Béjar <redacted> --- git-fetch.sh | 6 +++--- git-merge.sh | 2 +- git-resolve.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-fetch.sh b/git-fetch.sh
index 08d86cd..32553f8 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh@@ -129,11 +129,11 @@ append_fetch_head () { then headc_=$(git-rev-parse --verify "$head_^0") || exit echo "$headc_ $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD" - [ "$verbose" ] && echo >&2 "* committish: $head_" + [ "$verbose" ] && echo >&2 "* committish: $(git-rev-parse --short $head_)" [ "$verbose" ] && echo >&2 " $note_" else echo "$head_ not-for-merge $note_" >>"$GIT_DIR/FETCH_HEAD" - [ "$verbose" ] && echo >&2 "* non-commit: $head_" + [ "$verbose" ] && echo >&2 "* non-commit: $(git-rev-parse --short $head_)" [ "$verbose" ] && echo >&2 " $note_" fi if test "$local_name_" != ""
@@ -182,7 +182,7 @@ fast_forward_local () { ;; *,$local) echo >&2 "* $1: fast forward to $3" - echo >&2 " $local..$2" + echo >&2 " $(git-rev-parse --short $local)..$(git-rev-parse --short $2)" git-update-ref -m "$rloga: fast-forward" "$1" "$2" "$local" ;; *)
diff --git a/git-merge.sh b/git-merge.sh
index fd587c5..49c46d5 100755
--- a/git-merge.sh
+++ b/git-merge.sh@@ -197,7 +197,7 @@ f,*) ;; ?,1,"$head",*) # Again the most common case of merging one remote. - echo "Updating $head..$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" &&
diff --git a/git-resolve.sh b/git-resolve.sh
index 6e4fb02..36b90e3 100755
--- a/git-resolve.sh
+++ b/git-resolve.sh@@ -46,7 +46,7 @@ case "$common" in exit 0 ;; "$head") - echo "Updating $head..$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"
--
1.4.2.1.g38049