Re: [PATCH] rebase -i: Fix white space in comments

Sorry for the whitespace bug, it looks like everything is under control one way or the other.

Re: [RFC PATCH v4 0/3] Optional sub hierarchy for remote tags

Jake & Ævar, Thanks for the great feed back. As I mentioned previously, I'm going to be on vacation until May 17th, but will be following along on email as connedtivity allows. I'm all for moving in the "perfect" direction so hopefully you guys can decide on a solution and start moving in that

Re: Fetching tags overwrites existing tags

I'm going on vacation until May 17 and will have limited connectivity. I've created a new patch series, "Optional sub hierarchy for remote tags" [1] that I'd appreciate comments and if someone wants to take this over in my absence that would be great. I'd sure like to see this continue to move

[RFC PATCH v4 3/3] Test git remote add -f --remote-tags

The test adds and fetches a remote repository and then lists the imported remote-tags verifying the correct values. Signed-off-by: Wink Saville <w...@saville.com> --- t/t5505-remote.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-rem

[RFC PATCH v4 1/3] Teach remote add the --remote-tags option

il.com> Helped-by: Bryan Turner <btur...@atlassian.com> Helped-by: Ævar Arnfjörð Bjarmason <ava...@gmail.com> Signed-off-by: Wink Saville <w...@saville.com> --- Documentation/git-remote.txt | 8 +-- builtin/remote.c | 44 re

[RFC PATCH v4 2/3] Teach tag to list remote-tags

Add FILTER_REFS_REMOTE_TAGS to allow tags to be to identified as a remote-tags and then list them without displaying refs/remote-tags. Signed-off-by: Wink Saville <w...@saville.com> --- builtin/tag.c | 2 +- ref-filter.c | 9 +++-- ref-filter.h | 11 ++- 3 files chang

[RFC PATCH v4 0/3] Optional sub hierarchy for remote tags

roperly. It also test for "git remote add" which uses "git tag -l". [1]: https://public-inbox.org/git/xmqqbme51rgn@gitster-ct.c.googlers.com/T/#m4928340a9f49c6ffa9db5b94243e46df6958eaa5 [2]: https://public-inbox.org/git/xmqqbme51rgn@gitster-ct.c.googlers.com/T/#mb68d546

Re: [RFC PATCH v3] Teach remote add the --remote-tags option

I forgot to mention that I added the code to error out if --remote-tags is used with "tracking" (-t | --track) or mirror: + if ((fetch_tags == TAGS_SET_REMOTE) && mirror) + die(_("specifying --remote-tags makes no sense with --mirror")); + if ((fetch_tags ==

Re: [RFC PATCH v3] Teach remote add the --remote-tags option

In this version I changed "+refs/tags/*:refs/remotes/tags/%s/*" back to "+refs/tags/*:refs/remote-tags/%s/*" as Junio originally suggested. This way don't have remotename collisions as Bryan pointed out. Since I don't like "--prefix-tags" I changed the option to "--remote-tags" but obviously open

[RFC PATCH v3] Teach remote add the --remote-tags option

c79c280c9682d32e Helped-by: Junio C Hamano <gits...@pobox.com> Helped-by: Jacob Keller <jacob.kel...@gmail.com> Signed-off-by: Wink Saville <w...@saville.com> --- Documentation/git-remote.txt | 8 +-- builtin/remote.c | 44 remo

Re: Fetching tags overwrites existing tags

On Thu, Apr 26, 2018 at 4:24 PM, Junio C Hamano wrote: > Junio C Hamano writes: > > > Hence (1) we should detect and error out when --prefix-tags is used > with mirror fetch near where we do the same for track used without > mirror fetch already, (2) detect

[RFC PATCH v2] Teach remote add the --prefix-tags option

fs/remotes/tags/gbenchmark/* tagopt = --prefix-tags Based on a solution proposed by Junio on the email list [1] [1]: https://public-inbox.org/git/xmqqbme51rgn@gitster-ct.c.googlers.com/T/#me7f7f153b8ba742c0dc48d8ec79c280c9682d32e Helped-by: Junio C Hamano <gits...@pobox.com> Helped-by:

Re: Fetching tags overwrites existing tags

I've tried to teach 'git remote add' the --prefix-tags option using the technique Junio provided. At moment it is PR #486 on github [1] and I'd love some comments on whether or not this the right direction for fetching tags and putting them in the branches namespace. -- Wink [1]

Re: Fetching tags overwrites existing tags

On Tue, Apr 24, 2018 at 5:52 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> Ideally I would have liked the tags fetched from gbenchmark to have a prefix >> of gbenchmark/, like the branches have, maybe something

Fetching tags overwrites existing tags

If have a repository with a tag "v1.0.0" and I add a remote repository which also has a tag "v1.0.0" tag is overwritten. Google found [1] from 2011 and option 3 is what I'd like to see. Has it been implemented and I just don't see it? [1]:

Re: Errors testing on macOS High Sierra version 10.13.4

On Thu, Apr 5, 2018 at 2:33 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Wed, Apr 4, 2018 at 1:06 PM, Wink Saville <w...@saville.com> wrote: >> I built git on a mac osx laptop and got some errors when testing. >> I ran ./ci/run-build-and-tests.sh and thre

Re: [RFC PATCH 0/1] bdl-lib.sh: add bash debug logger

On Thu, Apr 5, 2018 at 12:32 PM, Johannes Schindelin wrote: > Hi Wink, > Note: I have nothing to do with including it. That is the sole discretion > of Junio (who is offline for a week or two, if I understood correctly). > > Ciao, > Johannes txs, I understand.

Re: [RFC PATCH 0/1] bdl-lib.sh: add bash debug logger

On Thu, Apr 5, 2018 at 6:37 AM, Johannes Schindelin wrote: > After thinking about this more, I am a lot less opposed to including this > in Git's source code. However, as it is not necessary for Git's > functionality, it should probably go into contrib/, and I would

Errors testing on macOS High Sierra version 10.13.4

I built git on a mac osx laptop and got some errors when testing. I ran ./ci/run-build-and-tests.sh and three of the tests had failures that appear to be associated with character encoding: ... BUILTIN git-whatchanged SUBDIR git-gui SUBDIR gitk-git SUBDIR templates + make --quiet

Re: [RFC PATCH 0/1] bdl-lib.sh: add bash debug logger

On Fri, Mar 30, 2018 at 3:34 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Wink, > > On Tue, 27 Mar 2018, Wink Saville wrote: > >> Add bdl-lib.sh which provides functions to assit in debugging git >> shell scripts and tests. > > Inter

[RFC PATCH 0/1] bdl-lib.sh: add bash debug logger

t.txt bdl-exmpl4.sh:12: good bye to bdl_out.txt monkeys via 5 bdl-exmpl4.sh:26: horses via 1 bdl-exmpl4.sh:27: orcas to bdl_out.txt TODO: More tests and documentation needed. Wink Saville (1): bdl-lib.sh: add bash debug logger bdl-exmpl.sh | 46 bdl-lib.sh

[RFC PATCH 1/1] bdl-lib.sh: add bash debug logger

Add bdl-lib to assist the programmer in debugging scripts and tests. --- bdl-exmpl.sh | 46 bdl-lib.sh | 215 + t/t0014-bdl-lib.sh | 115 t/test-lib.sh | 4 + 4 files changed, 380

Re: [PATCH v5] json_writer: new routines to create data in JSON format

On Tue, Mar 27, 2018 at 2:02 PM wrote: > > From: Jeff Hostetler > > Add a series of jw_ routines and "struct json_writer" structure to compose > JSON data. The resulting string data can then be output by commands wanting > to support a JSON output

Re: [PATCH v4] json_writer: new routines to create data in JSON format

> the leading spaces are required in this case. > the pretty json output contains 8 spaces for that sub-structure not a tab. > is there a preferred way to denote this in the test script? > > Jeff I've used "git diff --check" which I got from Documentation/SubmittingPatches. -- Wink

Re: [RFC PATCH v5 0/8] rebase-interactive

> I was just going by what the reported compiler error message was. > It said that "unsigned long" didn't match the uint64_t variable. > And that made me nervous. > > If all of the platforms we build on define uintmax_t >= 64 bits, > then it doesn't matter. > > If we do have a platform where

Re: Should I try to fix rebase interactive preserve-merges bug

> AFAIK this breakage of preserve-merges is a design flaw which isn't > really fixable, which is why --recreate-merges is being added. > > I believe the plan is to deprecate preserve-merges once > recreate-merges has landed. > > Thanks, > Jake Txs for the info, hopefully others will respond.

Should I try to fix rebase interactive preserve-merges bug

There is a "TODO known breakage" in t3404-rebase-interactve.sh: not ok 24 - exchange two commits with -p # TODO known breakage I'm contemplating trying to fix it. But with --recreate-merges coming maybe it's not worth the effort. Should I proceed with attempting a fix or is --preserve-merges

[RFC PATCH 0/1] json-writer: add cast to uintmax_t

quot;%"PRIuMAX, value); Corrected in Patch 1/1 by casting value to uintmax_t. Wink Saville (1): json-writer: add cast to uintmax_t json-writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.16.2

[RFC PATCH v2 1/1] json-writer: add cast to uintmax_t

Correct a compile error on Mac OSX by adding a cast to uintmax_t in calls to strbuf_addf. Helped-by: Ramsay Jones <ram...@ramsayjones.plus.com> Tested-by: travis-ci Signed-off-by: Wink Saville <w...@saville.com> --- json-writer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deleti

Re: [RFC PATCH v5 0/8] rebase-interactive

>> I queued everything (with all patch 3-8/8 retitled to share a >> common prefix, so that "git shortlog" output would stay sane) >> and I think I resolved the conflicts with Dscho's recreate-merges >> topic correctly. Please double check what will appear on 'pu' later >> today. >> >> Thanks. >>

[RFC PATCH 1/1] json-writer: incorrect format specifier

In routines jw_object_uint64 and jw_object_double strbuf_addf is invoked with strbuf_addf(>json, ":%"PRIuMAX, value) where value is a uint64_t. This causes a compile error on OSX. The correct format specifier is PRIu64 instead of PRIuMax. Signed-off-by: Wink Saville <w...@savill

[RFC PATCH 0/1] json-writer: incorrect format specifier

IuMax to PRIu64 to correct the compile error and now Travis-CI is green [2]. [1]: https://travis-ci.org/winksaville/git/builds/357660624 [2]: https://travis-ci.org/winksaville/git/builds/357681929 Wink Saville (1): json-writer: incorrect format specifier json-writer.c | 4 ++-- 1 file c

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

> I actually do not care if line-wrapping is done; it is perfectly > fine to leave it for future clean-up and leave it outside the scope > of this series. If you are going to do as a part of the series, > yes, I do prefer you limit yourself to those lines that are involved > in the series in some

Re: [RFC PATCH v5 0/8] rebase-interactive

On Fri, Mar 23, 2018 at 3:39 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville <w...@saville.com> wrote: >>> Reworked patch 1 so that all of the backend scriptlets >&

Re: [RFC PATCH v5 3/8] Indent function git_rebase__interactive

On Fri, Mar 23, 2018 at 3:12 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> Signed-off-by: Wink Saville <w...@saville.com> >> --- >> git-rebase--interactive.sh | 432 >> ++--

Re: [RFC PATCH v5 0/8] rebase-interactive

On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville <w...@saville.com> wrote: > Reworked patch 1 so that all of the backend scriptlets > used by git-rebase use a normal function style invocation. > > Merged the previous patch 2 and 3 have been squashed which > provides reviewers

[RFC PATCH v5 5/8] Add and use git_rebase__interactive__preserve_merges

At the moment it's an exact copy of git_rebase__interactive except the name has changed. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 108 + git-rebase.sh | 2 +- 2 files changed, 109 insertions

[RFC PATCH v5 1/8] rebase-interactive: simplify pick_on_preserving_merges

Use compound if statement instead of nested if statements to simplify pick_on_preserving_merges. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/git-rebase--interactive.sh

[RFC PATCH v5 6/8] Remove unused code paths from git_rebase__interactive

Since git_rebase__interactive is now never called with $preserve_merges = t we can remove those code paths. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 95 ++ 1 file changed, 4 insertions(+), 91 deletions(-)

[RFC PATCH v5 0/8] rebase-interactive

Reworked patch 1 so that all of the backend scriptlets used by git-rebase use a normal function style invocation. Merged the previous patch 2 and 3 have been squashed which provides reviewers a little easier time to detect any changes during extraction of the functions. Wink Saville (8

[RFC PATCH v5 8/8] Remove merges_option and a blank line

merges_option is unused in git_rebase__interactive and always empty in git_rebase__interactive__preserve_merges so it can be removed. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git

[RFC PATCH v5 4/8] Extract functions out of git_rebase__interactive

The extracted functions are: - initiate_action - setup_reflog_action - init_basic_state - init_revisions_and_shortrevisions - complete_action Used by git_rebase__interactive Signed-off-by: Wink Saville <w...@saville.com> Helped-by: Junio C Hamano <gits...@pobox.com> Helped-

[RFC PATCH v5 2/8] rebase: update invocation of rebase dot-sourced scripts

in which a scriptlet is merely a function library. Signed-off-by: Wink Saville <w...@saville.com> Helped-by: Junio C Hamano <gits...@pobox.com> Helped-by: Eric Sunshine <sunsh...@sunshineco.com> --- git-rebase--am.sh | 11 --- git-rebase--interactive.sh | 11 ---

[RFC PATCH v5 3/8] Indent function git_rebase__interactive

Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 432 ++--- 1 file changed, 215 insertions(+), 217 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 213d75f43..a79330f45 100644 ---

[RFC PATCH v5 7/8] Remove unused code paths from git_rebase__interactive__preserve_merges

Since git_rebase__interactive__preserve_merges is now always called with $preserve_merges = t we can remove the unused code paths. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 152 - 1 file changed, 69 inse

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

On Fri, Mar 23, 2018 at 1:51 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> Here is one possibility: >> >> git format-patch --cover-letter --rfc --thread -v 5 >> --to=git@vger.kernel.org --cc=sunsh...@sunshin

Re: [RFC PATCH v3 5/9] Use new functions in git_rebase__interactive

On Fri, Mar 23, 2018 at 11:24 AM, Junio C Hamano wrote: > Johannes Schindelin writes: > >> If you fold this into the previous patch, I am sure that after your 3/9 >> indenting the function properly, the splitting into functions will look >> more or

Re: [RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

On Fri, Mar 23, 2018 at 10:12 AM, Johannes Schindelin <johannes.schinde...@gmx.de> wrote: > Hi Wink, > > On Thu, 22 Mar 2018, Wink Saville wrote: > >> The backend scriptlets for "git rebase" were structured in a >> bit unusual way for historical

[RFC PATCH v4] rebase-interactive

This is v4 of the first 2 patches of "[RFC PATCH vV n/9] rebase-interactive", looking forward to any additional comments. Wink Saville (2): rebase-interactive: Simplify pick_on_preserving_merges rebase: Update invocation of rebase dot-sourced scripts git-rebase--am.sh

[RFC PATCH v4] rebase: Update invocation of rebase dot-sourced scripts

the scriptlet function library and allows multiple functions to be implemented in a scriptlet. Signed-off-by: Wink Saville <w...@saville.com> Reviewed-by: Junio C Hamano <gits...@pobox.com> Reviewed-by: Eric Sunsine <suns...@sunshineco.com> --- git-rebase--am.sh | 11

[RFC PATCH v4] rebase-interactive: Simplify pick_on_preserving_merges

Use compound if statement instead of nested if statements to simplify pick_on_preserving_merges. Signed-off-by: Wink Saville <w...@saville.com> Reviewed-by: Junio C Hamano <gis...@pobox.com> --- git-rebase--interactive.sh | 17 +++-- 1 file changed, 7 insertions(+),

Re: [RFC PATCH v3.1 2/9 2/2] rebase-interactive: Do not automatically run code

On Thu, Mar 22, 2018 at 1:46 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> At Junio's suggestion have git-rebase--am and git-rebase--merge work the >> same way as git-rebase--interactive. This makes the code more consiste

[RFC PATCH v3.1 2/9 2/2] rebase-interactive: Do not automatically run code

At Junio's suggestion have git-rebase--am and git-rebase--merge work the same way as git-rebase--interactive. This makes the code more consistent. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--am.sh | 17 ++--- git-rebase--interactive.sh | 8 +++

Re: [RFC PATCH v3 2/9] Call git_rebase__interactive from run_specific_rebase

On Thu, Mar 22, 2018 at 11:27 AM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> Instead of indirectly invoking git_rebase__interactive this invokes >> it directly after sourcing. >> >> Signed-off-by: Wink Savill

Re: [GSoC] Regarding "Convert scripts to builtins"

On Thu, Mar 22, 2018, 10:32 AM Johannes Schindelin wrote: > > Hi Wink, > > > Please see "[RFC PATCH 0/3] rebase-interactive" and > > "[RFC PATCH v2 0/1] rebase-interactive: ...". I'm looking for > > advice on how to proceed. > > Sadly, I had almost no time to spend

[RFC PATCH v3 3/9] Indent function git_rebase__interactive

Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 432 ++--- 1 file changed, 215 insertions(+), 217 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 213d75f43..a79330f45 100644 ---

[RFC PATCH v3 8/9] Remove unused code paths from git_rebase__interactive__preserve_merges

Since git_rebase__interactive__preserve_merges is now always called with $preserve_merges = t we can remove the unused code paths. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 152 - 1 file changed, 69 inse

[RFC PATCH v3 7/9] Remove unused code paths from git_rebase__interactive

Since git_rebase__interactive is now never called with $preserve_merges = t we can remove those code paths. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 95 ++ 1 file changed, 4 insertions(+), 91 deletions(-)

[RFC PATCH v3 5/9] Use new functions in git_rebase__interactive

Use initiate_action, setup_reflog_action, init_basic_state, init_revisions_and_shortrevisions and complete_action. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 187 ++--- 1 file changed, 8 insertions(+), 179 del

[RFC PATCH v3 9/9] Remove merges_option and a blank line

merges_option is unused in git_rebase__interactive and always empty in git_rebase__interactive__preserve_merges so it can be removed. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 10 +- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git

[RFC PATCH v3 4/9] Extract functions out of git_rebase__interactive

The extracted functions are: - initiate_action - setup_reflog_action - init_basic_state - init_revisions_and_shortrevisions - complete_action Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 211 +

[RFC PATCH v3 2/9] Call git_rebase__interactive from run_specific_rebase

Instead of indirectly invoking git_rebase__interactive this invokes it directly after sourcing. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 11 --- git-rebase.sh | 11 +-- 2 files changed, 9 insertions(+), 13 deletions(-)

[RFC PATCH v3 6/9] Add and use git_rebase__interactive__preserve_merges

At the moment it's an exact copy of git_rebase__interactive except the name has changed. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 108 + git-rebase.sh | 7 ++- 2 files changed, 114 insertions

[RFC PATCH v3 0/9] rebase-interactive:

and they were fine. I then restarted the builds on Travis-CI they finished fine so it seems the errors were spurious. Wink Saville (9): Simplify pick_on_preserving_merges Call git_rebase__interactive from run_specific_rebase Indent function git_rebase__interactive Extract functions out

[RFC PATCH v3 1/9] Simplify pick_on_preserving_merges

Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 17 +++-- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 331c8dfea..561e2660e 100644 --- a/git-rebase--interactive.sh +++

Re: [RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

On Wed, Mar 21, 2018 at 12:42 PM, Junio C Hamano <gits...@pobox.com> wrote: > Wink Saville <w...@saville.com> writes: > >> Refactor git_rebase__interactive__preserve_merges out of >> git_rebase__interactive resulting in fewer conditionals making >> both

Re: [GSoC] Regarding "Convert scripts to builtins"

On Wed, Mar 21, 2018 at 5:32 AM, Johannes Schindelin wrote: > Hi Paul, > > Note! There is one exception, and it is not even a full script. As > everybody knows who follows my patch series on this here mailing list, I > consider --preserve-merges one of my stupidest

[RFC PATCH v2 0/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

eral patches to have the history show the code movement more directly if that is desired. Wink Saville (1): rebase-interactive: Add git_rebase__interactive__preserve_merges git-rebase--interactive.sh | 469 + git-rebase.sh | 16 +-

[RFC PATCH v2 1/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

Refactor git_rebase__interactive__preserve_merges out of git_rebase__interactive resulting in fewer conditionals making both routines are simpler. Changed run_specific_rebase in git-rebase to dispatch to the appropriate function after sourcing git-rebase--interactive. ---

Re: [RFC PATCH 0/3] rebase-interactive

On Tue, Mar 20, 2018 at 2:47 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, Mar 20, 2018 at 5:23 PM, Wink Saville <w...@saville.com> wrote: >> On Tue, Mar 20, 2018 at 2:11 PM, Eric Sunshine <sunsh...@sunshineco.com> >> wrote: >>> A problem

Re: [RFC PATCH 0/3] rebase-interactive

On Tue, Mar 20, 2018 at 2:11 PM, Eric Sunshine <sunsh...@sunshineco.com> wrote: > On Tue, Mar 20, 2018 at 4:45 PM, Wink Saville <w...@saville.com> wrote: >> Patch 0001 creates a library of functions which can be >> used by git-rebase--interactive and >> git-reb

[RFC PATCH 3/3] rebase-interactive: refactor git-rebase--interactive to use library

Refactor git-rebase--interactive to use git-rebase--interactive--lib this simplifies and reduces the size of the code by about 1000 LoC. Signed-off-by: Wink Saville <w...@saville.com> --- git-rebase--interactive.sh | 1019 +--- 1 file chang

[RFC PATCH 1/3] rebase-interactive: create git-rebase--interactive--lib.sh

the library. Signed-off-by: Wink Saville <w...@saville.com> --- .gitignore | 1 + Makefile| 1 + git-rebase--interactive--lib.sh | 944 3 files changed, 946 insertions(+) create mode 100644 git-

[RFC PATCH 2/3] rebase-interactive: create git-rebase--interactive--preserve-merges

Extract the code that is executed when $preserve_merges is t from git-rebase--interactive to git-rebase--interactive--preserve-merges.sh. The extracted code uses functions from git-rebase--interactve--lib. Signed-off-by: Wink Saville <w...@saville.com> --- .git

[RFC PATCH 0/3] rebase-interactive

-ci.org. The final patch, 0003, removes all unused code from git_rebase_interactive and uses the functions from the library where appropriate. And, of course, when applied on top of 0002 the system builds and passes all tests on travis-ci.org. Wink Saville (3): rebase-interactive: create git