Merge branch 'db/send-pack-user-signingkey'

diff --git a/builtin/pull.c b/builtin/pull.c
index 1c4fb443a8109ae3e1af1f268e28b5cb27057b95..722a83c51b1a0ad8ab4ec20ca3c920355ee9075a 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -14,6 +14,8 @@
 #include "remote.h"
 #include "dir.h"
 #include "refs.h"
+#include "revision.h"
+#include "lockfile.h"
 
 enum rebase_type {
        REBASE_INVALID = -1,
@@ -295,6 +297,73 @@ static enum rebase_type config_get_rebase(void)
        return REBASE_FALSE;
 }
 
+/**
+ * Returns 1 if there are unstaged changes, 0 otherwise.
+ */
+static int has_unstaged_changes(const char *prefix)
+{
+       struct rev_info rev_info;
+       int result;
+
+       init_revisions(&rev_info, prefix);
+       DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
+       DIFF_OPT_SET(&rev_info.diffopt, QUICK);
+       diff_setup_done(&rev_info.diffopt);
+       result = run_diff_files(&rev_info, 0);
+       return diff_result_code(&rev_info.diffopt, result);
+}
+
+/**
+ * Returns 1 if there are uncommitted changes, 0 otherwise.
+ */
+static int has_uncommitted_changes(const char *prefix)
+{
+       struct rev_info rev_info;
+       int result;
+
+       if (is_cache_unborn())
+               return 0;
+
+       init_revisions(&rev_info, prefix);
+       DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
+       DIFF_OPT_SET(&rev_info.diffopt, QUICK);
+       add_head_to_pending(&rev_info);
+       diff_setup_done(&rev_info.diffopt);
+       result = run_diff_index(&rev_info, 1);
+       return diff_result_code(&rev_info.diffopt, result);
+}
+
+/**
+ * If the work tree has unstaged or uncommitted changes, dies with the
+ * appropriate message.
+ */
+static void die_on_unclean_work_tree(const char *prefix)
+{
+       struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file));
+       int do_die = 0;
+
+       hold_locked_index(lock_file, 0);
+       refresh_cache(REFRESH_QUIET);
+       update_index_if_able(&the_index, lock_file);
+       rollback_lock_file(lock_file);
+
+       if (has_unstaged_changes(prefix)) {
+               error(_("Cannot pull with rebase: You have unstaged changes."));
+               do_die = 1;
+       }
+
+       if (has_uncommitted_changes(prefix)) {
+               if (do_die)
+                       error(_("Additionally, your index contains uncommitted changes."));
+               else
+                       error(_("Cannot pull with rebase: Your index contains uncommitted changes."));
+               do_die = 1;
+       }
+
+       if (do_die)
+               exit(1);
+}
+
 /**
  * Appends merge candidates from FETCH_HEAD that are not marked not-for-merge
  * into merge_heads.
@@ -362,7 +431,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
        const char *remote = curr_branch ? curr_branch->remote_name : NULL;
 
        if (*refspecs) {
-               fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched."));
+               if (opt_rebase)
+                       fprintf_ln(stderr, _("There is no candidate for rebasing against among the refs that you just fetched."));
+               else
+                       fprintf_ln(stderr, _("There are no candidates for merging among the refs that you just fetched."));
                fprintf_ln(stderr, _("Generally this means that you provided a wildcard refspec which had no\n"
                                        "matches on the remote end."));
        } else if (repo && curr_branch && (!remote || strcmp(repo, remote))) {
@@ -372,7 +444,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
                        repo);
        } else if (!curr_branch) {
                fprintf_ln(stderr, _("You are not currently on a branch."));
-               fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
+               if (opt_rebase)
+                       fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
+               else
+                       fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
                fprintf_ln(stderr, _("See git-pull(1) for details."));
                fprintf(stderr, "\n");
                fprintf_ln(stderr, "    git pull <remote> <branch>");
@@ -384,7 +459,10 @@ static void NORETURN die_no_merge_candidates(const char *repo, const char **refs
                        remote_name = "<remote>";
 
                fprintf_ln(stderr, _("There is no tracking information for the current branch."));
-               fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
+               if (opt_rebase)
+                       fprintf_ln(stderr, _("Please specify which branch you want to rebase against."));
+               else
+                       fprintf_ln(stderr, _("Please specify which branch you want to merge with."));
                fprintf_ln(stderr, _("See git-pull(1) for details."));
                fprintf(stderr, "\n");
                fprintf_ln(stderr, "    git pull <remote> <branch>");
@@ -720,13 +798,6 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        unsigned char orig_head[GIT_SHA1_RAWSZ], curr_head[GIT_SHA1_RAWSZ];
        unsigned char rebase_fork_point[GIT_SHA1_RAWSZ];
 
-       if (!getenv("_GIT_USE_BUILTIN_PULL")) {
-               const char *path = mkpath("%s/git-pull", git_exec_path());
-
-               if (sane_execvp(path, (char **)argv) < 0)
-                       die_errno("could not exec %s", path);
-       }
-
        if (!getenv("GIT_REFLOG_ACTION"))
                set_reflog_message(argc, argv);
 
@@ -751,9 +822,15 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        if (get_sha1("HEAD", orig_head))
                hashclr(orig_head);
 
-       if (opt_rebase)
+       if (opt_rebase) {
+               if (is_null_sha1(orig_head) && !is_cache_unborn())
+                       die(_("Updating an unborn branch with changes added to the index."));
+
+               die_on_unclean_work_tree(prefix);
+
                if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
                        hashclr(rebase_fork_point);
+       }
 
        if (run_fetch(repo, refspecs))
                return 1;