Revert "support/download/git: rename local refs to avoid confusing Git warning"
This reverts commit 6f35d96756
.
Repeat after me: on the master branch you will not work. On the master
branch you will not work.
This definitely shouldn't have been pushed. Sorry about that.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
95ed1429e6
commit
fbee5c8e91
@ -122,14 +122,14 @@ _git fetch origin -t
|
|||||||
# below, if there is an issue anyway. Since most of the cset we're gonna
|
# below, if there is an issue anyway. Since most of the cset we're gonna
|
||||||
# have to clone are not such special refs, consign the output to oblivion
|
# have to clone are not such special refs, consign the output to oblivion
|
||||||
# so as not to alarm unsuspecting users, but still trace it as a warning.
|
# so as not to alarm unsuspecting users, but still trace it as a warning.
|
||||||
if ! _git fetch origin "'${cset}:buildroot-${cset}'" >/dev/null 2>&1; then
|
if ! _git fetch origin "'${cset}:${cset}'" >/dev/null 2>&1; then
|
||||||
printf "Could not fetch special ref '%s'; assuming it is not special.\n" "${cset}"
|
printf "Could not fetch special ref '%s'; assuming it is not special.\n" "${cset}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check that the changeset does exist. If it does not, re-cloning from
|
# Check that the changeset does exist. If it does not, re-cloning from
|
||||||
# scratch won't help, so we don't want to trash the repository for a
|
# scratch won't help, so we don't want to trash the repository for a
|
||||||
# missing commit. We just exit without going through the ERR trap.
|
# missing commit. We just exit without going through the ERR trap.
|
||||||
if ! _git rev-parse --quiet --verify "'buildroot-${cset}^{commit}'" >/dev/null 2>&1; then
|
if ! _git rev-parse --quiet --verify "'${cset}^{commit}'" >/dev/null 2>&1; then
|
||||||
printf "Commit '%s' does not exist in this repository.\n" "${cset}"
|
printf "Commit '%s' does not exist in this repository.\n" "${cset}"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@ -162,7 +162,7 @@ _git submodule --quiet foreach "'${cmd}'"
|
|||||||
|
|
||||||
# Checkout the required changeset, so that we can update the required
|
# Checkout the required changeset, so that we can update the required
|
||||||
# submodules.
|
# submodules.
|
||||||
_git checkout -f -q "'buildroot-${cset}'"
|
_git checkout -f -q "'${cset}'"
|
||||||
|
|
||||||
# Get rid of now-untracked directories (in case a git operation was
|
# Get rid of now-untracked directories (in case a git operation was
|
||||||
# interrupted in a previous run, or to get rid of empty directories
|
# interrupted in a previous run, or to get rid of empty directories
|
||||||
|
Loading…
Reference in New Issue
Block a user