From: Junio C Hamano <junkio@cox.net>
Date: Fri, 17 Mar 2006 22:11:10 +0000 (-0800)
Subject: Merge branch 'jc/fetch' into next
X-Git-Tag: v1.3.0-rc1~24
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d3c4519a726f1cfcb0c96ba71e4f3208b47fed88?hp=35a9f5d91eef7f95a50615e5ec3d36f475878c66

Merge branch 'jc/fetch' into next

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

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
 	    }