pull: drop confusing prefix parameter of die_on_unclean_work_tree()

diff --git a/builtin/pull.c b/builtin/pull.c
index 1d7333c8a11f7aedf244c99f5ac67bea7fccaab4..d4bd6350f0c6e17150ca418533228c15345252ff 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -328,12 +328,12 @@ static int git_pull_config(const char *var, const char *value, void *cb)
 /**
  * Returns 1 if there are unstaged changes, 0 otherwise.
  */
-static int has_unstaged_changes(const char *prefix)
+static int has_unstaged_changes(void)
 {
        struct rev_info rev_info;
        int result;
 
-       init_revisions(&rev_info, prefix);
+       init_revisions(&rev_info, NULL);
        DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
        DIFF_OPT_SET(&rev_info.diffopt, QUICK);
        diff_setup_done(&rev_info.diffopt);
@@ -344,7 +344,7 @@ static int has_unstaged_changes(const char *prefix)
 /**
  * Returns 1 if there are uncommitted changes, 0 otherwise.
  */
-static int has_uncommitted_changes(const char *prefix)
+static int has_uncommitted_changes(void)
 {
        struct rev_info rev_info;
        int result;
@@ -352,7 +352,7 @@ static int has_uncommitted_changes(const char *prefix)
        if (is_cache_unborn())
                return 0;
 
-       init_revisions(&rev_info, prefix);
+       init_revisions(&rev_info, NULL);
        DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
        DIFF_OPT_SET(&rev_info.diffopt, QUICK);
        add_head_to_pending(&rev_info);
@@ -365,7 +365,7 @@ static int has_uncommitted_changes(const char *prefix)
  * If the work tree has unstaged or uncommitted changes, dies with the
  * appropriate message.
  */
-static void die_on_unclean_work_tree(const char *prefix)
+static void die_on_unclean_work_tree(void)
 {
        struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file));
        int do_die = 0;
@@ -375,12 +375,12 @@ static void die_on_unclean_work_tree(const char *prefix)
        update_index_if_able(&the_index, lock_file);
        rollback_lock_file(lock_file);
 
-       if (has_unstaged_changes(prefix)) {
+       if (has_unstaged_changes()) {
                error(_("Cannot pull with rebase: You have unstaged changes."));
                do_die = 1;
        }
 
-       if (has_uncommitted_changes(prefix)) {
+       if (has_uncommitted_changes()) {
                if (do_die)
                        error(_("Additionally, your index contains uncommitted changes."));
                else
@@ -815,6 +815,9 @@ static int run_rebase(const unsigned char *curr_head,
                argv_array_push(&args, "--no-autostash");
        else if (opt_autostash == 1)
                argv_array_push(&args, "--autostash");
+       if (opt_verify_signatures &&
+           !strcmp(opt_verify_signatures, "--verify-signatures"))
+               warning(_("ignoring --verify-signatures for rebase"));
 
        argv_array_push(&args, "--onto");
        argv_array_push(&args, sha1_to_hex(merge_head));
@@ -852,7 +855,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        git_config(git_pull_config, NULL);
 
        if (read_cache_unmerged())
-               die_resolve_conflict("Pull");
+               die_resolve_conflict("pull");
 
        if (file_exists(git_path("MERGE_HEAD")))
                die_conclude_merge();
@@ -872,7 +875,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
                        die(_("Updating an unborn branch with changes added to the index."));
 
                if (!autostash)
-                       die_on_unclean_work_tree(prefix);
+                       die_on_unclean_work_tree();
 
                if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
                        hashclr(rebase_fork_point);