[PATCH 3/4] status: give more information during rebase -i

git status gives more information during rebase -i, about the list of command that are done during the rebase. It displays the two last commands executed and the two next lines to be executed. It also gives hints to find the whole files in .git directory. Signed-off-by: Guillaume Pagès

[PATCH 1/4] status: factor two rebase-related messages together

Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- wt-status.c | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/wt-status.c b/wt-status.c index 33452f1..c239132 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1025,6

[PATCH 2/4] status: differentiate interactive from non-interactive rebases

Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- t/t7512-status-help.sh | 28 ++-- wt-status.c| 5 - 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 68ad2d7

[PATCH 4/4] status: add new tests for status during rebase -i

Expand test coverage with one or more than two commands done and with zero, one or more than two commands remaining. Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- t/t7512-status-help.sh | 87 ++ 1 file changed, 87

[PATCH 4/4] status: add new tests for status during rebase -i

Expand test coverage with one or more than two commands done and with zero, one or more than two commands remaining --- t/t7512-status-help.sh | 88 ++ 1 file changed, 88 insertions(+) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh

[PATCH 3/4] status: give more information during rebase -i

git status gives more information during rebase -i, about the list of command that are done during the rebase. It displays the two last commands executed and the two next lines to be executed. It also gives hints to find the whole files in .git directory. --- I've applied your remarks, the way to

[PATCH 4/4] status: add new tests for status during rebase -i

--- t/t7512-status-help.sh | 88 ++ 1 file changed, 88 insertions(+) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 4dd201a..dff912b 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -856,4 +856,92 @@ EOF

[PATCH 1/4] status: factor two rebase-related messages together

--- wt-status.c | 30 +++--- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/wt-status.c b/wt-status.c index 33452f1..fec6e85 100644 --- a/wt-status.c +++ b/wt-status.c @@ -1032,7 +1032,7 @@ static void show_rebase_in_progress(struct wt_status *s, {

[PATCH 2/4] status: differentiate interactive from non-interactive rebases

--- t/t7512-status-help.sh | 28 ++-- wt-status.c| 5 - 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 68ad2d7..190656d 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh

[PATCH 3/4] status: give more information during rebase -i

git status gives more information during rebase -i, about the list of command that are done during the rebase. It displays the two last commands executed and the two next lines to be executed. It also gives hints to find the whole files in .git directory. --- t/t7512-status-help.sh | 111

[RFC/PATCH 2/2] status: fix tests to handle new verbose git status during rebase

Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- t/t7512-status-help.sh | 227 ++--- 1 file changed, 213 insertions(+), 14 deletions(-) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index 68ad2d7..242124f 100755

[RFC/PATCH 1/2] status: give more information during rebase -i

git status gives more information during rebase -i, about the list of command that are done during the rebase. It displays the two last commands executed and the two next lines to be executed. It also gives hints to find the whole files in .git directory. Signed-off-by: Guillaume Pagès

[PATCH/RFC] create a skeleton for the command git rebase --status

this functionnality. I wrote a helper that I call from shell script, as it is made in bisect (bisect--helper.c). Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- Makefile | 2 ++ builtin.h| 1 + git-rebase.sh| 7 ++- git.c| 1 + rebase--status.c | 6

[RFC/PATCH v2] create a skeleton for the command git rebase --status

Preparatory commit for a git rebase --status command. This command will indicate the state of the process in the rebase, and the reason why it stopped. Signed-off-by: Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr --- The observations from Matthieu Moy have been taken into account