summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-03-17 14:11:10 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-03-17 14:11:10 -0800
commitd3c4519a726f1cfcb0c96ba71e4f3208b47fed88 (patch)
tree90c530f9ece2cf11e9269653f93cf8a3f858e955
parentMerge branch 'ew/abbrev' into next (diff)
parentfetch: exit non-zero when fast-forward check fails. (diff)
downloadtgif-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 c0eb96752e..954901ddce 100755
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -185,6 +185,7 @@ fast_forward_local () {
;;
*)
echo >&2 " not updating."
+ exit 1
;;
esac
}