diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-13 20:19:40 (GMT) |
| commit | ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0 (patch) | |
| tree | b28ec107bf91e7c460c1fafac96cc9d7208217ed /builtin | |
| parent | 0d107b19890db191c9281bff67180389fb53df24 (diff) | |
| parent | 082ef75b7bfc90ac236afbb857a9552a026832b8 (diff) | |
| download | git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.zip git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.gz git-ed7f8acbaa3d986a8b4e8d625b2f54355ce15ef0.tar.bz2 | |
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.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index effc270..b8116db 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); |