diff options
author | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:46:06 -0800 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-03-23 23:46:06 -0800 |
commit | 9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6 (patch) | |
tree | b2d24401b722ae9f4c487b28dd7202a85bf9b99e | |
parent | 8a8e623514d79f006d9b83c47248435f20d4be2a (diff) | |
parent | a9698bb22fb7b66e5882c3a5e7b2b8b53ea03f90 (diff) | |
download | git-9bc8b776c54e9b4c3b753639b4ae70acb2ff8db6.tar.gz |
Merge branch 'jc/fetch'
* jc/fetch:
fetch: exit non-zero when fast-forward check fails.
-rwxr-xr-x | git-fetch.sh | 1 |
1 files changed, 1 insertions, 0 deletions
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 } |