{"thread":{"id":"31277","subject":"[PATCH 1/2] git-gui: Fix a loose/lose mistake","startedAt":"2012-08-18T09:07:30Z","lastAt":"2012-09-17T11:52:32Z","messageCount":6,"participants":["Beat Bolli","Junio C Hamano","Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":2},"messages":[{"id":"197237","messageId":"1345280851-6626-1-git-send-email-bbolli@ewanet.ch","threadId":"31277","inReplyTo":null,"subject":"[PATCH 1/2] git-gui: Fix a loose/lose mistake","fromName":"Beat Bolli","fromEmail":"bbolli@ewanet.ch","sentAt":"2012-08-18T09:07:30Z","receivedAt":"2012-08-18T09:07:30Z","isPatch":true,"sender":{"key":"bbolli@ewanet.ch","avatar":"https://avatars.githubusercontent.com/u/21444?v=4"},"body":"No po update needed, as this string is untranslated.\n\nSigned-off-by: Beat Bolli \n---\n git-gui/lib/commit.tcl | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\nindex 0d81432..78c5eeb 100644\n--- a/git-gui/lib/commit.tcl\n+++ b/git-gui/lib/commit.tcl\n@@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {\n \t && \t[is_config_true gui.warndetachedcommit]} {\n \t\tset msg [mc \"You are about to commit on a detached head.\\\n This is a potentially dangerous thing to do because if you switch\\\n-to another branch you will loose your changes and it can be difficult\\\n+to another branch you will lose your changes and it can be difficult\\\n to retrieve them later from the reflog. You should probably cancel this\\\n commit and create a new branch to continue.\\n\\\n \\n\\\n-- \n1.7.10.4\n"},{"id":"197238","messageId":"1345280851-6626-2-git-send-email-bbolli@ewanet.ch","threadId":"31277","inReplyTo":"1345280851-6626-1-git-send-email-bbolli@ewanet.ch","subject":"[PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing","fromName":"Beat Bolli","fromEmail":"bbolli@ewanet.ch","sentAt":"2012-08-18T09:07:31Z","receivedAt":"2012-08-18T09:07:31Z","isPatch":true,"sender":{"key":"bbolli@ewanet.ch","avatar":"https://avatars.githubusercontent.com/u/21444?v=4"},"body":"Adding __git_ps1() to one's bash prompt displays various repo status\ninfo after each command. After committing a git cherry-pick -n using\ngit-gui, the prompt still contains the \"|CHERRY-PICKING\" flag.\n\nDelete the file causing this flag when cleaning up.\n\nSigned-off-by: Beat Bolli \n---\n git-gui/lib/commit.tcl | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\nindex 78c5eeb..864b687 100644\n--- a/git-gui/lib/commit.tcl\n+++ b/git-gui/lib/commit.tcl\n@@ -409,6 +409,7 @@ A rescan will be automatically started now.\n \tcatch {file delete [gitdir MERGE_MSG]}\n \tcatch {file delete [gitdir SQUASH_MSG]}\n \tcatch {file delete [gitdir GITGUI_MSG]}\n+\tcatch {file delete [gitdir CHERRY_PICK_HEAD]}\n \n \t# -- Let rerere do its thing.\n \t#\n-- \n1.7.10.4\n"},{"id":"197258","messageId":"7vsjbkrlsv.fsf@alter.siamese.dyndns.org","threadId":"31277","inReplyTo":"1345280851-6626-1-git-send-email-bbolli@ewanet.ch","subject":"Re: [PATCH 1/2] git-gui: Fix a loose/lose mistake","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-18T20:24:00Z","receivedAt":"2012-08-18T20:24:00Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Beat Bolli writes:\n\n> No po update needed, as this string is untranslated.\n>\n> Signed-off-by: Beat Bolli \n> ---\n> git-gui/lib/commit.tcl | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\n> index 0d81432..78c5eeb 100644\n> --- a/git-gui/lib/commit.tcl\n> +++ b/git-gui/lib/commit.tcl\n> @@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {\n> \t && \t[is_config_true gui.warndetachedcommit]} {\n> \t\tset msg [mc \"You are about to commit on a detached head.\\\n> This is a potentially dangerous thing to do because if you switch\\\n> -to another branch you will loose your changes and it can be difficult\\\n> +to another branch you will lose your changes and it can be difficult\\\n> to retrieve them later from the reflog. You should probably cancel this\\\n> commit and create a new branch to continue.\\n\\\n> \\n\\\n\nLooks obviously correct; Pat?\n"},{"id":"197259","messageId":"7vobm8rllv.fsf@alter.siamese.dyndns.org","threadId":"31277","inReplyTo":"1345280851-6626-2-git-send-email-bbolli@ewanet.ch","subject":"Re: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2012-08-18T20:28:12Z","receivedAt":"2012-08-18T20:28:12Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Beat Bolli writes:\n\n> Adding __git_ps1() to one's bash prompt displays various repo status\n> info after each command. After committing a git cherry-pick -n using\n> git-gui, the prompt still contains the \"|CHERRY-PICKING\" flag.\n>\n> Delete the file causing this flag when cleaning up.\n>\n> Signed-off-by: Beat Bolli \n> ---\n> git-gui/lib/commit.tcl | 1 +\n> 1 file changed, 1 insertion(+)\n>\n> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\n> index 78c5eeb..864b687 100644\n> --- a/git-gui/lib/commit.tcl\n> +++ b/git-gui/lib/commit.tcl\n> @@ -409,6 +409,7 @@ A rescan will be automatically started now.\n> \tcatch {file delete [gitdir MERGE_MSG]}\n> \tcatch {file delete [gitdir SQUASH_MSG]}\n> \tcatch {file delete [gitdir GITGUI_MSG]}\n> +\tcatch {file delete [gitdir CHERRY_PICK_HEAD]}\n> \n> \t# -- Let rerere do its thing.\n> \t#\n\nIt makes me wonder if the above sequence of file delete should all\nbe removed and use \"git commit\" instead of \"git commit-tree\" in the\nimplementation of this Tcl procedure instead.\n\nPat?\n"},{"id":"199213","messageId":"87d31kkjgw.fsf@fox.patthoyts.tk","threadId":"31277","inReplyTo":"7vsjbkrlsv.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 1/2] git-gui: Fix a loose/lose mistake","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2012-09-17T10:54:39Z","receivedAt":"2012-09-17T10:54:39Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Junio C Hamano writes:\n\n>Beat Bolli writes:\n>\n>> No po update needed, as this string is untranslated.\n>>\n>> Signed-off-by: Beat Bolli \n>> ---\n>> git-gui/lib/commit.tcl | 2 +-\n>> 1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\n>> index 0d81432..78c5eeb 100644\n>> --- a/git-gui/lib/commit.tcl\n>> +++ b/git-gui/lib/commit.tcl\n>> @@ -268,7 +268,7 @@ proc commit_commitmsg {curHEAD msg_p} {\n>> \t && \t[is_config_true gui.warndetachedcommit]} {\n>> \t\tset msg [mc \"You are about to commit on a detached head.\\\n>> This is a potentially dangerous thing to do because if you switch\\\n>> -to another branch you will loose your changes and it can be difficult\\\n>> +to another branch you will lose your changes and it can be difficult\\\n>> to retrieve them later from the reflog. You should probably cancel this\\\n>> commit and create a new branch to continue.\\n\\\n>> \\n\\\n>\n>Looks obviously correct; Pat?\n>\n\nYes. Applied.\n\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"},{"id":"199216","messageId":"878vc8kgsf.fsf@fox.patthoyts.tk","threadId":"31277","inReplyTo":"7vobm8rllv.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCH 2/2] git-gui: remove .git/CHERRY_PICK_HEAD after committing","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2012-09-17T11:52:32Z","receivedAt":"2012-09-17T11:52:32Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Junio C Hamano writes:\n\n>Beat Bolli writes:\n>\n>> Adding __git_ps1() to one's bash prompt displays various repo status\n>> info after each command. After committing a git cherry-pick -n using\n>> git-gui, the prompt still contains the \"|CHERRY-PICKING\" flag.\n>>\n>> Delete the file causing this flag when cleaning up.\n>>\n>> Signed-off-by: Beat Bolli \n>> ---\n>> git-gui/lib/commit.tcl | 1 +\n>> 1 file changed, 1 insertion(+)\n>>\n>> diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl\n>> index 78c5eeb..864b687 100644\n>> --- a/git-gui/lib/commit.tcl\n>> +++ b/git-gui/lib/commit.tcl\n>> @@ -409,6 +409,7 @@ A rescan will be automatically started now.\n>> \tcatch {file delete [gitdir MERGE_MSG]}\n>> \tcatch {file delete [gitdir SQUASH_MSG]}\n>> \tcatch {file delete [gitdir GITGUI_MSG]}\n>> +\tcatch {file delete [gitdir CHERRY_PICK_HEAD]}\n>> \n>> \t# -- Let rerere do its thing.\n>> \t#\n>\n>It makes me wonder if the above sequence of file delete should all\n>be removed and use \"git commit\" instead of \"git commit-tree\" in the\n>implementation of this Tcl procedure instead.\n>\n>Pat?\n>\n\nI agree - this looks like the code in contrib/examples/git-commit.sh so\npresumably predates the builtin 'commit' command.\nFor now I've applied the above - but this should be changed to just call\ncommit normally from what I can see. Thats added to my todo.\n-- \nPat Thoyts http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97 10 CE 11 E6 04 E0 B9 DD\n"}]}