{"thread":{"id":"18691","subject":"[PATCH] {diff,merge}tool: rename helpers to remove them from tab-completion","startedAt":"2009-04-02T11:38:16Z","lastAt":"2009-04-02T20:04:33Z","messageCount":2,"participants":["David Aguilar","Markus Heidelberg"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"110210","messageId":"1238672296-10265-1-git-send-email-davvid@gmail.com","threadId":"18691","inReplyTo":null,"subject":"[PATCH] {diff,merge}tool: rename helpers to remove them from tab-completion","fromName":"David Aguilar","fromEmail":"davvid@gmail.com","sentAt":"2009-04-02T11:38:16Z","receivedAt":"2009-04-02T11:38:16Z","isPatch":true,"sender":{"key":"davvid@gmail.com","avatar":"https://avatars.githubusercontent.com/u/13196?v=4"},"body":"Users should never run difftool-helper or mergetool-lib directly,\nso rename them to *--helper and *--lib.  This keeps the helper\nscripts from showing up when using bash tab completion.\n\nSigned-off-by: David Aguilar <davvid@gmail.com>\n---\n\nThis is based on the 'pu' branch + the patches\nI sent out earlier.\n\n\n .gitignore                                         |    4 ++--\n ...it-mergetool-lib.txt => git-mergetool--lib.txt} |   10 +++++-----\n Makefile                                           |    4 ++--\n command-list.txt                                   |    2 +-\n git-difftool-helper.sh => git-difftool--helper.sh  |    6 +++---\n git-difftool.perl                                  |    6 +++---\n git-mergetool-lib.sh => git-mergetool--lib.sh      |    2 +-\n git-mergetool.sh                                   |    2 +-\n 8 files changed, 18 insertions(+), 18 deletions(-)\n rename Documentation/{git-mergetool-lib.txt => git-mergetool--lib.txt} (82%)\n rename git-difftool-helper.sh => git-difftool--helper.sh (96%)\n rename git-mergetool-lib.sh => git-mergetool--lib.sh (98%)\n\ndiff --git a/.gitignore b/.gitignore\nindex 75c154a..757c7f0 100644\n--- a/.gitignore\n+++ b/.gitignore\n@@ -36,7 +36,7 @@ git-diff-files\n git-diff-index\n git-diff-tree\n git-difftool\n-git-difftool-helper\n+git-difftool--helper\n git-describe\n git-fast-export\n git-fast-import\n@@ -80,7 +80,7 @@ git-merge-recursive\n git-merge-resolve\n git-merge-subtree\n git-mergetool\n-git-mergetool-lib\n+git-mergetool--lib\n git-mktag\n git-mktree\n git-name-rev\ndiff --git a/Documentation/git-mergetool-lib.txt b/Documentation/git-mergetool--lib.txt\nsimilarity index 82%\nrename from Documentation/git-mergetool-lib.txt\nrename to Documentation/git-mergetool--lib.txt\nindex 7377774..ffda66b 100644\n--- a/Documentation/git-mergetool-lib.txt\n+++ b/Documentation/git-mergetool--lib.txt\n@@ -1,13 +1,13 @@\n-git-mergetool-lib(1)\n-====================\n+git-mergetool--lib(1)\n+=====================\n \n NAME\n ----\n-git-mergetool-lib - Common git merge tool shell scriptlets\n+git-mergetool--lib - Common git merge tool shell scriptlets\n \n SYNOPSIS\n --------\n-'. \"$(git --exec-path)/git-mergetool-lib\"'\n+'. \"$(git --exec-path)/git-mergetool--lib\"'\n \n DESCRIPTION\n -----------\n@@ -16,7 +16,7 @@ This is not a command the end user would want to run.  Ever.\n This documentation is meant for people who are studying the\n Porcelain-ish scripts and/or are writing new ones.\n \n-The 'git-mergetool-lib' scriptlet is designed to be sourced (using\n+The 'git-mergetool--lib' scriptlet is designed to be sourced (using\n `.`) by other shell scripts to set up functions for working\n with git merge tools.\n \ndiff --git a/Makefile b/Makefile\nindex 086f9e7..3e56274 100644\n--- a/Makefile\n+++ b/Makefile\n@@ -277,14 +277,14 @@ TEST_PROGRAMS =\n \n SCRIPT_SH += git-am.sh\n SCRIPT_SH += git-bisect.sh\n-SCRIPT_SH += git-difftool-helper.sh\n+SCRIPT_SH += git-difftool--helper.sh\n SCRIPT_SH += git-filter-branch.sh\n SCRIPT_SH += git-lost-found.sh\n SCRIPT_SH += git-merge-octopus.sh\n SCRIPT_SH += git-merge-one-file.sh\n SCRIPT_SH += git-merge-resolve.sh\n SCRIPT_SH += git-mergetool.sh\n-SCRIPT_SH += git-mergetool-lib.sh\n+SCRIPT_SH += git-mergetool--lib.sh\n SCRIPT_SH += git-parse-remote.sh\n SCRIPT_SH += git-pull.sh\n SCRIPT_SH += git-quiltimport.sh\ndiff --git a/command-list.txt b/command-list.txt\nindex 922c815..fd66395 100644\n--- a/command-list.txt\n+++ b/command-list.txt\n@@ -69,7 +69,7 @@ git-merge-file                          plumbingmanipulators\n git-merge-index                         plumbingmanipulators\n git-merge-one-file                      purehelpers\n git-mergetool                           ancillarymanipulators\n-git-mergetool-lib                       purehelpers\n+git-mergetool--lib                      purehelpers\n git-merge-tree                          ancillaryinterrogators\n git-mktag                               plumbingmanipulators\n git-mktree                              plumbingmanipulators\ndiff --git a/git-difftool-helper.sh b/git-difftool--helper.sh\nsimilarity index 96%\nrename from git-difftool-helper.sh\nrename to git-difftool--helper.sh\nindex d174b34..602cd4f 100755\n--- a/git-difftool-helper.sh\n+++ b/git-difftool--helper.sh\n@@ -1,13 +1,13 @@\n #!/bin/sh\n-# git-difftool-helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.\n+# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.\n # This script is typically launched by using the 'git difftool'\n # convenience command.\n #\n # Copyright (c) 2009 David Aguilar\n \n-# Load common functions from git-mergetool-lib\n+# Load common functions from git-mergetool--lib\n TOOL_MODE=diff\n-. git-mergetool-lib\n+. git-mergetool--lib\n \n # difftool.prompt controls the default prompt/no-prompt behavior\n # and is overridden with $GIT_DIFFTOOL*_PROMPT.\ndiff --git a/git-difftool.perl b/git-difftool.perl\nindex 985dfe0..948ff7f 100755\n--- a/git-difftool.perl\n+++ b/git-difftool.perl\n@@ -2,11 +2,11 @@\n # Copyright (c) 2009 David Aguilar\n #\n # This is a wrapper around the GIT_EXTERNAL_DIFF-compatible\n-# git-difftool-helper script.\n+# git-difftool--helper script.\n #\n # This script exports GIT_EXTERNAL_DIFF and GIT_PAGER for use by git.\n # GIT_DIFFTOOL_NO_PROMPT, GIT_DIFFTOOL_PROMPT, and GIT_DIFF_TOOL\n-# are exported for use by git-difftool-helper.\n+# are exported for use by git-difftool--helper.\n #\n # Any arguments that are unknown to this script are forwarded to 'git diff'.\n \n@@ -30,7 +30,7 @@ sub setup_environment\n {\n \t$ENV{PATH} = \"$DIR:$ENV{PATH}\";\n \t$ENV{GIT_PAGER} = '';\n-\t$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool-helper';\n+\t$ENV{GIT_EXTERNAL_DIFF} = 'git-difftool--helper';\n }\n \n sub exe\ndiff --git a/git-mergetool-lib.sh b/git-mergetool--lib.sh\nsimilarity index 98%\nrename from git-mergetool-lib.sh\nrename to git-mergetool--lib.sh\nindex 197533e..91d5453 100644\n--- a/git-mergetool-lib.sh\n+++ b/git-mergetool--lib.sh\n@@ -1,4 +1,4 @@\n-# git-mergetool-lib is a library for common merge tool functions\n+# git-mergetool--lib is a library for common merge tool functions\n diff_mode() {\n \ttest $TOOL_MODE = \"diff\"\n }\ndiff --git a/git-mergetool.sh b/git-mergetool.sh\nindex 16562bd..401c107 100755\n--- a/git-mergetool.sh\n+++ b/git-mergetool.sh\n@@ -13,7 +13,7 @@ SUBDIRECTORY_OK=Yes\n OPTIONS_SPEC=\n TOOL_MODE=merge\n . git-sh-setup\n-. git-mergetool-lib\n+. git-mergetool--lib\n require_work_tree\n \n # Returns true if the mode reflects a symlink\n-- \n1.6.2.1.469.gdffc1\n"},{"id":"110242","messageId":"200904022204.34019.markus.heidelberg@web.de","threadId":"18691","inReplyTo":"1238672296-10265-1-git-send-email-davvid@gmail.com","subject":"Re: [PATCH] {diff,merge}tool: rename helpers to remove them from tab-completion","fromName":"Markus Heidelberg","fromEmail":"markus.heidelberg@web.de","sentAt":"2009-04-02T20:04:33Z","receivedAt":"2009-04-02T20:04:33Z","isPatch":true,"sender":{"key":"markus.heidelberg@web.de","avatar":"https://avatars.githubusercontent.com/u/6334512?v=4"},"body":"David Aguilar, 02.04.2009:\n> diff --git a/Makefile b/Makefile\n[..]\n>  SCRIPT_SH += git-merge-resolve.sh\n>  SCRIPT_SH += git-mergetool.sh\n> -SCRIPT_SH += git-mergetool-lib.sh\n> +SCRIPT_SH += git-mergetool--lib.sh\n>  SCRIPT_SH += git-parse-remote.sh\n>  SCRIPT_SH += git-pull.sh\n>  SCRIPT_SH += git-quiltimport.sh\n\nThis conflicts with commit 496c021 (Add a script to edit/inspect notes)\nin 'pu', which seems to be just merged today. If you build your patches\non top of 'da/difftool' (99511d8) instead of 'pu', then these conflicts\nwon't arise and avoid hassle.\n\nIn fact I already applied all your patches on top 'da/difftool' and not\n'pu' all the time, until now.\n\nThanks for your work on this\n\nMarkus\n"}]}