* [PATCH 1/2] git-gui: Fix a loose/lose mistake
@ 2012-08-18 9:07 Beat Bolli
2012-08-18 9:07 ` [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing Beat Bolli
2012-08-18 20:24 ` [PATCH 1/2] git-gui: Fix a loose/lose mistake Junio C Hamano
0 siblings, 2 replies; 6+ messages in thread
From: Beat Bolli @ 2012-08-18 9:07 UTC (permalink / raw)
To: git; +Cc: Beat Bolli
No po update needed, as this string is untranslated.
Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
---
git-gui/lib/commit.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 0d81432..78c5eeb 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {
&& [is_config_true gui.warndetachedcommit]} {
set msg [mc "You are about to commit on a detached head.\
This is a potentially dangerous thing to do because if you switch\
-to another branch you will loose your changes and it can be difficult\
+to another branch you will lose your changes and it can be difficult\
to retrieve them later from the reflog. You should probably cancel this\
commit and create a new branch to continue.\n\
\n\
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing
2012-08-18 9:07 [PATCH 1/2] git-gui: Fix a loose/lose mistake Beat Bolli
@ 2012-08-18 9:07 ` Beat Bolli
2012-08-18 20:28 ` Junio C Hamano
2012-08-18 20:24 ` [PATCH 1/2] git-gui: Fix a loose/lose mistake Junio C Hamano
1 sibling, 1 reply; 6+ messages in thread
From: Beat Bolli @ 2012-08-18 9:07 UTC (permalink / raw)
To: git; +Cc: Beat Bolli
Adding __git_ps1() to one's bash prompt displays various repo status
info after each command. After committing a git cherry-pick -n using
git-gui, the prompt still contains the "|CHERRY-PICKING" flag.
Delete the file causing this flag when cleaning up.
Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
---
git-gui/lib/commit.tcl | 1 +
1 file changed, 1 insertion(+)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 78c5eeb..864b687 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -409,6 +409,7 @@ A rescan will be automatically started now.
catch {file delete [gitdir MERGE_MSG]}
catch {file delete [gitdir SQUASH_MSG]}
catch {file delete [gitdir GITGUI_MSG]}
+ catch {file delete [gitdir CHERRY_PICK_HEAD]}
# -- Let rerere do its thing.
#
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] git-gui: Fix a loose/lose mistake
2012-08-18 9:07 [PATCH 1/2] git-gui: Fix a loose/lose mistake Beat Bolli
2012-08-18 9:07 ` [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing Beat Bolli
@ 2012-08-18 20:24 ` Junio C Hamano
2012-09-17 10:54 ` Pat Thoyts
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2012-08-18 20:24 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Beat Bolli
Beat Bolli <bbolli@ewanet.ch> writes:
> No po update needed, as this string is untranslated.
>
> Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
> ---
> git-gui/lib/commit.tcl | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
> index 0d81432..78c5eeb 100644
> --- a/git-gui/lib/commit.tcl
> +++ b/git-gui/lib/commit.tcl
> @@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {
> && [is_config_true gui.warndetachedcommit]} {
> set msg [mc "You are about to commit on a detached head.\
> This is a potentially dangerous thing to do because if you switch\
> -to another branch you will loose your changes and it can be difficult\
> +to another branch you will lose your changes and it can be difficult\
> to retrieve them later from the reflog. You should probably cancel this\
> commit and create a new branch to continue.\n\
> \n\
Looks obviously correct; Pat?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing
2012-08-18 9:07 ` [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing Beat Bolli
@ 2012-08-18 20:28 ` Junio C Hamano
2012-09-17 11:52 ` Pat Thoyts
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2012-08-18 20:28 UTC (permalink / raw)
To: Pat Thoyts; +Cc: git, Beat Bolli
Beat Bolli <bbolli@ewanet.ch> writes:
> Adding __git_ps1() to one's bash prompt displays various repo status
> info after each command. After committing a git cherry-pick -n using
> git-gui, the prompt still contains the "|CHERRY-PICKING" flag.
>
> Delete the file causing this flag when cleaning up.
>
> Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
> ---
> git-gui/lib/commit.tcl | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
> index 78c5eeb..864b687 100644
> --- a/git-gui/lib/commit.tcl
> +++ b/git-gui/lib/commit.tcl
> @@ -409,6 +409,7 @@ A rescan will be automatically started now.
> catch {file delete [gitdir MERGE_MSG]}
> catch {file delete [gitdir SQUASH_MSG]}
> catch {file delete [gitdir GITGUI_MSG]}
> + catch {file delete [gitdir CHERRY_PICK_HEAD]}
>
> # -- Let rerere do its thing.
> #
It makes me wonder if the above sequence of file delete should all
be removed and use "git commit" instead of "git commit-tree" in the
implementation of this Tcl procedure instead.
Pat?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] git-gui: Fix a loose/lose mistake
2012-08-18 20:24 ` [PATCH 1/2] git-gui: Fix a loose/lose mistake Junio C Hamano
@ 2012-09-17 10:54 ` Pat Thoyts
0 siblings, 0 replies; 6+ messages in thread
From: Pat Thoyts @ 2012-09-17 10:54 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Beat Bolli
Junio C Hamano <gitster@pobox.com> writes:
>Beat Bolli <bbolli@ewanet.ch> writes:
>
>> No po update needed, as this string is untranslated.
>>
>> Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
>> ---
>> git-gui/lib/commit.tcl | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
>> index 0d81432..78c5eeb 100644
>> --- a/git-gui/lib/commit.tcl
>> +++ b/git-gui/lib/commit.tcl
>> @@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {
>> && [is_config_true gui.warndetachedcommit]} {
>> set msg [mc "You are about to commit on a detached head.\
>> This is a potentially dangerous thing to do because if you switch\
>> -to another branch you will loose your changes and it can be difficult\
>> +to another branch you will lose your changes and it can be difficult\
>> to retrieve them later from the reflog. You should probably cancel this\
>> commit and create a new branch to continue.\n\
>> \n\
>
>Looks obviously correct; Pat?
>
Yes. Applied.
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing
2012-08-18 20:28 ` Junio C Hamano
@ 2012-09-17 11:52 ` Pat Thoyts
0 siblings, 0 replies; 6+ messages in thread
From: Pat Thoyts @ 2012-09-17 11:52 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Beat Bolli
Junio C Hamano <gitster@pobox.com> writes:
>Beat Bolli <bbolli@ewanet.ch> writes:
>
>> Adding __git_ps1() to one's bash prompt displays various repo status
>> info after each command. After committing a git cherry-pick -n using
>> git-gui, the prompt still contains the "|CHERRY-PICKING" flag.
>>
>> Delete the file causing this flag when cleaning up.
>>
>> Signed-off-by: Beat Bolli <bbolli@ewanet.ch>
>> ---
>> git-gui/lib/commit.tcl | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
>> index 78c5eeb..864b687 100644
>> --- a/git-gui/lib/commit.tcl
>> +++ b/git-gui/lib/commit.tcl
>> @@ -409,6 +409,7 @@ A rescan will be automatically started now.
>> catch {file delete [gitdir MERGE_MSG]}
>> catch {file delete [gitdir SQUASH_MSG]}
>> catch {file delete [gitdir GITGUI_MSG]}
>> + catch {file delete [gitdir CHERRY_PICK_HEAD]}
>>
>> # -- Let rerere do its thing.
>> #
>
>It makes me wonder if the above sequence of file delete should all
>be removed and use "git commit" instead of "git commit-tree" in the
>implementation of this Tcl procedure instead.
>
>Pat?
>
I agree - this looks like the code in contrib/examples/git-commit.sh so
presumably predates the builtin 'commit' command.
For now I've applied the above - but this should be changed to just call
commit normally from what I can see. Thats added to my todo.
--
Pat Thoyts http://www.patthoyts.tk/
PGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-09-17 11:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-08-18 9:07 [PATCH 1/2] git-gui: Fix a loose/lose mistake Beat Bolli
2012-08-18 9:07 ` [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing Beat Bolli
2012-08-18 20:28 ` Junio C Hamano
2012-09-17 11:52 ` Pat Thoyts
2012-08-18 20:24 ` [PATCH 1/2] git-gui: Fix a loose/lose mistake Junio C Hamano
2012-09-17 10:54 ` Pat Thoyts
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 NNTP newsgroup(s).