Skip to content

Commit b49ef56

Browse files
committed
Merge branch 'ag/rebase-i-in-c'
Rewrite of the remaining "rebase -i" machinery 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 5ae5084 + 34b4731 commit b49ef56

17 files changed

+742
-451
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
/git-rebase
124124
/git-rebase--am
125125
/git-rebase--common
126-
/git-rebase--helper
127126
/git-rebase--interactive
128127
/git-rebase--merge
129128
/git-rebase--preserve-merges

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,6 @@ SCRIPT_LIB += git-mergetool--lib
627627
SCRIPT_LIB += git-parse-remote
628628
SCRIPT_LIB += git-rebase--am
629629
SCRIPT_LIB += git-rebase--common
630-
SCRIPT_LIB += git-rebase--interactive
631630
SCRIPT_LIB += git-rebase--preserve-merges
632631
SCRIPT_LIB += git-rebase--merge
633632
SCRIPT_LIB += git-sh-setup
@@ -955,6 +954,7 @@ LIB_OBJS += quote.o
955954
LIB_OBJS += range-diff.o
956955
LIB_OBJS += reachable.o
957956
LIB_OBJS += read-cache.o
957+
LIB_OBJS += rebase-interactive.o
958958
LIB_OBJS += reflog-walk.o
959959
LIB_OBJS += refs.o
960960
LIB_OBJS += refs/files-backend.o
@@ -1095,7 +1095,7 @@ BUILTIN_OBJS += builtin/push.o
10951095
BUILTIN_OBJS += builtin/range-diff.o
10961096
BUILTIN_OBJS += builtin/read-tree.o
10971097
BUILTIN_OBJS += builtin/rebase.o
1098-
BUILTIN_OBJS += builtin/rebase--helper.o
1098+
BUILTIN_OBJS += builtin/rebase--interactive.o
10991099
BUILTIN_OBJS += builtin/receive-pack.o
11001100
BUILTIN_OBJS += builtin/reflog.o
11011101
BUILTIN_OBJS += builtin/remote.o
@@ -2436,7 +2436,6 @@ XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --language=Perl \
24362436
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
24372437
LOCALIZED_SH = $(SCRIPT_SH)
24382438
LOCALIZED_SH += git-parse-remote.sh
2439-
LOCALIZED_SH += git-rebase--interactive.sh
24402439
LOCALIZED_SH += git-rebase--preserve-merges.sh
24412440
LOCALIZED_SH += git-sh-setup.sh
24422441
LOCALIZED_PERL = $(SCRIPT_PERL)

builtin.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ extern int cmd_push(int argc, const char **argv, const char *prefix);
205205
extern int cmd_range_diff(int argc, const char **argv, const char *prefix);
206206
extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
207207
extern int cmd_rebase(int argc, const char **argv, const char *prefix);
208-
extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
208+
extern int cmd_rebase__interactive(int argc, const char **argv, const char *prefix);
209209
extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
210210
extern int cmd_reflog(int argc, const char **argv, const char *prefix);
211211
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)