Ryan Biesemeyer <ryan@xxxxxxxxxx> writes:
> + write_script "$HOOK" <<-EOF &&
> + if [ -s "$(git rev-parse --git-dir)/MERGE_HEAD" ]; then
> + exit 0
> + else
> + exit 1
> + fi
> + EOF
The script can be a one-liner
write_scirpt "$HOOK" <<-\EOF &&
test -s "$(git rev-parse --git-dir)/MERGE_HEAD"
EOF
can't it? I also do not think you want to have the rev-parse run
while writing the script (rather, you would want it run inside the
script, no?)
> + git merge other &&
> + test "`git log -1 --pretty=format:%s`" = "Merge branch '"'"'other'"'"'" &&
> + test ! -s "$(git rev-parse --git-dir)/MERGE_HEAD"
> +
> +'
> +
> test_done
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html