From: konglu@minatec.inpg.fr
To: Junio C Hamano <gitster@pobox.com>
Cc: Kong Lucien <Lucien.Kong@ensimag.imag.fr>,
git@vger.kernel.org, Matthieu.Moy@grenoble-inp.fr,
Duperray Valentin <Valentin.Duperray@ensimag.imag.fr>,
Jonas Franck <Franck.Jonas@ensimag.imag.fr>,
Nguy Thomas <Thomas.Nguy@ensimag.imag.fr>,
Nguyen Huynh Khoi Nguyen
<Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr>
Subject: Re: [PATCHv5 1/3] wt-status.*: better advices for git status added
Date: Fri, 01 Jun 2012 21:39:11 +0200 [thread overview]
Message-ID: <20120601213911.Horde.UIs0dHwdC4BPyRpflFgUaLA@webmail.minatec.grenoble-inp.fr> (raw)
In-Reply-To: <7v396f3rhg.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> a écrit :
> konglu@minatec.inpg.fr writes:
>
>>>> + } else {
>>>> + status_printf_ln(s, color, _("You are currently editing a commit
>>>> during a rebase."));
>>>> + if (advice_status_hints) {
>>>> + status_printf_ln(s, color, _(" You can amend the commit with"));
>>>> + status_printf_ln(s, color, _(" git commit --amend"));
>>>> + status_printf_ln(s, color, _(" Once you are satisfied with
>>>> your changes, run"));
>>>> + status_printf_ln(s, color, _(" git rebase --continue"));
>>>
>>> For an advice in "git status" output, the above may be appropriate,
>>> but would the user see this in "git commit" template, and if so,
>>> isn't it because the user typed "git commit --amend"? Does it make
>>> sense to suggest to run "git commit --amend" in that context?
>>
>> True, the user will see the messages in the "git commit" template. We
>> didn't take this case into account because we thought that not many people
>> read the status in the "git commit" template. Anyway, just adding a
>> condition
>>
>> if (advice_status_hints && !s->amend)
>>
>> does the job.
>
> Hrm, what would happen if the user ran "git commit" without --amend?
The new advices will still be displayed (of course only if advice.statushints
is enabled).
> It could be done by mistake, which will be greatly helped by the
> information you already gathered during the inspection phase.
Thus, if done by mistake, the user will know that he needs to do
"git commit --amend" to edit the commit.
> This also can be done deliberately to split a commit in "rebase -i",
> so "You are in 'rebase -i', do not commit without --amend!" is a
> wrong message, but it may be sensible to give "are you sure you
> meant to commit without --amend?"
An interesting case. In fact, more than warning the user about running
git commit without --amend, wouldn't it be better if there were specific
help messages about splitting a commit ? Like
# Not currently on any branch.
# You are currently splitting a commit.
# (Once your working directory is clean, run "git rebase --continue")
#
# Changes not staged for commit:
# (use "git add <file>..." to update what will be committed)
# (use "git checkout -- <file>..." to discard changes in working directory)
#
# modified: t/t7060-wtstatus.sh
# modified: t/t7512-status-help.sh
# modified: wt-status.c
#
no changes added to commit (use "git add" and/or "git commit -a")
that will be the output of git status after a "git reset HEAD^" during
a rebase -i. There's already the advice "(use git add <file>...)" so
putting it twice is not really relevant.
What do you think about it ?
next prev parent reply other threads:[~2012-06-01 19:39 UTC|newest]
Thread overview: 97+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-24 9:37 [PATCH/RFC] t7512-status-warnings.sh : better advices for git status Kong Lucien
2012-05-24 17:31 ` Matthieu Moy
2012-05-26 12:38 ` [PATCHv2 1/2] wt-status: " Kong Lucien
2012-05-26 12:38 ` [PATCHv2 2/2] t7512-status-warnings.sh: " Kong Lucien
2012-05-27 12:57 ` Matthieu Moy
2012-05-28 8:43 ` Matthieu Moy
2012-05-26 13:01 ` [PATCHv2 1/2] wt-status: " Nguyen Thai Ngoc Duy
2012-05-26 17:17 ` NGUY Thomas
2012-05-27 12:58 ` Matthieu Moy
2012-05-27 13:10 ` Matthieu Moy
2012-05-28 4:57 ` Junio C Hamano
2012-05-28 7:05 ` Matthieu Moy
2012-05-30 4:27 ` Junio C Hamano
2012-05-28 10:54 ` konglu
2012-05-28 17:36 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Kong Lucien
2012-05-28 17:36 ` [PATCHv3 2/2] t7512-status-warnings.sh: better advices for git status Kong Lucien
2012-05-28 20:36 ` Matthieu Moy
2012-05-28 20:23 ` [PATCHv3 1/2] wt-status.*: better advices for git status added Matthieu Moy
2012-05-29 19:22 ` Junio C Hamano
2012-05-30 11:09 ` konglu
2012-05-30 17:24 ` Junio C Hamano
2012-05-31 6:47 ` Matthieu Moy
2012-05-30 13:23 ` [PATCHv4 1/3] " Kong Lucien
2012-05-30 13:23 ` [PATCHv4 2/3] t7512-status-warnings.sh: better advices for git status Kong Lucien
2012-05-30 13:23 ` [PATCHv4 3/3] Advices about 'git rm' during conflicts (unmerged paths) more relevant Kong Lucien
2012-05-30 18:44 ` Junio C Hamano
2012-05-30 21:50 ` konglu
2012-05-31 7:06 ` Matthieu Moy
2012-05-31 7:59 ` konglu
2012-05-30 18:26 ` [PATCHv4 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-05-30 19:06 ` Junio C Hamano
2012-05-31 6:42 ` Matthieu Moy
2012-05-31 6:44 ` Matthieu Moy
2012-05-31 6:29 ` Matthieu Moy
2012-05-31 6:34 ` Andrew Ardill
2012-05-31 15:15 ` [PATCHv5 " Kong Lucien
2012-05-31 15:15 ` [PATCHv5 2/3] t7512-status-help.sh: better advices for git status Kong Lucien
2012-05-31 15:15 ` [PATCHv5 3/3] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-01 8:55 ` Matthieu Moy
2012-06-01 12:15 ` Phil Hord
2012-06-01 14:08 ` konglu
2012-06-01 16:38 ` Junio C Hamano
2012-05-31 21:36 ` [PATCHv5 1/3] wt-status.*: better advices for git status added Junio C Hamano
2012-06-01 9:16 ` konglu
2012-06-01 9:26 ` Matthieu Moy
2012-06-01 14:50 ` Junio C Hamano
2012-06-01 16:51 ` Junio C Hamano
2012-06-01 19:39 ` konglu [this message]
2012-06-01 8:42 ` Matthieu Moy
2012-06-01 11:27 ` konglu
2012-06-01 12:40 ` Phil Hord
2012-06-01 16:57 ` Junio C Hamano
2012-06-04 18:00 ` Phil Hord
2012-06-03 18:30 ` [PATCHv6 1/4] " Kong Lucien
2012-06-03 18:30 ` [PATCHv6 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-03 21:18 ` Junio C Hamano
2012-06-04 10:04 ` konglu
2012-06-04 15:04 ` Junio C Hamano
2012-06-04 22:07 ` Junio C Hamano
2012-06-03 18:30 ` [PATCHv6 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-03 19:34 ` Matthieu Moy
2012-06-03 18:30 ` [PATCHv6 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-03 22:00 ` Junio C Hamano
2012-06-04 15:35 ` Phil Hord
2012-06-05 9:13 ` konglu
2012-06-03 21:06 ` [PATCHv6 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-04 9:51 ` konglu
2012-06-04 14:54 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 " Kong Lucien
2012-06-04 17:19 ` [PATCHv7 2/4] t7512-status-help.sh: better advices for git status Kong Lucien
2012-06-04 21:02 ` Matthieu Moy
2012-06-04 23:12 ` Junio C Hamano
2012-06-04 17:19 ` [PATCHv7 3/4] status: don't suggest "git rm" or "git add" if not appropriate Kong Lucien
2012-06-04 17:19 ` [PATCHv7 4/4] status: better advices when splitting a commit (during rebase -i) Kong Lucien
2012-06-04 23:01 ` [PATCHv7 1/4] wt-status.*: better advices for git status added Junio C Hamano
2012-06-05 10:32 ` konglu
2012-06-05 11:33 ` Matthieu Moy
2012-06-05 20:21 ` [PATCHv8 " Lucien Kong
2012-06-05 20:21 ` [PATCHv8 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-05 20:21 ` [PATCHv8 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-05 20:21 ` [PATCHv8 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-05 21:16 ` Junio C Hamano
2012-06-08 9:29 ` konglu
2012-06-08 15:05 ` Junio C Hamano
2012-06-07 13:17 ` [PATCHv9 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-07 13:17 ` [PATCHv9 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-07 13:17 ` [PATCHv9 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-07 13:17 ` [PATCHv9 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-07 18:07 ` Junio C Hamano
2012-06-07 20:42 ` Junio C Hamano
2012-06-07 21:05 ` konglu
2012-06-10 11:17 ` [PATCHv10 1/4] wt-status.*: better advices for git status added Lucien Kong
2012-06-10 11:17 ` [PATCHv10 2/4] t7512-status-help.sh: better advices for git status Lucien Kong
2012-06-10 11:17 ` [PATCHv10 3/4] status: don't suggest "git rm" or "git add" if not appropriate Lucien Kong
2012-06-10 11:17 ` [PATCHv10 4/4] status: better advices when splitting a commit (during rebase -i) Lucien Kong
2012-06-11 20:21 ` Junio C Hamano
2012-06-12 7:14 ` konglu
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120601213911.Horde.UIs0dHwdC4BPyRpflFgUaLA@webmail.minatec.grenoble-inp.fr \
--to=konglu@minatec.inpg.fr \
--cc=Franck.Jonas@ensimag.imag.fr \
--cc=Huynh-Khoi-Nguyen.Nguyen@ensimag.imag.fr \
--cc=Lucien.Kong@ensimag.imag.fr \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=Thomas.Nguy@ensimag.imag.fr \
--cc=Valentin.Duperray@ensimag.imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).