rebase: prepare reset_head() for more flags

Currently, we only accept the flag indicating whether the HEAD should be
detached not. In the next commit, we want to introduce another flag: to
toggle between emulating `reset --hard` vs `checkout -q`.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index e173654d5635457aa159c570b14982d42506b145..074594cf1055bde5a873fd623c881272e14b936f 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -522,10 +522,13 @@ static int run_specific_rebase(struct rebase_options *opts)
 
 #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
 
 
 #define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
 

+#define RESET_HEAD_DETACH (1<<0)
+

 static int reset_head(struct object_id *oid, const char *action,
 static int reset_head(struct object_id *oid, const char *action,

-                     const char *switch_to_branch, int detach_head,
+                     const char *switch_to_branch, unsigned flags,

                      const char *reflog_orig_head, const char *reflog_head)
 {
                      const char *reflog_orig_head, const char *reflog_head)
 {

+       unsigned detach_head = flags & RESET_HEAD_DETACH;

        struct object_id head_oid;
        struct tree_desc desc;
        struct lock_file lock = LOCK_INIT;
        struct object_id head_oid;
        struct tree_desc desc;
        struct lock_file lock = LOCK_INIT;


@@ -1500,8 +1503,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                         "it...\n"));
 
        strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);
                         "it...\n"));
 
        strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);

-       if (reset_head(&options.onto->object.oid, "checkout", NULL, 1,
-           NULL, msg.buf))
+       if (reset_head(&options.onto->object.oid, "checkout", NULL,
+                      RESET_HEAD_DETACH, NULL, msg.buf))

                die(_("Could not detach HEAD"));
        strbuf_release(&msg);
 
                die(_("Could not detach HEAD"));
        strbuf_release(&msg);