threads / patch / 47233

patchgit-rebase: clean up dashed-usages in messages

Subject: [PATCH] git-rebase: clean up dashed-usages in messages

## tl;dr

6 messages between Nov 18, 2017 and Nov 21, 2017. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Kaartic Sivaraam· Nov 18, 2017, 16:18 UTC · lore

Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
 git-rebase.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to git-rebase.sh +2 −2

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

Junio C Hamano· Nov 19, 2017, 02:12 UTC · re: Kaartic Sivaraam · lore

Re: [PATCH] git-rebase: clean up dashed-usages in messages

>  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.

Kaartic Sivaraam· Nov 19, 2017, 17:28 UTC · re: Junio C Hamano · lore

Re: [PATCH] git-rebase: clean up dashed-usages in messages

On Sunday 19 November 2017 07:42 AM, Junio C Hamano wrote:

Show 10 quoted lines

>>   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

Junio C Hamano· Nov 20, 2017, 00:26 UTC · re: Kaartic Sivaraam · lore

Re: [PATCH] git-rebase: clean up dashed-usages in messages

Kaartic Sivaraam <kaartic.sivaraam@gmail.com> writes:

Show 13 quoted lines

> 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.

Kaartic Sivaraam· Nov 20, 2017, 15:26 UTC · re: Junio C Hamano · lore

Signed-off-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
---
 git-rebase.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to git-rebase.sh +2 −2

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

Junio C Hamano· Nov 21, 2017, 00:33 UTC · re: Kaartic Sivaraam · lore

Re: [PATCH] git-rebase: clean up dashed-usages in messages

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 ;-)

Show 25 quoted lines

>  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