git-templates/hooks/post-merge - Issue 21012004: Explicitly exec hooks inside a shell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git-templates/hooks/post-merge

Issue 21012004: Explicitly exec hooks inside a shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 7 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: git-templates/hooks/post-merge

diff --git a/git-templates/hooks/post-merge b/git-templates/hooks/post-merge

index 87ebad2eef8c5c5f2c97c37e2c65a6f0a7438a15..637492e5b0eb311468bab34bd39008a2adfc081d 100755

--- a/git-templates/hooks/post-merge

+++ b/git-templates/hooks/post-merge

@@ -1,4 +1,4 @@

#!/bin/sh

-[ -e "build/git-hooks/post-merge" ] && exec "build/git-hooks/post-merge" "$@"

+[ -e "build/git-hooks/post-merge" ] && exec sh "build/git-hooks/post-merge" "$@"

exit 0

« no previous file with comments | « git-templates/hooks/post-commit ('k') | git-templates/hooks/post-update » ('j') | no next file with comments »