Skip to content

Commit 02e5124

Browse files
peffgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7b48c17 commit 02e5124

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

git-mergetool--lib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#!/bin/sh
12
# git-mergetool--lib is a library for common merge tool functions
23
diff_mode() {
34
test "$TOOL_MODE" = diff

0 commit comments

Comments
 (0)