diff options
| author | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-19 14:15:42 +0000 |
|---|---|---|
| committer | Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org> | 2019-01-21 14:27:28 +0000 |
| commit | a87534dd6f75beb6544418d98d946906766dba7a (patch) | |
| tree | cd0e125dba1838749dfc8fd371cff8831a37948e | |
| parent | a85440a3d1f11061f9b5149606e57337563bc610 (diff) | |
round-robin.h: Record correct sha1 of base-artifacts/ in manifest
Git_rev_parse resolves references against refs/remotes/origin/$ref,
which is what we want most of the time, but not for HEAD.
Refs/remotes/origin/HEAD will, typically return sha1 of repo's
master branch, not sha1 of current checkout.
The fix is to use plain "git rev-parse".
A future patch will rename git_rev_parse to git_remote_rev_parse
or something similar.
Change-Id: Ic3656ee9880862608928a7e6081fe6559e64c70e
| -rw-r--r-- | jenkins-helpers.sh | 2 | ||||
| -rw-r--r-- | round-robin.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/jenkins-helpers.sh b/jenkins-helpers.sh index 5b87a29d..78d44da4 100644 --- a/jenkins-helpers.sh +++ b/jenkins-helpers.sh @@ -800,7 +800,7 @@ EOF manifest_push "$2" cat <<EOF | manifest_out # Start option processing -jenkins_scripts_rev=$(git_rev_parse $(dirname "$0") HEAD) +jenkins_scripts_rev=$(git -C $(dirname "$0") rev-parse HEAD) EOF num=2 ;; diff --git a/round-robin.sh b/round-robin.sh index 034e6726..e843f4a2 100644 --- a/round-robin.sh +++ b/round-robin.sh @@ -63,7 +63,7 @@ reset_artifacts () rr[base-artifacts_rev]="${rr[base-artifacts_rev]-${rr[baseline_branch]}}" clone_or_update_repo base-artifacts ${rr[base-artifacts_rev]} https://git-us.linaro.org/toolchain/ci/base-artifacts.git auto $single_branch cat <<EOF | manifest_out -rr[base-artifacts_rev]=$(git_rev_parse_long base-artifacts HEAD) +rr[base-artifacts_rev]=$(git -C base-artifacts rev-parse HEAD) EOF ) } @@ -117,7 +117,7 @@ clone_repo () clone_or_update_repo $project $branch ${rr[${project}_url]} > /dev/null local cur_rev - cur_rev=$(git_rev_parse_long $project HEAD) + cur_rev=$(git -C $project rev-parse HEAD) cat <<EOF | manifest_out rr[${project}_rev]=$cur_rev |