vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(a123b392c) Fixes to pretty script

Browse Source
This commit is contained in:
juanjp600
2019-03-25 10:58:15 -03:00
parent 13fcf6f166
commit bc24dc9365
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
git-strip-merge-pretty
+7 -1
View File
@@ -126,9 +126,15 @@ branchshortsha="${branchsha:0:7}"
#assumes that the commit message starts with hash1...hash2 #assumes that the commit message starts with hash1...hash2
prevcommitmsg="$(git log -1 --pretty=%B)" prevcommitmsg="$(git log -1 --pretty=%B)"
prevcommitsha="${prevcommitmsg:10:7}" prevcommitsha="${prevcommitmsg:10:7}"
firstmsgchar="${prevcommitmsg:1:1}"
if [ $firstmsgchar = "(" ]; then
prevcommitsha="${prevcommitmsg:1:7}"
fi
exit 1
#create a commit message for out new "merge commit" #create a commit message for out new "merge commit"
# hash1...hash2 + logs of the merged commits # hash1...hash2 + logs of the merged commits
echo "$prevcommitsha...$branchsha"
logmsg="$(git log "$prevcommitsha"..."$branchsha" --pretty=oneline --abbrev-commit --reverse)" logmsg="$(git log "$prevcommitsha"..."$branchsha" --pretty=oneline --abbrev-commit --reverse)"
rm -rf temp.txt rm -rf temp.txt
@@ -155,7 +161,7 @@ while read p; do
git merge -m "$msgmerge" -X theirs "--squash" "$newsha" git merge -m "$msgmerge" -X theirs "--squash" "$newsha"
git checkout HEAD .gitignore git checkout HEAD .gitignore
git commit -m "$currMsg" git commit -m "($currHash) $currMsg"
done < "temp.txt" done < "temp.txt"
rm -rf temp.txt rm -rf temp.txt