Lines Matching full:commit

8 …echo "  - Update the libbpf submodule, commit, and use its new checkpoints as target commits for b…
9 	echo "  - Cherry-pick commits from the bpf-next branch, up to the bpf-next target commit."
10 	echo "  - Cherry-pick commits from the bpf branch, up to the bpf target commit."
11 	echo "  - Update bpftool's version number based on bpf-next's kernel version and target commit."
12 	echo "  - Create a new commit with the updated version and checkpoints."
15 …t BPF_NEXT_BASELINE to override bpf-next tree commit, otherwise read from <bpftool-repo>/CHECKPOIN…
16 …echo "Set BPF_BASELINE to override bpf tree commit, otherwise read from <bpftool-repo>/BPF-CHECKPO…
17 …IP_COMMIT to override bpf-next tree target commit, otherwise read from <bpftool-repo>/libbpf/CHECK…
18 …F_TIP_COMMIT to override bpf tree target commit, otherwise read from <bpftool-repo>/libbpf/BPF-CHE…
20 	echo "Set MANUAL_MODE to 1 to manually control every cherry-picked commit."
34 BASELINE_COMMIT=${BPF_NEXT_BASELINE:-$(cat ${BPFTOOL_REPO}/CHECKPOINT-COMMIT)}
35 BPF_BASELINE_COMMIT=${BPF_BASELINE:-$(cat ${BPFTOOL_REPO}/BPF-CHECKPOINT-COMMIT)}
98 # Output brief single-line commit description
99 # $1 - commit ref
105 # Create commit single-line signature, which consists of:
106 # - full commit subject
108 # - full commit body with newlines replaced with vertical bars (|)
112 # $1 - commit ref
139 				echo "Commit ${new_commit::12} from bpf is already in bpf-next branch, skipping."
148 			# commit with the same subject is already in bpftool, but it's
149 			# not 100% the same commit, so check with user
150 			echo "Commit '${desc}' is synced into bpftool as:"
171 		# commit hasn't been synced into bpftool yet
188 				# GIT_EDITOR=true to avoid editor popping up to edit commit message
201 		# Append signature of just cherry-picked commit to avoid
202 		# potentially cherry-picking the same commit twice later when
204 		# the final commit sha in bpftool repo, so we record Linux SHA
236 		git commit -m 'sync: Update libbpf submodule' \
240 Libbpf commit:  ${LIBBPF_COMMIT}" \
246 TIP_COMMIT=${BPF_NEXT_TIP_COMMIT:-$(cat ${BPFTOOL_REPO}/libbpf/CHECKPOINT-COMMIT)}
247 BPF_TIP_COMMIT=${BPF_TIP_COMMIT:-$(cat ${BPFTOOL_REPO}/libbpf/BPF-CHECKPOINT-COMMIT)}
255 echo "Dumping existing bpftool commit signatures..."
270 # Squash state of kernel repo at baseline into single commit
273 SQUASH_COMMIT=$(git commit-tree ${BASELINE_COMMIT}^{tree} -m "BASELINE SQUASH ${BASELINE_COMMIT}")
280 echo "BASE COMMIT:      '$(commit_desc ${BASELINE_COMMIT})'"
281 echo "TIP COMMIT:       '$(commit_desc ${TIP_COMMIT})'"
282 echo "BPF BASE COMMIT:  '$(commit_desc ${BPF_BASELINE_COMMIT})'"
283 echo "BPF TIP COMMIT:   '$(commit_desc ${BPF_TIP_COMMIT})'"
284 echo "SQUASH COMMIT:    ${SQUASH_COMMIT}"
302 # Cherry-pick new commits onto squashed baseline commit
321 # Exclude baseline commit and generate nice cover letter with summary
341 # Use generated cover-letter as a template for "sync commit" with
344 echo ${TIP_COMMIT} > CHECKPOINT-COMMIT &&					      \
345 echo ${BPF_TIP_COMMIT} > BPF-CHECKPOINT-COMMIT &&				      \
346 git add CHECKPOINT-COMMIT &&							      \
347 git add BPF-CHECKPOINT-COMMIT &&						      \
353 Baseline bpf-next commit:   ${BASELINE_COMMIT}\n\
354 Checkpoint bpf-next commit: ${TIP_COMMIT}\n\
355 Baseline bpf commit:        ${BPF_BASELINE_COMMIT}\n\
356 Checkpoint bpf commit:      ${BPF_TIP_COMMIT}\n\
358 git commit --file=-