diff options
| author | Jeff King <peff@peff.net> | 2010-01-29 05:37:23 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-29 09:56:51 -0800 |
| commit | 02e51243559334e821e85b05dbb358e52b7ba4e5 (patch) | |
| tree | b241259c22c84e38488655db3af3b317cead9531 | |
| parent | 7b48c170931f35c07c3ce78023519846073152a1 (diff) | |
| download | git-02e51243559334e821e85b05dbb358e52b7ba4e5.tar.gz | |
add shebang line to git-mergetool--lib.sh
Even though this script is expected to be sourced instead of
executed on its own, the #!/bin/sh line provides simple
documentation about what format the file is in.
In particular, the lack of such a line was confusing the
valgrind support of our test scripts, which assumed that any
executable without a #!-line should be intercepted and run
through valgrind. So during valgrind-enabled tests, any
script sourcing this file actually sourced the valgrind
interception script instead.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | git-mergetool--lib.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 5b6278572a..51dd0d67ba 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -1,3 +1,4 @@ +#!/bin/sh # git-mergetool--lib is a library for common merge tool functions diff_mode() { test "$TOOL_MODE" = diff |