Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/git-fetch.sh b/git-fetch.sh
index de4f011e26c3d0b2012ff44692757ca0c9984f16..68356343a63b8c07def2edcbed4d3b8c06776921 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -164,6 +164,7 @@ fast_forward_local () {
                ;;
            *,$local)
                echo >&2 "* $1: fast forward to $3"
+               echo >&2 "  from $local to $2"
                git-update-ref "$1" "$2" "$local"
                ;;
            *)
@@ -178,6 +179,7 @@ fast_forward_local () {
                        ;;
                *)
                        echo >&2 "  not updating."
+                       exit 1
                        ;;
                esac
            }