builtin rebase: support --continue
This commit adds the option `--continue` which is used to resume rebase after merge conflicts. The code tries to stay as close to the equivalent shell scripts found in `git-legacy-rebase.sh` as possible. When continuing a rebase, the state variables are read from state_dir. Some of the state variables are not actually stored there, such as `upstream`. The shell script version simply does not set them, but for consistency, we unset them in the builtin version. Signed-off-by: Pratik Karki <predatoramigo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
e65123a71d
commit
f95736288a
9
strbuf.c
9
strbuf.c
@ -120,6 +120,15 @@ void strbuf_trim_trailing_dir_sep(struct strbuf *sb)
|
||||
sb->buf[sb->len] = '\0';
|
||||
}
|
||||
|
||||
void strbuf_trim_trailing_newline(struct strbuf *sb)
|
||||
{
|
||||
if (sb->len > 0 && sb->buf[sb->len - 1] == '\n') {
|
||||
if (--sb->len > 0 && sb->buf[sb->len - 1] == '\r')
|
||||
--sb->len;
|
||||
sb->buf[sb->len] = '\0';
|
||||
}
|
||||
}
|
||||
|
||||
void strbuf_ltrim(struct strbuf *sb)
|
||||
{
|
||||
char *b = sb->buf;
|
||||
|
||||
Reference in New Issue
Block a user