diff --git a/.githooks/post-merge b/.githooks/post-merge index 993fe49..8706448 100755 --- a/.githooks/post-merge +++ b/.githooks/post-merge @@ -24,6 +24,11 @@ get_blob () { # get the blob of the file(name) passed as $1 get_commit_for_blob () { # search for the blob in all commits for the file(name) $1 + echo $1 >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{}) >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1") >> /tmp/blob + echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") }