To prepare our uses for the upcoming changes we should warn them and let
them know that they will need to specify a merge or a rebase in the
future (when a non-fast-forward situation arises). Also, let them know
we fallback to 'git pull --merge', so when the obsoletion of this mode
comes, they know what to type without interrupting or changing their
workflow.
Signed-off-by: Felipe Contreras <felipe.contreras@xxxxxxxxx>
---
git-pull.sh | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/git-pull.sh b/git-pull.sh
index 6e6b887..d1b07d8 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -62,7 +62,7 @@ then
echo "Please use pull.mode and branch.<name>.pullmode instead."
fi
fi
-test -z "$mode" && mode=merge
+test -z "$mode" && mode=default
dry_run=
while :
do
@@ -286,13 +286,22 @@ case "$merge_head" in
*)
# check if a non-fast-foward merge would be needed
merge_head=${merge_head% }
- if test "$mode" = merge-ff-only -a -z "$no_ff$ff_only${squash#--no-squash}" &&
+ if test -z "$no_ff$ff_only${squash#--no-squash}" &&
test -n "$orig_head" &&
! git merge-base --is-ancestor "$orig_head" "$merge_head" &&
! git merge-base --is-ancestor "$merge_head" "$orig_head"
then
- die "$(gettext "The pull was not fast-forward, please either merge or rebase.
+ case "$mode" in
+ merge-ff-only)
+ die "$(gettext "The pull was not fast-forward, please either merge or rebase.
If unsure, run 'git pull --merge'.")"
+ ;;
+ default)
+ echo "$(gettext "warning: the pull was not fast-forward, in the future you would have to choose
+a merge or a rebase, falling back to old style for now (git pull --merge).
+Read 'git pull --help' for more information.")" >&2
+ ;;
+ esac
fi
;;
esac
--
1.8.4-fc
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html