threads / patch / 28801

patchFix a typo in line 117 of git-gui/lib/sshkeys.tcl.

Subject: [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.

## tl;dr

8 messages between Oct 30, 2011 and Oct 11, 2017. Diffs are folded; open one to read it.

replies: 7people: 5as markdown or json

Dejan Ribič· Oct 30, 2011, 17:18 UTC · lore

"succeded" changed to "succeeded".

Reference Launchpad bug #879427.

modified:   git-gui/lib/sshkey.tcl

Signed-off-by: Dejan Ribič <dejan.ribic@gmail.com>
---
 git-gui/lib/sshkey.tcl |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to git-gui/lib/sshkey.tcl +1 −1

diff --git a/git-gui/lib/sshkey.tcl b/git-gui/lib/sshkey.tcl
index 5f75bc9..aa6457b 100644
--- a/git-gui/lib/sshkey.tcl
+++ b/git-gui/lib/sshkey.tcl
@@ -117,7 +117,7 @@ proc read_sshkey_output {fd w} {
 	} else {
 		set finfo [find_ssh_key]
 		if {$finfo eq {}} {
-			set sshkey_title [mc "Generation succeded, but no keys found."]
+			set sshkey_title [mc "Generation succeeded, but no keys found."]
 			$w.contents insert end $sshkey_output
 		} else {
 			set sshkey_title [mc "Your key is in: %s" [lindex $finfo 0]]

-- 
1.7.5.4

Erik Faye-Lund· Oct 30, 2011, 23:57 UTC · re: Dejan Ribič · lore

Re: [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.

Thanks for re-posting inline and with a sign-off. But there's still a few minor nits:

2011/10/30 Dejan Ribič <dejan.ribic@gmail.com>:

> "succeded" changed to "succeeded".

We write commit messages in imperative mood, so this should be something like 'change "succeded" to "succeeded"' instead. This is documented in Documentation/SubmittingPatches.

> modified:   git-gui/lib/sshkey.tcl

We don't normally include a list of changed files in the commit message; the diffstat already provides that information.

Pat Thoyts· Oct 31, 2011, 08:56 UTC · re: Erik Faye-Lund · lore

Re: [PATCH] Fix a typo in line 117 of git-gui/lib/sshkeys.tcl.

Erik Faye-Lund <kusmabite@gmail.com> writes:

Show 15 quoted lines

>Thanks for re-posting inline and with a sign-off. But there's still a
>few minor nits:
>
>2011/10/30 Dejan Ribič <dejan.ribic@gmail.com>:
>> "succeded" changed to "succeeded".
>
>We write commit messages in imperative mood, so this should be
>something like 'change "succeded" to "succeeded"' instead. This is
>documented in Documentation/SubmittingPatches.
>
>> modified:   git-gui/lib/sshkey.tcl
>
>We don't normally include a list of changed files in the commit
>message; the diffstat already provides that information.
>

The change is fine so I've applied this to the git-gui repository with a fixed commit message. Thank you.

git-gui is hosted separately and merged into git-core at intervals so the development version of git-gui is in fact hosted at git://repo.or.cz/git-gui.git although patches against the git-core version seldom pose a problem to apply and are gratefully received. (git am -p2 usually fixes them).

-- 
Pat Thoyts                            http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD

Takahito Ogawa· Oct 11, 2017, 18:06 UTC · lore

[PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments

"git stash" behavior without any arguments was changed in 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28). This is equivalent to "git stash push" but document says "git stash save".

Correct it.

Signed-off-by: Takahito Ogawa <takahito.ogawa@datagrid.co.jp>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-stash.txt +1 −1

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.

-- 
2.13.1

Takahito Ogawa· Oct 11, 2017, 18:37 UTC · lore

[PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments

"git stash" behavior without any arguments was changed in 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28). This is equivalent to "git stash push" but documents says "git stash save".

Correct it.

Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-stash.txt +1 −1

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.

-- 
2.13.1

Thomas Gummerer· Oct 11, 2017, 19:09 UTC · re: Takahito Ogawa · lore

Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments

On 10/12, Takahito Ogawa wrote:

Show 6 quoted lines

> "git stash" behavior without any arguments was changed in
> 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
> This is equivalent to "git stash push" but documents says
> "git stash save".
> 
> Correct it.

Thanks for fixing this! I recently sent a patch that would advertise git stash push more in general, which would also fix this occurrence [1], but it didn't seem like it got much interest. However this is obviously correct, and should definitely be fixed, while the other places can still mention 'git stash save'.

For what it's worth this is

Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>

Show 21 quoted lines

> Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
> ---
>  Documentation/git-stash.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> index 00f95fee1..63642c145 100644
> --- a/Documentation/git-stash.txt
> +++ b/Documentation/git-stash.txt
> @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
>  The modifications stashed away by this command can be listed with
>  `git stash list`, inspected with `git stash show`, and restored
>  (potentially on top of a different commit) with `git stash apply`.
> -Calling `git stash` without any arguments is equivalent to `git stash save`.
> +Calling `git stash` without any arguments is equivalent to `git stash push`.
>  A stash is by default listed as "WIP on 'branchname' ...", but
>  you can give a more descriptive message on the command line when
>  you create one.
> -- 
> 2.13.1
>

Thomas Gummerer· Oct 11, 2017, 19:12 UTC · re: Thomas Gummerer · lore

Re: [PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments

On 10/11, Thomas Gummerer wrote:

Show 17 quoted lines

> On 10/12, Takahito Ogawa wrote:
> > "git stash" behavior without any arguments was changed in
> > 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28).
> > This is equivalent to "git stash push" but documents says
> > "git stash save".
> > 
> > Correct it.
> 
> Thanks for fixing this!  I recently sent a patch that would advertise
> git stash push more in general, which would also fix this occurrence [1], 
> but it didn't seem like it got much interest.  However this is
> obviously correct, and should definitely be fixed, while the other
> places can still mention 'git stash save'.
> 
> For what it's worth this is
> 
> Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>

And I forgot to include the link, sorry.  Here it is:

[1]: https://public-inbox.org/git/20171005200049.GF30301@hank/

Show 22 quoted lines

> 
> > Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
> > ---
> >  Documentation/git-stash.txt | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
> > index 00f95fee1..63642c145 100644
> > --- a/Documentation/git-stash.txt
> > +++ b/Documentation/git-stash.txt
> > @@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
> >  The modifications stashed away by this command can be listed with
> >  `git stash list`, inspected with `git stash show`, and restored
> >  (potentially on top of a different commit) with `git stash apply`.
> > -Calling `git stash` without any arguments is equivalent to `git stash save`.
> > +Calling `git stash` without any arguments is equivalent to `git stash push`.
> >  A stash is by default listed as "WIP on 'branchname' ...", but
> >  you can give a more descriptive message on the command line when
> >  you create one.
> > -- 
> > 2.13.1
> >

Takahito Ogawa· Oct 11, 2017, 20:01 UTC · lore

[PATCH 1/1] git-stash.txt: correct "git stash" behavior with no arguments

"git stash" behavior without any arguments was changed in 1ada5020b ("stash: use stash_push for no verb form", 2017-02-28). This is equivalent to "git stash push" but documents says "git stash save".

Correct it.

Reviewed-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Takahito Ogawa <aiueogawa217@gmail.com>
---
 Documentation/git-stash.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Show changes to Documentation/git-stash.txt +1 −1

diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fee1..63642c145 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -33,7 +33,7 @@ and reverts the working directory to match the `HEAD` commit.
 The modifications stashed away by this command can be listed with
 `git stash list`, inspected with `git stash show`, and restored
 (potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
 A stash is by default listed as "WIP on 'branchname' ...", but
 you can give a more descriptive message on the command line when
 you create one.

-- 
2.13.1