Commit 55071ea2 authored by yohoho hahhahah's avatar yohoho hahhahah Committed by Junio C Hamano

rebase: start implementing it as a builtin

This commit imitates the strategy that was used to convert the
difftool to a builtin. We start by renaming the shell script
`` to `` and introduce a
`builtin/rebase.c` that simply executes the shell script version,
unless the config setting `rebase.useBuiltin` is set to `true`.

The motivation behind this is to rewrite all the functionality of the
shell script version in the aforementioned `rebase.c`, one by one and
be able to conveniently test new features by configuring

In the original difftool conversion, if sane_execvp() that attempts to
run the legacy scripted version returned with non-negative status, the
command silently exited without doing anything with success, but
sane_execvp() should not return with non-negative status in the first
place, so we use die() to notice such an abnormal case.

We intentionally avoid reading the config directly to avoid
messing up the GIT_* environment variables when we need to fall back to
exec()ing the shell script. The test of builtin rebase can be done by
`git -c rebase.useBuiltin=true rebase ...`
Signed-off-by: yohoho hahhahah's avatarPratik Karki <>
Signed-off-by: default avatarJunio C Hamano <>
parent 1d89318c
......@@ -78,6 +78,7 @@
......@@ -609,7 +609,7 @@ SCRIPT_SH +=
......@@ -1063,6 +1063,7 @@ BUILTIN_OBJS += builtin/prune.o
BUILTIN_OBJS += builtin/pull.o
BUILTIN_OBJS += builtin/push.o
BUILTIN_OBJS += builtin/read-tree.o
BUILTIN_OBJS += builtin/rebase.o
BUILTIN_OBJS += builtin/rebase--helper.o
BUILTIN_OBJS += builtin/receive-pack.o
BUILTIN_OBJS += builtin/reflog.o
......@@ -202,6 +202,7 @@ extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
extern int cmd_pull(int argc, const char **argv, const char *prefix);
extern int cmd_push(int argc, const char **argv, const char *prefix);
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
extern int cmd_rebase(int argc, const char **argv, const char *prefix);
extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
* "git rebase" builtin command
* Copyright (c) 2018 Pratik Karki
#include "builtin.h"
#include "run-command.h"
#include "exec-cmd.h"
#include "argv-array.h"
#include "dir.h"
static int use_builtin_rebase(void)
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf out = STRBUF_INIT;
int ret;
"config", "--bool", "rebase.usebuiltin", NULL);
cp.git_cmd = 1;
if (capture_command(&cp, &out, 6)) {
return 0;
ret = !strcmp("true", out.buf);
return ret;
int cmd_rebase(int argc, const char **argv, const char *prefix)
* NEEDSWORK: Once the builtin rebase has been tested enough
* and is retired to contrib/, this preamble
* can be removed.
if (!use_builtin_rebase()) {
const char *path = mkpath("%s/git-legacy-rebase",
if (sane_execvp(path, (char **)argv) < 0)
die_errno(_("could not exec %s"), path);
BUG("sane_execvp() returned???");
if (argc != 2)
die(_("Usage: %s <base>"), argv[0]);
prefix = setup_git_directory();
......@@ -521,6 +521,12 @@ static struct cmd_struct commands[] = {
{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
{ "push", cmd_push, RUN_SETUP },
{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
* NEEDSWORK: Until the rebase is independent and needs no redirection
* to rebase shell script this is kept as is, then should be changed to
{ "rebase", cmd_rebase },
{ "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
{ "receive-pack", cmd_receive_pack },
{ "reflog", cmd_reflog, RUN_SETUP },
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment