Skip to content

Commit

Permalink
add shebang line to git-mergetool--lib.sh
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Jan 29, 2010
1 parent 7b48c17 commit 02e5124
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions git-mergetool--lib.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#!/bin/sh
# git-mergetool--lib is a library for common merge tool functions
diff_mode() {
test "$TOOL_MODE" = diff
Expand Down

0 comments on commit 02e5124

Please sign in to comment.