allow double click on current HEAD id after git-pull

Double click on to current HEAD commit id is not possible,
the dot has to go.

[jc: by popular requests.]

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-merge.sh b/git-merge.sh
index 7be9e81f1f886c6e0b4c6be8758bd7ba25f5b04c..cc0952a97db7d998a3f26e98b93cf2154887abd5 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -131,7 +131,7 @@ case "$#,$common,$no_commit" in
        ;;
 1,"$head",*)
        # Again the most common case of merging one remote.
        ;;
 1,"$head",*)
        # Again the most common case of merging one remote.

-       echo "Updating from $head to $1."
+       echo "Updating from $head to $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-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 b53ede8d87b7473fb5b5239228008be372797552..1c7aaefa2528b73fea3eee22b086b94fa91854c5 100755 (executable)
--- a/git-resolve.sh
+++ b/git-resolve.sh
@@ -41,7 +41,7 @@ case "$common" in
        exit 0
        ;;
 "$head")
        exit 0
        ;;
 "$head")

-       echo "Updating from $head to $merge."
+       echo "Updating from $head to $merge"

        git-read-tree -u -m $head $merge || exit 1
        git-update-ref HEAD "$merge" "$head"
        git-diff-tree -p $head $merge | git-apply --stat
        git-read-tree -u -m $head $merge || exit 1
        git-update-ref HEAD "$merge" "$head"
        git-diff-tree -p $head $merge | git-apply --stat