summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-06-13 13:19:40 -0700
commited7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (patch)
treeb28ec107bf91e7c460c1fafac96cc9d7208217ed /builtin
parentMerge branch 'nd/worktree-name-sanitization' (diff)
parentrebase: fold git-rebase--common into the -p backend (diff)
downloadtgif-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.xz
Merge branch 'js/rebase-cleanup'
Update supporting parts of "git rebase" to remove code that should no longer be used. * js/rebase-cleanup: rebase: fold git-rebase--common into the -p backend sequencer: the `am` and `rebase--interactive` scripts are gone .gitignore: there is no longer a built-in `git-rebase--interactive` t3400: stop referring to the scripted rebase Drop unused git-rebase--am.sh
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rebase.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c
index effc2709a8..b8116db487 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -1153,10 +1153,6 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
}
switch (opts->type) {
- case REBASE_AM:
- backend = "git-rebase--am";
- backend_func = "git_rebase__am";
- break;
case REBASE_PRESERVE_MERGES:
backend = "git-rebase--preserve-merges";
backend_func = "git_rebase__preserve_merges";
@@ -1167,8 +1163,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
}
strbuf_addf(&script_snippet,
- ". git-sh-setup && . git-rebase--common &&"
- " . %s && %s", backend, backend_func);
+ ". git-sh-setup && . %s && %s", backend, backend_func);
argv[0] = script_snippet.buf;
status = run_command_v_opt(argv, RUN_USING_SHELL);