Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: left-trim lines read from the script
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Fri, 21 Oct 2016 12:25:36 +0000
(14:25 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Fri, 21 Oct 2016 16:32:35 +0000
(09:32 -0700)
Interactive rebase's scripts may be indented; we need to handle this
case, too, now that we prepare the sequencer to process interactive
rebases.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
0009426
)
diff --git
a/sequencer.c
b/sequencer.c
index 8646ca56fff59d456b4430c46cc7076a770d2238..d74fdce99b9b9b0fbcdd3a37f85a49148515dcac 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-874,6
+874,9
@@
static int parse_insn_line(struct todo_item *item, const char *bol, char *eol)
char *end_of_object_name;
int i, saved, status, padding;
+ /* left-trim */
+ bol += strspn(bol, " \t");
+
for (i = 0; i < ARRAY_SIZE(todo_command_strings); i++)
if (skip_prefix(bol, todo_command_strings[i], &bol)) {
item->command = i;