mirror/libbpf
1
0
Fork 0
mirror of https://github.com/netdata/libbpf.git synced 2026-04-07 09:09:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: fix empty cherry-pick handling, fix IGNORE_CONSISTENCY check

Browse Source 
Fix two issues I've encountered during latest bpf/bpf-next sync.

Signed-off-by: Andrii Nakryiko <andriin@fb.com>
This commit is contained in:
Andrii Nakryiko
2019-09-26 12:52:09 -07:00
committed by Andrii Nakryiko
parent 07cd489681
commit ede18f80d8
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/sync-kernel.sh
View File

@@ -165,9 +165,16 @@ cherry_pick_commits()
if ! git cherry-pick ${new_commit} &>/dev/null; then if ! git cherry-pick ${new_commit} &>/dev/null; then
echo "Warning! Cherry-picking '${desc} failed, checking if it's non-libbpf files causing problems..." echo "Warning! Cherry-picking '${desc} failed, checking if it's non-libbpf files causing problems..."
libbpf_conflict_cnt=$(git diff --name-only --diff-filter=U -- ${LIBBPF_PATHS[@]} | wc -l) libbpf_conflict_cnt=$(git diff --name-only --diff-filter=U -- ${LIBBPF_PATHS[@]} | wc -l)
conflict_cnt=$(git diff --name-only | wc -l)
if ((${libbpf_conflict_cnt} == 0)); then if ((${libbpf_conflict_cnt} == 0)); then
echo "Looks like only non-libbpf files have conflicts, ignoring..." echo "Looks like only non-libbpf files have conflicts, ignoring..."
if ((${conflict_cnt} == 0)); then
echo "Empty cherry-pick, skipping it..."
git cherry-pick --abort
continue
fi
git add . git add .
# GIT_EDITOR=true to avoid editor popping up to edit commit message # GIT_EDITOR=true to avoid editor popping up to edit commit message
if ! GIT_EDITOR=true git cherry-pick --continue &>/dev/null; then if ! GIT_EDITOR=true git cherry-pick --continue &>/dev/null; then
@@ -313,7 +320,7 @@ if ((${CONSISTENT} == 1)); then
echo "Great! Content is identical!" echo "Great! Content is identical!"
else else
echo "Unfortunately, there are consistency problems!" echo "Unfortunately, there are consistency problems!"
if ((${IGNORE_CONSISTENCY} != 1)); then if ((${IGNORE_CONSISTENCY-0} != 1)); then
exit 4 exit 4
fi fi
fi fi