summaryrefslogtreecommitdiff
path: root/strbuf.c
diff options
context:
space:
mode:
authorPratik Karki <predatoramigo@gmail.com>2018-08-08 15:06:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-09-06 18:55:58 (GMT)
commitf95736288a3a8d0168af3fc05dc4251edf0d0b47 (patch)
tree280d5684d592d90ebfa5f818041764ec8a7a2b34 /strbuf.c
parente65123a71d0ca134f901e2340674a712e70ce023 (diff)
downloadgit-f95736288a3a8d0168af3fc05dc4251edf0d0b47.zip
git-f95736288a3a8d0168af3fc05dc4251edf0d0b47.tar.gz
git-f95736288a3a8d0168af3fc05dc4251edf0d0b47.tar.bz2
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>
Diffstat (limited to 'strbuf.c')
-rw-r--r--strbuf.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/strbuf.c b/strbuf.c
index 0305561..fdc0ffb 100644
--- a/strbuf.c
+++ b/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;