Skip to content

Rename ref attribute to branch #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knl merged 1 commit into from
Aug 28, 2020
Merged

Rename ref attribute to branch #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions niv-updater
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ createPullRequestsOnUpdate() {
# rewrite the entry so that we can use token instead of SSH
if [[ -n $github_ssh ]]; then
echo 'As this is a dependency fetched with SSH, trying to switch to https type'
niv_branch="$(jq -r ".\"$dep\".ref // empty" <"$wdir/$SOURCES_JSON")"
niv_branch="$(jq -r ".\"$dep\".branch // empty" <"$wdir/$SOURCES_JSON")"
niv drop "$dep"
niv add "$dep_owner/$dep_repo" -a rev="$revision" -a branch="$niv_branch"
rm "$SOURCES_JSON.orig"
Expand Down Expand Up @@ -310,7 +310,7 @@ createPullRequestsOnUpdate() {
echo "Dependency '$dep' is hosted on github.com"

{
niv_branch="$(jq -r ".\"$dep\".ref // empty" <"$wdir/$SOURCES_JSON")"
niv_branch="$(jq -r ".\"$dep\".branch // empty" <"$wdir/$SOURCES_JSON")"
printf '## Changelog for %s:\n' "$dep"
printf 'Branch: %s\n' "$niv_branch"
printf 'Commits: [%s/%s@%.8s...%.8s](https://github.com/%s/%s/compare/%s...%s)\n\n' "$dep_owner" "$dep_repo" "$revision" "$new_revision" "$dep_owner" "$dep_repo" "$revision" "$new_revision"
Expand Down