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

diff --git a/git-fetch.sh b/git-fetch.sh
index 0346d4a45ca6a67bc0f6521dea799bf37cbb7cf1..68356343a63b8c07def2edcbed4d3b8c06776921 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -179,6 +179,7 @@ fast_forward_local () {
                        ;;
                *)
                        echo >&2 "  not updating."
+                       exit 1
                        ;;
                esac
            }