git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [GSoC] [PATCH 0/1] default to builtin rebase
@ 2018-08-08 15:53 Pratik Karki
  2018-08-08 15:53 ` [PATCH 1/1] rebase: default to using the " Pratik Karki
  0 siblings, 1 reply; 2+ messages in thread
From: Pratik Karki @ 2018-08-08 15:53 UTC (permalink / raw)
  To: git
  Cc: christian.couder, Johannes.Schindelin, sbeller, alban.gruin,
	gitster, Pratik Karki

Since, all the conversion of shell script version of `git rebase` is done
as can be seen from the previous patch series, now we can default to the
builtin one. The builtin rebase can now handle every task done by the
original shell script `git rebase`. So, in this patch series, we turn the
builtin rebase `on` so that the rebase operations can be handled it by it.

This patch series is the continuation of
(https://public-inbox.org/git/20180808153635.19944-1-predatoramigo@gmail.com/).

This is the sixth and final patch series for a builtin "git rebase".

If you like to view the development branch, you can view
(https://github.com/git/git/pull/505), where I have kept my commits up to date
and leveraged Travis(there is sporadic failures in t5520 for macos gcc and
isn't due to my patches) for extra testing other than my system.

These patch series are built on top of each other, i.e. they depend on this
order.

Pratik Karki (1):
  rebase: default to using the builtin rebase

 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.18.0

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [PATCH 1/1] rebase: default to using the builtin rebase
  2018-08-08 15:53 [GSoC] [PATCH 0/1] default to builtin rebase Pratik Karki
@ 2018-08-08 15:53 ` Pratik Karki
  0 siblings, 0 replies; 2+ messages in thread
From: Pratik Karki @ 2018-08-08 15:53 UTC (permalink / raw)
  To: git
  Cc: christian.couder, Johannes.Schindelin, sbeller, alban.gruin,
	gitster, Pratik Karki

Now that the builtin rebase is feature-complete, we should use it by
default. Let's keep the legacy scripted version around for the time
being; Once the builtin rebase is well-tested enough, we can remove
`git-legacy-rebase.sh`.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
---
 builtin/rebase.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4e69458161..c8d632b6f4 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -54,7 +54,7 @@ static int use_builtin_rebase(void)
 	cp.git_cmd = 1;
 	if (capture_command(&cp, &out, 6)) {
 		strbuf_release(&out);
-		return 0;
+		return 1;
 	}
 
 	strbuf_trim(&out);
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2018-08-08 15:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-08 15:53 [GSoC] [PATCH 0/1] default to builtin rebase Pratik Karki
2018-08-08 15:53 ` [PATCH 1/1] rebase: default to using the " Pratik Karki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).