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 c0eb96752e1574b48b973acd4ebfdb81406c7bac..954901ddce9404eeadb616c4b65b466c62d4b63f 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -185,6 +185,7 @@ fast_forward_local () {
                        ;;
                *)
                        echo >&2 "  not updating."
+                       exit 1
                        ;;
                esac
            }