GerhardHoffmann/customer_281
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

debugging ...

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-04-25 11:23:09 +02:00
parent 5beba99abb
commit cca3484256
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.githooks/post-merge
View File

@ -25,11 +25,11 @@ get_blob () { # get the blob of the file(name) passed as $1
get_commit_for_blob () { get_commit_for_blob () {
# search for the blob in all commits for the file(name) $1 # search for the blob in all commits for the file(name) $1
echo $1 >> /tmp/blob echo $1 >> /tmp/blob
echo $(git log --all --pretty=format:%H -- $1) >> /tmp/blob echo $(git log --all --pretty=format:%H -- $2) >> /tmp/blob
echo $(git log --all --pretty=format:%H -- $1 | xargs -I{}) >> /tmp/blob echo $(git log --all --pretty=format:%H -- $2 | 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 -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2") >> /tmp/blob
echo $(git log --all --pretty=format:%H -- $1 | xargs -I{} bash -c "git ls-tree {} -- $1 | grep -q $1 && echo {}") echo $(git log --all --pretty=format:%H -- $2 | xargs -I{} bash -c "git ls-tree {} -- $2 | grep -q $1 && echo {}")
} }
for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
@ -39,7 +39,7 @@ for fn in $(git diff-tree -r HEAD@{1} HEAD --name-only); do
fn=$(echo $fn | awk '{ printf "/"$0 }') fn=$(echo $fn | awk '{ printf "/"$0 }')
if [[ -f "$fn" ]]; then if [[ -f "$fn" ]]; then
blob=$(get_blob "$fn") blob=$(get_blob "$fn")
commit=$(get_commit_for_blob $blob) commit=$(get_commit_for_blob $blob "$fn")
fsize=$(ls -l "$fn" | awk '{ print $5 }') fsize=$(ls -l "$fn" | awk '{ print $5 }')
echo "$fn $fsize b=$blob c=$commit" >> $GIT_PULL_TMP echo "$fn $fsize b=$blob c=$commit" >> $GIT_PULL_TMP
fi fi