* [PATCH] git-rebase: clean up dashed-usages in messages
@ 2017-11-18 16:18 Kaartic Sivaraam
2017-11-19 2:12 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Kaartic Sivaraam @ 2017-11-18 16:18 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git mailing list
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
git-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 6344e8d5e..42a485aaa 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase --continue | --abort | --skip | --edit-todo
+git rebase --continue | --abort | --skip | --edit-todo
--
Available options are
v,verbose! display a diffstat of what changed upstream
@@ -216,7 +216,7 @@ run_pre_rebase_hook () {
}
test -f "$apply_dir"/applying &&
- die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
+ die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"
if test -d "$apply_dir"
then
--
2.15.0.291.g0d8980c5d
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-rebase: clean up dashed-usages in messages
2017-11-18 16:18 [PATCH] git-rebase: clean up dashed-usages in messages Kaartic Sivaraam
@ 2017-11-19 2:12 ` Junio C Hamano
2017-11-19 17:28 ` Kaartic Sivaraam
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2017-11-19 2:12 UTC (permalink / raw)
To: Kaartic Sivaraam; +Cc: Git mailing list
> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
> -git-rebase --continue | --abort | --skip | --edit-todo
> +git rebase --continue | --abort | --skip | --edit-todo
A good change.
> test -f "$apply_dir"/applying &&
> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> + die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"
Probably not, as 'am' alone would be confusing.
"It looks like 'git am' is in progress. Cannot rebase."
may be a more sensible improvement.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-rebase: clean up dashed-usages in messages
2017-11-19 2:12 ` Junio C Hamano
@ 2017-11-19 17:28 ` Kaartic Sivaraam
2017-11-20 0:26 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Kaartic Sivaraam @ 2017-11-19 17:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git mailing list
On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote:
>> test -f "$apply_dir"/applying &&
>> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
>> + die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"
>
> Probably not, as 'am' alone would be confusing.
>
> "It looks like 'git am' is in progress. Cannot rebase."
>
> may be a more sensible improvement.
>
Let me guess, 'am' alone would be confusing because it follows 'an' in
the error message. So, the user might mistake it to be some kind of typo
in the error message. Is that close to why 'am' alone would be confusing?
Anyways, I stole that from a message shown by 'git status',
"You are in the middle of an am session."
So, does that require a change too?
---
Kaartic
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] git-rebase: clean up dashed-usages in messages
2017-11-19 17:28 ` Kaartic Sivaraam
@ 2017-11-20 0:26 ` Junio C Hamano
2017-11-20 15:26 ` Kaartic Sivaraam
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2017-11-20 0:26 UTC (permalink / raw)
To: Kaartic Sivaraam; +Cc: Git mailing list
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:
> On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote:
>>> test -f "$apply_dir"/applying &&
>>> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
>>> + die "$(gettext "It looks like you are in the middle of an am session. Cannot rebase.")"
>>
>> Probably not, as 'am' alone would be confusing.
>>
>> "It looks like 'git am' is in progress. Cannot rebase."
>>
>> may be a more sensible improvement.
>
> Let me guess, 'am' alone would be confusing because it follows 'an' in
> the error message.
With a, an or the, or without, 'am' alone, unlike 'status',
'rebase', etc., do not look much like a subcommand name, and that is
why the original chose to say git-am. The suggestion is to make the
primary change (i.e. remove mention of dashed form) without changing
or breaking what the original wanted to do.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] git-rebase: clean up dashed-usages in messages
2017-11-20 0:26 ` Junio C Hamano
@ 2017-11-20 15:26 ` Kaartic Sivaraam
2017-11-21 0:33 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Kaartic Sivaraam @ 2017-11-20 15:26 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Git mailing list
Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
git-rebase.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 6344e8d5e..2f5d138a0 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase --continue | --abort | --skip | --edit-todo
+git rebase --continue | --abort | --skip | --edit-todo
--
Available options are
v,verbose! display a diffstat of what changed upstream
@@ -216,7 +216,7 @@ run_pre_rebase_hook () {
}
test -f "$apply_dir"/applying &&
- die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
+ die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
if test -d "$apply_dir"
then
--
2.15.0.291.g0d8980c5d
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] git-rebase: clean up dashed-usages in messages
2017-11-20 15:26 ` Kaartic Sivaraam
@ 2017-11-21 0:33 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2017-11-21 0:33 UTC (permalink / raw)
To: Kaartic Sivaraam; +Cc: Git mailing list
Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:
> Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
> ---
Thanks. Two fewer git-foo exposed to the end user. Good ;-)
> git-rebase.sh | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index 6344e8d5e..2f5d138a0 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -9,7 +9,7 @@ OPTIONS_STUCKLONG=t
> OPTIONS_SPEC="\
> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
> git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
> -git-rebase --continue | --abort | --skip | --edit-todo
> +git rebase --continue | --abort | --skip | --edit-todo
> --
> Available options are
> v,verbose! display a diffstat of what changed upstream
> @@ -216,7 +216,7 @@ run_pre_rebase_hook () {
> }
>
> test -f "$apply_dir"/applying &&
> - die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
> + die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
>
> if test -d "$apply_dir"
> then
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-21 0:33 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-18 16:18 [PATCH] git-rebase: clean up dashed-usages in messages Kaartic Sivaraam
2017-11-19 2:12 ` Junio C Hamano
2017-11-19 17:28 ` Kaartic Sivaraam
2017-11-20 0:26 ` Junio C Hamano
2017-11-20 15:26 ` Kaartic Sivaraam
2017-11-21 0:33 ` Junio C Hamano
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).