From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Andreas Krey <a.krey@gmx.de>, John Keeping <john@keeping.me.uk>,
Jeff King <peff@peff.net>, Richard Hansen <rhansen@bbn.com>,
Philip Oakley <philipoakley@iee.org>,
"Brian M. Carlson" <sandals@crustytoothpaste.net>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v4 5/7] pull: add warning on non-ff merges
Date: Sat, 12 Oct 2013 02:01:58 -0500 [thread overview]
Message-ID: <1381561322-20059-4-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1381561322-20059-1-git-send-email-felipe.contreras@gmail.com>
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@gmail.com>
---
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
next prev parent reply other threads:[~2013-10-12 7:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 7:01 [PATCH v4 4/7] pull: add merge-ff-only option Felipe Contreras
2013-10-12 7:01 ` [PATCH v4 0/7] Reject non-ff pulls by default Felipe Contreras
2013-10-12 7:01 ` [PATCH v4 3/7] pull: add --merge option Felipe Contreras
2013-10-12 7:01 ` Felipe Contreras [this message]
2013-10-12 7:01 ` [PATCH v4 6/7] pull: cleanup documentation Felipe Contreras
2013-10-12 7:02 ` [PATCH v4 2/7] pull: refactor $rebase variable into $mode Felipe Contreras
2013-10-12 7:02 ` [PATCH v4 1/7] pull: rename pull.rename to pull.mode Felipe Contreras
2013-10-12 7:02 ` [PATCH v4 7/7] pull: add documentation about non-ff merges Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1381561322-20059-4-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=a.krey@gmx.de \
--cc=git@vger.kernel.org \
--cc=john@keeping.me.uk \
--cc=peff@peff.net \
--cc=philipoakley@iee.org \
--cc=rhansen@bbn.com \
--cc=sandals@crustytoothpaste.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).