From: Jeff King <peff@peff.net>
Date: Fri, 29 Jan 2010 10:37:23 +0000 (-0500)
Subject: add shebang line to git-mergetool--lib.sh
X-Git-Tag: v1.7.0-rc1~9
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=02e51243559334e821e85b05dbb358e52b7ba4e5;p=git.git

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>
---

diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 5b6278572..51dd0d67b 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