From ba017775c164d77d086218e81e2902afecd0f059 Mon Sep 17 00:00:00 2001 From: Felipe Contreras Date: Mon, 26 May 2014 19:19:19 -0500 Subject: [PATCH] update: pass ff-only option when in ff-only mode Signed-off-by: Felipe Contreras --- git-update.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/git-update.sh b/git-update.sh index 0e9b53f122..d2e3f47283 100755 --- a/git-update.sh +++ b/git-update.sh @@ -255,13 +255,16 @@ merge_head=$(sed -e '/ not-for-merge /d' -e 's/ .*//' "$GIT_DIR"/FETCH_HEAD) test -z "$merge_head" && die "$(gettext "Couldnot fetch branch '${branch#refs/heads/}'.")" -# check if a non-fast-forward merge would be needed -if test "$mode" = 'ff-only' && test -z "$no_ff$ff_only${squash#--no-squash}" && - ! git merge-base --is-ancestor "$orig_head" "$merge_head" && - ! git merge-base --is-ancestor "$merge_head" "$orig_head" +if test "$mode" = 'ff-only' && test -z "$no_ff$ff_only${squash#--no-squash}" then - die "$(gettext "The update was not fast-forward, please either merge or rebase. + # check if a non-fast-forward merge would be needed + if ! git merge-base --is-ancestor "$orig_head" "$merge_head" && + ! git merge-base --is-ancestor "$merge_head" "$orig_head" + then + die "$(gettext "The update was not fast-forward, please either merge or rebase. If unsure, run 'git update --merge'.")" + fi + ff_only=--ff-only fi if test "$mode" = rebase -- 2.32.0.93.g670b81a890