git-p4: do not terminate creating tag for unknown commit

diff --git a/builtin/pull.c b/builtin/pull.c
index 421a34de4b754437d0bceb6afbea3babd8ebf774..7e3c11ea6351c9703fe7d50057392f0548e03160 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -15,6 +15,7 @@
 #include "dir.h"
 #include "refs.h"
 #include "revision.h"
+#include "tempfile.h"
 #include "lockfile.h"
 
 enum rebase_type {
@@ -798,13 +799,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);
 
@@ -830,10 +824,14 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
                hashclr(orig_head);
 
        if (opt_rebase) {
+               int autostash = 0;
+
                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);
+               git_config_get_bool("rebase.autostash", &autostash);
+               if (!autostash)
+                       die_on_unclean_work_tree(prefix);
 
                if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
                        hashclr(rebase_fork_point);