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

2015-06-09 Thread Guillaume Pages
Junio C Hamano gits...@pobox.com writes: Hmmm, it obviously does not break anything but it is not obvious why this is a good change. Is it that you wanted to have a single instance of if on a branch, we say 'you are rebasing that branch', otherwise we say 'you are rebasing'? Even then, I am

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

2015-06-09 Thread Matthieu Moy
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes: 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

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

2015-06-09 Thread Guillaume Pagès
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

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

2015-06-08 Thread Junio C Hamano
Guillaume Pagès guillaume.pa...@ensimag.grenoble-inp.fr writes: --- wt-status.c | 30 +++--- 1 file changed, 11 insertions(+), 19 deletions(-) Hmmm, it obviously does not break anything but it is not obvious why this is a good change. Is it that you wanted to have

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

2015-06-03 Thread Guillaume Pagès
--- 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, {