rebase -i: combine rebase--interactive.c with rebase.c

In order to run `rebase -i` without forking `rebase--interactive` it will be convenient to have all the code from rebase--interactive.c in rebase.c. This is a straight forward copy of the code from rebase--interactive.c, it will be simplified slightly in the next commit. Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
dscho · Apr 19, 2019 · 0609b74 · 0609b74
1 parent 6023c92
commit 0609b74
Show file tree

Hide file tree

Showing 3 changed files with 367 additions and 378 deletions.
diff --git a/Makefile b/Makefile
@@ -1130,7 +1130,6 @@ BUILTIN_OBJS += builtin/push.o
 BUILTIN_OBJS += builtin/range-diff.o
 BUILTIN_OBJS += builtin/read-tree.o
 BUILTIN_OBJS += builtin/rebase.o
-BUILTIN_OBJS += builtin/rebase--interactive.o
 BUILTIN_OBJS += builtin/receive-pack.o
 BUILTIN_OBJS += builtin/reflog.o
 BUILTIN_OBJS += builtin/remote.o

diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c