{"thread":{"id":"18830","subject":"[PATCH v3 1/2] Ensure consistent usage of mergetool.keepBackup in git-gui","startedAt":"2009-04-10T19:33:56Z","lastAt":"2009-04-12T07:04:02Z","messageCount":7,"participants":["Ferry Huberts","Junio C Hamano","Ferry Huberts (Pelagic)"],"isPatch":true,"patchVersion":3,"patchTotal":2},"messages":[{"id":"111027","messageId":"f3d401fbaec1556ffbf8c13b83e58849af973a71.1239376248.git.ferry.huberts@pelagic.nl","threadId":"18830","inReplyTo":null,"subject":"[PATCH v3 1/2] Ensure consistent usage of mergetool.keepBackup in git-gui","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-10T19:33:56Z","receivedAt":"2009-04-10T19:33:56Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"In several places merge.keepBackup is used i.s.o.\nmergetool.keepBackup. This patch makes it all\nconsistent for git-gui\n\nSigned-off-by: Ferry Huberts \n---\nBased on pu\n\nShawn, I think you said you already applied this, I'm still resending to keep\nthe series complete.\n\n git-gui/git-gui.sh | 2 +-\n git-gui/lib/mergetool.tcl | 2 +-\n 2 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh\nindex e018e07..e4e643a 100755\n--- a/git-gui/git-gui.sh\n+++ b/git-gui/git-gui.sh\n@@ -699,7 +699,7 @@ proc apply_config {} {\n \n set default_config(branch.autosetupmerge) true\n set default_config(merge.tool) {}\n-set default_config(merge.keepbackup) true\n+set default_config(mergetool.keepbackup) true\n set default_config(merge.diffstat) true\n set default_config(merge.summary) false\n set default_config(merge.verbosity) 2\ndiff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl\nindex eb2b4b5..b7263b3 100644\n--- a/git-gui/lib/mergetool.tcl\n+++ b/git-gui/lib/mergetool.tcl\n@@ -382,7 +382,7 @@ proc merge_tool_finish {fd} {\n \t\tdelete_temp_files $mtool_tmpfiles\n \t\tui_status [mc \"Merge tool failed.\"]\n \t} else {\n-\t\tif {[is_config_true merge.keepbackup]} {\n+\t\tif {[is_config_true mergetool.keepbackup]} {\n \t\t\tfile rename -force -- $backup \"$mtool_target.orig\"\n \t\t}\n \n-- \n1.6.0.6\n"},{"id":"111028","messageId":"9a358c8b6275a7103eb036a2d1d6073bcf191e09.1239376248.git.ferry.huberts@pelagic.nl","threadId":"18830","inReplyTo":"f3d401fbaec1556ffbf8c13b83e58849af973a71.1239376248.git.ferry.huberts@pelagic.nl","subject":"[PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Ferry Huberts","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-10T19:33:57Z","receivedAt":"2009-04-10T19:33:57Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"In several places merge.keepBackup is used i.s.o.\nmergetool.keepBackup. This patch makes it all\nconsistent for git\n\nSigned-off-by: Ferry Huberts \n---\nBased on pu\n\n git-mergetool.sh | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex efa31a2..2e3e02b 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -257,7 +257,7 @@ prompt_after_failed_merge() {\n merge_tool=$(get_merge_tool \"$merge_tool\") || exit\n merge_tool_cmd=\"$(get_merge_tool_cmd \"$merge_tool\")\"\n merge_tool_path=\"$(get_merge_tool_path \"$merge_tool\")\" || exit\n-merge_keep_backup=\"$(git config --bool merge.keepBackup || echo true)\"\n+merge_keep_backup=\"$(git config --bool mergetool.keepBackup || echo true)\"\n merge_keep_temporaries=\"$(git config --bool mergetool.keepTemporaries || echo false)\"\n merge_tool_trust_exit_code=\"$(git config --bool mergetool.\"$merge_tool\".trustExitCode || echo false)\"\n \n-- \n1.6.0.6\n"},{"id":"111079","messageId":"7vljq7dmg2.fsf@gitster.siamese.dyndns.org","threadId":"18830","inReplyTo":"9a358c8b6275a7103eb036a2d1d6073bcf191e09.1239376248.git.ferry.huberts@pelagic.nl","subject":"Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-11T19:23:09Z","receivedAt":"2009-04-11T19:23:09Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ferry Huberts writes:\n\n> In several places merge.keepBackup is used i.s.o.\n> mergetool.keepBackup. This patch makes it all\n> consistent for git\n\nA silly question. The above makes it sound as if both merge.keepBackup\nand mergetool.keepBackup are valid, but the latter is preferred, and your\npatch makes things consistent even though without it there is nothing\nbroken per-se.\n\nIs that really is the case?\n\nOtherwise, perhaps the title and the message should read like this:\n\n Fix misspelled mergetool.keepBackup\n \n In several places mergetool.keepBackup was misspelled as merge.keepBackup.\n \n Signed-off-by: Ferry Huberts \n"},{"id":"111087","messageId":"49E0F27C.8070203@pelagic.nl","threadId":"18830","inReplyTo":"7vljq7dmg2.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-11T19:41:48Z","receivedAt":"2009-04-11T19:41:48Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Ferry Huberts writes:\n> \n>> In several places merge.keepBackup is used i.s.o.\n>> mergetool.keepBackup. This patch makes it all\n>> consistent for git\n> \n> A silly question. The above makes it sound as if both merge.keepBackup\n> and mergetool.keepBackup are valid, but the latter is preferred, and your\n> patch makes things consistent even though without it there is nothing\n> broken per-se.\n> \n> Is that really is the case?\n> \n> Otherwise, perhaps the title and the message should read like this:\n> \n> Fix misspelled mergetool.keepBackup\n> \n> In several places mergetool.keepBackup was misspelled as merge.keepBackup.\n> \n> Signed-off-by: Ferry Huberts \n\nfeel free to change it :-)\nimho there has been way too much discussion for such a simple patch.\n"},{"id":"111089","messageId":"49E0F33B.8070806@pelagic.nl","threadId":"18830","inReplyTo":"49E0F27C.8070203@pelagic.nl","subject":"Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-11T19:44:59Z","receivedAt":"2009-04-11T19:44:59Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Ferry Huberts (Pelagic) wrote:\n> Junio C Hamano wrote:\n>> Ferry Huberts writes:\n>>\n>>> In several places merge.keepBackup is used i.s.o.\n>>> mergetool.keepBackup. This patch makes it all\n>>> consistent for git\n>> A silly question. The above makes it sound as if both merge.keepBackup\n>> and mergetool.keepBackup are valid, but the latter is preferred, and your\n>> patch makes things consistent even though without it there is nothing\n>> broken per-se.\n>>\n>> Is that really is the case?\n>>\n>> Otherwise, perhaps the title and the message should read like this:\n>>\n>> Fix misspelled mergetool.keepBackup\n>> \n>> In several places mergetool.keepBackup was misspelled as merge.keepBackup.\n>> \n>> Signed-off-by: Ferry Huberts \n> \n> feel free to change it :-)\n> imho there has been way too much discussion for such a simple patch.\n> \n\nreplying to myself :-)\n\nmaybe 'way too much' is a bit strong. I think the part of the discussion\nabout finding out what actually to do was good. the rest was a bit too\nmuch for my taste. but I'm still getting used to ways of the git.devel\nlist :-)\n"},{"id":"111092","messageId":"7v4owvdju6.fsf@gitster.siamese.dyndns.org","threadId":"18830","inReplyTo":"49E0F33B.8070806@pelagic.nl","subject":"Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-04-11T20:19:29Z","receivedAt":"2009-04-11T20:19:29Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Ferry Huberts (Pelagic)\" writes:\n\n> Ferry Huberts (Pelagic) wrote:\n>> Junio C Hamano wrote:\n>>> Ferry Huberts writes:\n>>>\n>>>> In several places merge.keepBackup is used i.s.o.\n>>>> mergetool.keepBackup. This patch makes it all\n>>>> consistent for git\n>>> A silly question. The above makes it sound as if both merge.keepBackup\n>>> and mergetool.keepBackup are valid, but the latter is preferred, and your\n>>> patch makes things consistent even though without it there is nothing\n>>> broken per-se.\n>>>\n>>> Is that really is the case?\n>>>\n>>> Otherwise, perhaps the title and the message should read like this:\n>>>\n>>> Fix misspelled mergetool.keepBackup\n>>> \n>>> In several places mergetool.keepBackup was misspelled as merge.keepBackup.\n>>> \n>>> Signed-off-by: Ferry Huberts \n>> \n>> feel free to change it :-)\n\nNotice that I didn't follow the discussion closely, and I am asking if\nthis is a \"bugfix\" or \"changing for consistency even though there is no\nbreakage\".\n"},{"id":"111118","messageId":"49E19262.7090802@pelagic.nl","threadId":"18830","inReplyTo":"7v4owvdju6.fsf@gitster.siamese.dyndns.org","subject":"Re: [PATCH v3 2/2] Ensure consistent usage of mergetool.keepBackup in git","fromName":"Ferry Huberts (Pelagic)","fromEmail":"ferry.huberts@pelagic.nl","sentAt":"2009-04-12T07:04:02Z","receivedAt":"2009-04-12T07:04:02Z","isPatch":true,"sender":{"key":"ferry.huberts@pelagic.nl","avatar":"https://gravatar.com/avatar/9f63c0289ad23cbdef0f7609a0af85ff0f4b3babfd066de9ff58f62d48cfd6f2?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> \"Ferry Huberts (Pelagic)\" writes:\n> \n>> Ferry Huberts (Pelagic) wrote:\n>>> Junio C Hamano wrote:\n>>>> Ferry Huberts writes:\n>>>>\n>>>>> In several places merge.keepBackup is used i.s.o.\n>>>>> mergetool.keepBackup. This patch makes it all\n>>>>> consistent for git\n>>>> A silly question. The above makes it sound as if both merge.keepBackup\n>>>> and mergetool.keepBackup are valid, but the latter is preferred, and your\n>>>> patch makes things consistent even though without it there is nothing\n>>>> broken per-se.\n>>>>\n>>>> Is that really is the case?\n>>>>\n>>>> Otherwise, perhaps the title and the message should read like this:\n>>>>\n>>>> Fix misspelled mergetool.keepBackup\n>>>> \n>>>> In several places mergetool.keepBackup was misspelled as merge.keepBackup.\n>>>> \n>>>> Signed-off-by: Ferry Huberts \n>>> feel free to change it :-)\n> \n> Notice that I didn't follow the discussion closely, and I am asking if\n> this is a \"bugfix\" or \"changing for consistency even though there is no\n> breakage\".\n> \n\nit's the latter.\nsummary: docs say mergetool.keepBackup. code does merge.keepBackup\n"}]}