apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge diff display (#7047)

Browse Source
This commit is contained in:
dahn 2023-01-09 02:43:32 -08:00 committed by GitHub
parent 20306d6129
commit 6790371fe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/git/git-fwd-merge
View File

@ -28,6 +28,9 @@ if [ -z ${branch} ]; then
exit 1 exit 1
fi fi
# save old commit
oldhead=$(git show | grep commit | cut -d ' ' -f 2)
# Construct merge message # Construct merge message
currentBranch=$(git branch | grep "^*" | sed -e "s/^[*] //") currentBranch=$(git branch | grep "^*" | sed -e "s/^[*] //")
echo "Merge release branch ${branch} to ${currentBranch}" > ${tmpMessageFile} echo "Merge release branch ${branch} to ${currentBranch}" > ${tmpMessageFile}
@ -53,9 +56,9 @@ fi
rm -fr ${tmpMessageFile} rm -fr ${tmpMessageFile}
apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1) apache_remote=$(git remote -v | grep -E "git-wip-us\.apache\.org" | head -n 1 | cut -f1)
echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch})" echo "INFO: Actual diff in commits is: (running git log --pretty=oneline --abbrev-commit ${oldhead}..${currentBranch})"
echo echo
git log --pretty=oneline --abbrev-commit ${apache_remote}/${currentBranch}..${currentBranch} git log --pretty=oneline --abbrev-commit ${oldhead}..${currentBranch}
# What's next # What's next
echo "We're done! Please double check using 'git log -p' and 'git push' when you're sure." echo "We're done! Please double check using 'git log -p' and 'git push' when you're sure."