andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make format-diff.sh branch name agnostic (#8731)

Browse Source 
Summary: Pull Request resolved: https://github.com/facebook/rocksdb/pull/8731

Reviewed By: jay-zhuang

Differential Revision: D30678124

Pulled By: ltamasi

fbshipit-source-id: 0131b6707f0c5d1d887bcd45781623143b5ccae0
This commit is contained in:
Levi Tamasi 2021-09-01 11:56:33 -07:00 committed by Facebook GitHub Bot
parent 35dd251187
commit f756448f28
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build_tools/format-diff.sh
View File

@ -120,7 +120,7 @@ uncommitted_code=`git diff HEAD`
# If there's no uncommitted changes, we assume user are doing post-commit # If there's no uncommitted changes, we assume user are doing post-commit
# format check, in which case we'll try to check the modified lines vs. the # format check, in which case we'll try to check the modified lines vs. the
# facebook/rocksdb.git master branch. Otherwise, we'll check format of the # facebook/rocksdb.git main branch. Otherwise, we'll check format of the
# uncommitted code only. # uncommitted code only.
if [ -z "$uncommitted_code" ] if [ -z "$uncommitted_code" ]
then then
@ -128,8 +128,8 @@ then
[ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(git remote -v | grep 'facebook/rocksdb.git' | head -n 1 | cut -f 1)" [ "$FORMAT_REMOTE" ] || FORMAT_REMOTE="$(git remote -v | grep 'facebook/rocksdb.git' | head -n 1 | cut -f 1)"
# Fall back on 'origin' if that fails # Fall back on 'origin' if that fails
[ "$FORMAT_REMOTE" ] || FORMAT_REMOTE=origin [ "$FORMAT_REMOTE" ] || FORMAT_REMOTE=origin
# Use master branch from that remote # Use main branch from that remote
[ "$FORMAT_UPSTREAM" ] || FORMAT_UPSTREAM="$FORMAT_REMOTE/master" [ "$FORMAT_UPSTREAM" ] || FORMAT_UPSTREAM="$FORMAT_REMOTE/$(git remote show $FORMAT_REMOTE | sed -n '/HEAD branch/s/.*: //p')"
# Get the common ancestor with that remote branch. Everything after that # Get the common ancestor with that remote branch. Everything after that
# common ancestor would be considered the contents of a pull request, so # common ancestor would be considered the contents of a pull request, so
# should be relevant for formatting fixes. # should be relevant for formatting fixes.