I'm going to try to change the die_abort in this patch by a die, so
that the user can use rebase --edit-todo afterward. This way, adding
the checking on the SHA-1 for the 'drop' command (discussed in 1/2)
(and also maybe the other commands requiring a correct SHA-1
corresponding to a commit) to the
Eric Sunshine writes:
> > +test_expect_success 'rebase -i respects rebase.missingCommitsCheck=ignore'
> > '
> > + test_config rebase.missingCommitsCheck ignore &&
> > + test_when_finished "git checkout master &&
> > + git branch -D tmp2" &&
>
> Strange indentation.
Co
On Wednesday, June 3, 2015, Galan Rémi
wrote:
> Check if commits were removed (i.e. a line was deleted) and print
> warnings or abort git rebase depending on the value of the
> configuration variable rebase.missingCommits.
A few comments below in addition to those already made by Matthieu...
> d
Matthieu Moy writes:
> Galan Rémi writes:
>
>> Check if commits were removed (i.e. a line was deleted) and print
>> warnings or abort git rebase according to the value of the
>> configuration variable rebase.checkLevel.
>
> checkLevel does not seem to be a good name, because it doesn't say
> _wh
Eric Sunshine writes:
> Although the underlying behavior of "ignore" may be the same as the
> default, you also want to check that higher-level machinery for
> recognizing the "ignore" option is working correctly, which is why
> checking "ignore" explicitly is a reasonable thing to do.
Noted
On Tue, Jun 2, 2015 at 3:42 AM, Remi Galan Alfonso
wrote:
> Eric Sunshine writes:
>> > +test_expect_success 'rebase -i respects rebase.checkLevel' '
>> > + test_config rebase.checkLevel error &&
>> > + test_when_finished "git checkout master" &&
>> > + git checkout -b tmp2 maste
Matthieu Moy writes:
> Galan Rémi writes:
>
> > Check if commits were removed (i.e. a line was deleted) and print
> > warnings or abort git rebase according to the value of the
> > configuration variable rebase.checkLevel.
>
> checkLevel does not seem to be a good name, because it doesn't say
>
Eric Sunshine writes:
> > +rebase.checkLevel::
> > + If set to "warn", git rebase -i will print a warning if some
> > + commits are removed (i.e. a line was deleted) or if some
> > + commits appear more than one time (e.g. the same commit is
> > + picked twice), however the
Galan Rémi writes:
> Check if commits were removed (i.e. a line was deleted) and print
> warnings or abort git rebase according to the value of the
> configuration variable rebase.checkLevel.
checkLevel does not seem to be a good name, because it doesn't say
_what_ is checked. I don't have reall
On Mon, Jun 1, 2015 at 7:16 PM, Eric Sunshine wrote:
> On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi
> wrote:
>> test_expect_success 'drop' '
>> - git checkout master &&
>> test_when_finished "git checkout master" &&
>> git checkout -b dropBranchTest master &&
>
> This "cleanu
On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi
wrote:
> Check if commits were removed (i.e. a line was deleted) and print
> warnings or abort git rebase according to the value of the
> configuration variable rebase.checkLevel.
>
> Add the configuration variable rebase.checkLevel.
> - When unset or
11 matches
Mail list logo
