aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-17 14:11:10 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-17 14:11:10 -0800
commitd3c4519a726f1cfcb0c96ba71e4f3208b47fed88 (patch)
tree90c530f9ece2cf11e9269653f93cf8a3f858e955
parent35a9f5d91eef7f95a50615e5ec3d36f475878c66 (diff)
parenta9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90 (diff)
downloadgit-d3c4519a726f1cfcb0c96ba71e4f3208b47fed88.tar.gz
git-d3c4519a726f1cfcb0c96ba71e4f3208b47fed88.tar.xz
Merge branch 'jc/fetch' into next
* jc/fetch: fetch: exit non-zero when fast-forward check fails.
-rwxr-xr-xgit-fetch.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/git-fetch.sh b/git-fetch.sh
index c0eb96752..954901ddc 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -185,6 +185,7 @@ fast_forward_local () {
;;
*)
echo >&2 " not updating."
+ exit 1
;;
esac
}