git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[GSoC] [PATCH 0/7] builtin rebase actions

From
Pratik Karki <predatoramigo@gmail.com>
Date
Aug 8, 2018, 15:06 UTC
Message-ID
<20180808150622.9614-1-predatoramigo@gmail.com>

The previous patch series implemented essential options and neccessary configurations. This patch series teaches all the rebase actions like `--continue`, `--skip`, `--abort`, et al. to builtin rebase.

These actions are important to operation of `git rebase` hence, are kept in a patch series of their own.

It adds the rebase actions to the previous patch series, (https://public-inbox.org/git/20180808134830.19949-1-predatoramigo@gmail.com/).

This is the third patch series that brings us more closer to 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.

The next in line patch series which I'll be sending out today are:

builtin rebase options: The builtin rebase will add all the options supported by original rebase. builtin rebase rest: The builtin rebase will convert all the remaining shell scripts from the original rebase to C. default to builtin rebase: This will turn on the feature-complete builtin rebase to on.

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

Pratik Karki (7):
  builtin rebase: support --continue
  builtin rebase: support --skip
  builtin rebase: support --abort
  builtin rebase: support --quit
  builtin rebase: support --edit-todo and --show-current-patch
  builtin rebase: actions require a rebase in progress
  builtin rebase: stop if `git am` is in progress
 builtin/rebase.c | 193 ++++++++++++++++++++++++++++++++++++++++++++++-
 strbuf.c         |   9 +++
 strbuf.h         |   3 +
 3 files changed, 201 insertions(+), 4 deletions(-)
-- 
2.18.0
Next: Pratik Karki
Message 1 of 8 in “builtin rebase actions”
  1. Pratik KarkiAug 8, 2018
  2. 1/7 builtin rebase: support --continuePratik Karki, Aug 8, 2018
  3. 2/7 builtin rebase: support --skipPratik Karki, Aug 8, 2018
  4. 3/7 builtin rebase: support --abortPratik Karki, Aug 8, 2018
  5. 4/7 builtin rebase: support --quitPratik Karki, Aug 8, 2018
  6. 5/7 builtin rebase: support --edit-todo and --show-current-patchPratik Karki, Aug 8, 2018
  7. 6/7 builtin rebase: actions require a rebase in progressPratik Karki, Aug 8, 2018
  8. 7/7 builtin rebase: stop if `git am` is in progressPratik Karki, Aug 8, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.