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
On Wednesday, June 3, 2015, Galan Rémi
remi.galan-alfo...@ensimag.grenoble-inp.fr 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
Eric Sunshine sunsh...@sunshineco.com 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.
Eric Sunshine sunsh...@sunshineco.com 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),
Matthieu Moy matthieu@grenoble-inp.fr writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr 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.
Eric Sunshine sunsh...@sunshineco.com 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
On Tue, Jun 2, 2015 at 3:42 AM, Remi Galan Alfonso
remi.galan-alfo...@ensimag.grenoble-inp.fr wrote:
Eric Sunshine sunsh...@sunshineco.com writes:
+test_expect_success 'rebase -i respects rebase.checkLevel' '
+ test_config rebase.checkLevel error
+ test_when_finished git
Matthieu Moy matthieu@grenoble-inp.fr writes:
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr 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
Galan Rémi remi.galan-alfo...@ensimag.grenoble-inp.fr 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
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 set to ignore, no checking is done.
- When set to warn,
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 set to ignore, no checking is done.
- When set to warn,
On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi
remi.galan-alfo...@ensimag.grenoble-inp.fr 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
On Mon, Jun 1, 2015 at 7:16 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Mon, Jun 1, 2015 at 7:52 AM, Galan Rémi
remi.galan-alfo...@ensimag.grenoble-inp.fr wrote:
test_expect_success 'drop' '
- git checkout master
test_when_finished git checkout master
git
13 matches
Mail list logo
