From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stephen Robin <stephen.robin@gmail.com>,
Paul Tan <pyokagan@gmail.com>
Subject: [PATCH v4 12/19] pull: fast-forward working tree if head is updated
Date: Thu, 18 Jun 2015 18:54:05 +0800 [thread overview]
Message-ID: <1434624852-6869-13-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1434624852-6869-1-git-send-email-pyokagan@gmail.com>
Since b10ac50 (Fix pulling into the same branch., 2005-08-25), git-pull,
upon detecting that git-fetch updated the current head, will
fast-forward the working tree to the updated head commit.
Re-implement this behavior.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
builtin/pull.c | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/builtin/pull.c b/builtin/pull.c
index 1e688be..110e719 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -412,6 +412,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
{
const char *repo, **refspecs;
struct sha1_array merge_heads = SHA1_ARRAY_INIT;
+ unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
if (!getenv("_GIT_USE_BUILTIN_PULL")) {
const char *path = mkpath("%s/git-pull", git_exec_path());
@@ -435,12 +436,41 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
if (file_exists(git_path("MERGE_HEAD")))
die_conclude_merge();
+ if (get_sha1("HEAD", orig_head))
+ hashclr(orig_head);
+
if (run_fetch(repo, refspecs))
return 1;
if (opt_dry_run)
return 0;
+ if (get_sha1("HEAD", curr_head))
+ hashclr(curr_head);
+
+ if (!is_null_sha1(orig_head) && !is_null_sha1(curr_head) &&
+ hashcmp(orig_head, curr_head)) {
+ /*
+ * The fetch involved updating the current branch.
+ *
+ * The working tree and the index file are still based on
+ * orig_head commit, but we are merging into curr_head.
+ * Update the working tree to match curr_head.
+ */
+
+ warning(_("fetch updated the current branch head.\n"
+ "fast-forwarding your working tree from\n"
+ "commit %s."), sha1_to_hex(orig_head));
+
+ if (checkout_fast_forward(orig_head, curr_head, 0))
+ die(_("Cannot fast-forward your working tree.\n"
+ "After making sure that you saved anything precious from\n"
+ "$ git diff %s\n"
+ "output, run\n"
+ "$ git reset --hard\n"
+ "to recover."), sha1_to_hex(orig_head));
+ }
+
get_merge_heads(&merge_heads);
if (!merge_heads.nr)
--
2.1.4
next prev parent reply other threads:[~2015-06-18 10:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 10:53 [PATCH v4 00/19] Make git-pull a builtin Paul Tan
2015-06-18 10:53 ` [PATCH v4 01/19] parse-options-cb: implement parse_opt_passthru() Paul Tan
2015-06-18 10:53 ` [PATCH v4 02/19] parse-options-cb: implement parse_opt_passthru_argv() Paul Tan
2015-06-18 10:53 ` [PATCH v4 03/19] argv-array: implement argv_array_pushv() Paul Tan
2015-06-18 10:53 ` [PATCH v4 04/19] pull: implement skeletal builtin pull Paul Tan
2015-06-18 10:53 ` [PATCH v4 05/19] pull: implement fetch + merge Paul Tan
2015-06-18 10:53 ` [PATCH v4 06/19] pull: pass verbosity, --progress flags to fetch and merge Paul Tan
2015-06-18 10:54 ` [PATCH v4 07/19] pull: pass git-merge's options to git-merge Paul Tan
2015-06-18 10:54 ` [PATCH v4 08/19] pull: pass git-fetch's options to git-fetch Paul Tan
2015-06-18 10:54 ` [PATCH v4 09/19] pull: error on no merge candidates Paul Tan
2015-06-18 10:54 ` [PATCH v4 10/19] pull: support pull.ff config Paul Tan
2015-06-18 10:54 ` [PATCH v4 11/19] pull: check if in unresolved merge state Paul Tan
2015-06-18 10:54 ` Paul Tan [this message]
2015-06-18 10:54 ` [PATCH v4 13/19] pull: implement pulling into an unborn branch Paul Tan
2015-06-18 10:54 ` [PATCH v4 14/19] pull: set reflog message Paul Tan
2015-06-18 10:54 ` [PATCH v4 15/19] pull: teach git pull about --rebase Paul Tan
2015-06-18 10:54 ` [PATCH v4 16/19] pull: configure --rebase via branch.<name>.rebase or pull.rebase Paul Tan
2015-06-18 10:54 ` [PATCH v4 17/19] pull --rebase: exit early when the working directory is dirty Paul Tan
2015-06-18 10:54 ` [PATCH v4 18/19] pull --rebase: error on no merge candidate cases Paul Tan
2015-06-18 10:54 ` [PATCH v4 19/19] pull: remove redirection to git-pull.sh Paul Tan
2015-06-18 20:13 ` [PATCH v4 00/19] Make git-pull a builtin Junio C Hamano
2015-06-19 10:11 ` Paul Tan
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1434624852-6869-13-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=sbeller@google.com \
--cc=stephen.robin@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).