Skip to content

Commit ff50ee4

Browse files
committed
Merge branch 'pk/rebase-in-c-6-final' into pu
With "rebase -i" machinery being rewritten to C, with a different interface between "rebase" proper and its backends, this and the other topics need a bit more work to play with each other better. This assumes that the meat of "rebase -i" and other backends will stay to be written as shell scripts, and can be dot-sourced with ". git-rebase--$backend", but that assumption directly contradicts with what the other GSoC project to rewrite "rebase -i" machinery in C does, so neither topic is usable as they are without inter topic coordination. * pk/rebase-in-c-6-final: rebase: default to using the builtin rebase
2 parents 16bd1c7 + 73b2570 commit ff50ee4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

builtin/rebase.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static int use_builtin_rebase(void)
5555
cp.git_cmd = 1;
5656
if (capture_command(&cp, &out, 6)) {
5757
strbuf_release(&out);
58-
return 0;
58+
return 1;
5959
}
6060

6161
strbuf_trim(&out);

0 commit comments

Comments
 (0)