From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:54 +0000 (+0900)
Subject: Merge branch 'pk/rebase-in-c-3-acts'
X-Git-Tag: v2.20.0-rc0~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/39f73315454d2553b2d3219a58f5110a60eba5a1

Merge branch 'pk/rebase-in-c-3-acts'

Rewrite "git rebase" in C.

* pk/rebase-in-c-3-acts:
builtin rebase: stop if `git am` is in progress
builtin rebase: actions require a rebase in progress
builtin rebase: support --edit-todo and --show-current-patch
builtin rebase: support --quit
builtin rebase: support --abort
builtin rebase: support --skip
builtin rebase: support --continue
---

39f73315454d2553b2d3219a58f5110a60eba5a1
diff --cc builtin/rebase.c
index 71367c8530,2165656ae2..1308408277
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@@ -21,7 -21,7 +21,8 @@@
  #include "diff.h"
  #include "wt-status.h"
  #include "revision.h"
 +#include "commit-reach.h"
+ #include "rerere.h"
  
  static char const * const builtin_rebase_usage[] = {
  	N_("git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] "
diff --cc strbuf.h
index 9981f782b2,b7aea8a966..fc40873b65
--- a/strbuf.h
+++ b/strbuf.h
@@@ -183,13 -183,16 +183,16 @@@ static inline void strbuf_setlen(struc
   * Strip whitespace from the beginning (`ltrim`), end (`rtrim`), or both side
   * (`trim`) of a string.
   */
 -extern void strbuf_trim(struct strbuf *);
 -extern void strbuf_rtrim(struct strbuf *);
 -extern void strbuf_ltrim(struct strbuf *);
 +void strbuf_trim(struct strbuf *sb);
 +void strbuf_rtrim(struct strbuf *sb);
 +void strbuf_ltrim(struct strbuf *sb);
  
  /* Strip trailing directory separators */
 -extern void strbuf_trim_trailing_dir_sep(struct strbuf *);
 +void strbuf_trim_trailing_dir_sep(struct strbuf *sb);
  
+ /* Strip trailing LF or CR/LF */
 -extern void strbuf_trim_trailing_newline(struct strbuf *sb);
++void strbuf_trim_trailing_newline(struct strbuf *sb);
+ 
  /**
   * Replace the contents of the strbuf with a reencoded form.  Returns -1
   * on error, 0 on success.