From: Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>
To: Johannes Schindelin <johannes.schindelin@gmx•de>
Cc: git@vger•kernel.org, Junio C Hamano <gitster@pobox•com>,
Stefan Beller <sbeller@google•com>,
Guillaume Pages <guillaume.pages@ensimag•grenoble-inp.fr>
Subject: Re: [PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase
Date: Thu, 26 Jan 2017 19:04:13 +0100 [thread overview]
Message-ID: <vpq7f5hpujm.fsf@anie.imag.fr> (raw)
In-Reply-To: <alpine.DEB.2.20.1701261708370.3469@virtualbox> (Johannes Schindelin's message of "Thu, 26 Jan 2017 17:08:41 +0100 (CET)")
Johannes Schindelin <johannes.schindelin@gmx•de> writes:
> Some developers might want to call `git status` in a working
> directory where they just started an interactive rebase, but the
> edit script is still opened in the editor.
>
> Let's show a meaningful message in such cases.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx•de>
> ---
> t/t7512-status-help.sh | 19 +++++++++++++++++++
> wt-status.c | 14 ++++++++++----
> 2 files changed, 29 insertions(+), 4 deletions(-)
The patch looks good to me.
> @@ -1166,8 +1170,10 @@ static void show_rebase_information(struct wt_status *s,
> struct string_list yet_to_do = STRING_LIST_INIT_DUP;
>
> read_rebase_todolist("rebase-merge/done", &have_done);
> - read_rebase_todolist("rebase-merge/git-rebase-todo", &yet_to_do);
> -
> + if (read_rebase_todolist("rebase-merge/git-rebase-todo",
> + &yet_to_do))
> + status_printf_ln(s, color,
> + _("git-rebase-todo is missing."));
I first was surprised not to see this "git-rebase-todo" in the output of
status, but the testcase tests a missing 'done', not a missing todo, so
it's normal.
Thanks,
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
prev parent reply other threads:[~2017-01-26 18:04 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 16:28 [PATCH] status: be prepared for not-yet-started interactive rebase Johannes Schindelin
2016-01-22 16:45 ` Matthieu Moy
2016-01-22 17:11 ` Johannes Schindelin
2016-01-22 18:38 ` Junio C Hamano
2016-01-22 19:02 ` Johannes Schindelin
2017-01-26 16:08 ` [PATCH v2 0/1] Let `git status` handle a not-yet-started `rebase -i` gracefully Johannes Schindelin
2017-01-26 16:08 ` [PATCH v2 1/1] status: be prepared for not-yet-started interactive rebase Johannes Schindelin
2017-01-26 18:02 ` Stefan Beller
2017-01-27 10:49 ` Johannes Schindelin
2017-01-26 18:04 ` Matthieu Moy [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq7f5hpujm.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=guillaume.pages@ensimag$(echo .)grenoble-inp.fr \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=sbeller@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox