Skip to content

Commit 5ab7e0f

Browse files
gitstergitster
committed
Merge branch 'ag/rebase-i-in-c' into js/rebase-in-c-5.5-work-with-rebase-i-in-c
* ag/rebase-i-in-c: rebase -i: move rebase--helper modes to rebase--interactive rebase -i: remove git-rebase--interactive.sh rebase--interactive2: rewrite the submodes of interactive rebase in C rebase -i: implement the main part of interactive rebase as a builtin rebase -i: rewrite init_basic_state() in C rebase -i: rewrite write_basic_state() in C rebase -i: rewrite the rest of init_revisions_and_shortrevisions() in C rebase -i: implement the logic to initialize $revisions in C rebase -i: remove unused modes and functions rebase -i: rewrite complete_action() in C t3404: todo list with commented-out commands only aborts sequencer: change the way skip_unnecessary_picks() returns its result sequencer: refactor append_todo_help() to write its message to a buffer rebase -i: rewrite checkout_onto() in C rebase -i: rewrite setup_reflog_action() in C sequencer: add a new function to silence a command, except if it fails rebase -i: rewrite the edit-todo functionality in C editor: add a function to launch the sequence editor rebase -i: rewrite append_todo_help() in C sequencer: make three functions and an enum from sequencer.c public
2 parents b361bd7 + 34b4731 commit 5ab7e0f

17 files changed

+740
-449
lines changed

‎.gitignore‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@
118118
/git-rebase
119119
/git-rebase--am
120120
/git-rebase--common
121-
/git-rebase--helper
122121
/git-rebase--interactive
123122
/git-rebase--merge
124123
/git-rebase--preserve-merges

‎Makefile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -620,7 +620,6 @@ SCRIPT_LIB += git-mergetool--lib
620620
SCRIPT_LIB += git-parse-remote
621621
SCRIPT_LIB += git-rebase--am
622622
SCRIPT_LIB += git-rebase--common
623-
SCRIPT_LIB += git-rebase--interactive
624623
SCRIPT_LIB += git-rebase--preserve-merges
625624
SCRIPT_LIB += git-rebase--merge
626625
SCRIPT_LIB += git-sh-setup
@@ -927,6 +926,7 @@ LIB_OBJS += protocol.o
927926
LIB_OBJS += quote.o
928927
LIB_OBJS += reachable.o
929928
LIB_OBJS += read-cache.o
929+
LIB_OBJS += rebase-interactive.o
930930
LIB_OBJS += reflog-walk.o
931931
LIB_OBJS += refs.o
932932
LIB_OBJS += refs/files-backend.o
@@ -1065,7 +1065,7 @@ BUILTIN_OBJS += builtin/pull.o
10651065
BUILTIN_OBJS += builtin/push.o
10661066
BUILTIN_OBJS += builtin/read-tree.o
10671067
BUILTIN_OBJS += builtin/rebase.o
1068-
BUILTIN_OBJS += builtin/rebase--helper.o
1068+
BUILTIN_OBJS += builtin/rebase--interactive.o
10691069
BUILTIN_OBJS += builtin/receive-pack.o
10701070
BUILTIN_OBJS += builtin/reflog.o
10711071
BUILTIN_OBJS += builtin/remote.o
@@ -2404,7 +2404,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
24042404
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
24052405
LOCALIZED_SH = $(SCRIPT_SH)
24062406
LOCALIZED_SH += git-parse-remote.sh
2407-
LOCALIZED_SH += git-rebase--interactive.sh
24082407
LOCALIZED_SH += git-rebase--preserve-merges.sh
24092408
LOCALIZED_SH += git-sh-setup.sh
24102409
LOCALIZED_PERL = $(SCRIPT_PERL)

‎builtin.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ extern int cmd_pull(int argc, const char **argv, const char *prefix);
203203
extern int cmd_push(int argc, const char **argv, const char *prefix);
204204
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
205205
extern int cmd_rebase(int argc, const char **argv, const char *prefix);
206-
extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
206+
extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
207207
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
208208
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
209209
extern int cmd_remote(int argc, const char **argv, const char *prefix);

‎builtin/rebase--helper.c‎

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)