From 69adff7509d985ea608afbcb7050328185214c97 Mon Sep 17 00:00:00 2001 From: "Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com)" Date: Tue, 7 Jun 2016 21:19:56 +0100 Subject: Fix yet another bug in the githooks --- install_dev_githooks.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install_dev_githooks.sh') diff --git a/install_dev_githooks.sh b/install_dev_githooks.sh index b43dd6a0..4e7e76d6 100755 --- a/install_dev_githooks.sh +++ b/install_dev_githooks.sh @@ -3,7 +3,7 @@ echo Installing post-merge hook which recursively forces all echo submodules to latest commit after every git pull cat <> .git/hooks/post-merge #!/bin/sh -git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge origin/$branch;' +git submodule foreach --recursive 'branch=\$(git config -f \$toplevel/.gitmodules submodule.\$name.branch); [ \"\$branch\" = \"\" ] && branch=master; git checkout \$branch; git merge origin/\$branch;' EOT chmod +x .git/hooks/post-merge echo Installing custom 'git pull-all' command for recursively -- cgit v1.2.3