From: Junio C Hamano <junkio@cox.net>
Date: Fri, 24 Mar 2006 07:46:06 +0000 (-0800)
Subject: Merge branch 'jc/fetch'
X-Git-Tag: v1.3.0-rc1~1^2~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6?hp=8a8e623514d79f006d9b83c47248435f20d4be2a

Merge branch 'jc/fetch'

* jc/fetch:
fetch: exit non-zero when fast-forward check fails.
---

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