From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 2 Nov 2018 02:04:52 +0000 (+0900)
Subject: Merge branch 'pk/rebase-in-c'
X-Git-Tag: v2.20.0-rc0~95
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ae50845d8a30d7db32e139ce04b712f9deb99cd;p=thirdparty%2Fgit.git

Merge branch 'pk/rebase-in-c'

Rewrite of the "rebase" machinery in C.

* pk/rebase-in-c:
  builtin/rebase: support running "git rebase <upstream>"
  rebase: refactor common shell functions into their own file
  rebase: start implementing it as a builtin
---

5ae50845d8a30d7db32e139ce04b712f9deb99cd
diff --cc Makefile
index b08d5ea258,c210681a1d..95b93c709d
--- a/Makefile
+++ b/Makefile
@@@ -1091,8 -1063,8 +1092,9 @@@ BUILTIN_OBJS += builtin/prune-packed.
  BUILTIN_OBJS += builtin/prune.o
  BUILTIN_OBJS += builtin/pull.o
  BUILTIN_OBJS += builtin/push.o
 +BUILTIN_OBJS += builtin/range-diff.o
  BUILTIN_OBJS += builtin/read-tree.o
+ BUILTIN_OBJS += builtin/rebase.o
  BUILTIN_OBJS += builtin/rebase--helper.o
  BUILTIN_OBJS += builtin/receive-pack.o
  BUILTIN_OBJS += builtin/reflog.o
diff --cc builtin.h
index 962f0489ab,44651a447f..6fb66f5ba4
--- a/builtin.h
+++ b/builtin.h
@@@ -202,8 -201,8 +202,9 @@@ extern int cmd_prune(int argc, const ch
  extern int cmd_prune_packed(int argc, const char **argv, const char *prefix);
  extern int cmd_pull(int argc, const char **argv, const char *prefix);
  extern int cmd_push(int argc, const char **argv, const char *prefix);
 +extern int cmd_range_diff(int argc, const char **argv, const char *prefix);
  extern int cmd_read_tree(int argc, const char **argv, const char *prefix);
+ extern int cmd_rebase(int argc, const char **argv, const char *prefix);
  extern int cmd_rebase__helper(int argc, const char **argv, const char *prefix);
  extern int cmd_receive_pack(int argc, const char **argv, const char *prefix);
  extern int cmd_reflog(int argc, const char **argv, const char *prefix);
diff --cc git.c
index adac132956,2c6b188c77..8e52276831
--- a/git.c
+++ b/git.c
@@@ -524,8 -520,13 +524,14 @@@ static struct cmd_struct commands[] = 
  	{ "prune-packed", cmd_prune_packed, RUN_SETUP },
  	{ "pull", cmd_pull, RUN_SETUP | NEED_WORK_TREE },
  	{ "push", cmd_push, RUN_SETUP },
 +	{ "range-diff", cmd_range_diff, RUN_SETUP | USE_PAGER },
  	{ "read-tree", cmd_read_tree, RUN_SETUP | SUPPORT_SUPER_PREFIX},
+ 	/*
+ 	 * NEEDSWORK: Until the rebase is independent and needs no redirection
+ 	 * to rebase shell script this is kept as is, then should be changed to
+ 	 * RUN_SETUP | NEED_WORK_TREE
+ 	 */
+ 	{ "rebase", cmd_rebase },
  	{ "rebase--helper", cmd_rebase__helper, RUN_SETUP | NEED_WORK_TREE },
  	{ "receive-pack", cmd_receive_pack },
  	{ "reflog", cmd_reflog, RUN_SETUP },