Colin Watson has proposed merging ~cjwatson/launchpad:simplify-git-branch-handling into launchpad:master.
Commit message: Revert "Restore compatibility with xenial's git" Requested reviews: Launchpad code reviewers (launchpad-reviewers) For more details, see: https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/456132 This reverts commit 2e6a49ed728bd461999fdc5bba7ef63a86e83882, since we now require focal so we might as well. -- Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:simplify-git-branch-handling into launchpad:master.
diff --git a/Makefile b/Makefile index 7bb06c0..a310604 100644 --- a/Makefile +++ b/Makefile @@ -88,10 +88,7 @@ PIP_BIN = \ # Create archives in labelled directories (e.g. # <rev-id>/$(PROJECT_NAME).tar.gz) -# XXX cjwatson 2023-04-11: Should be "git branch --show-current", but -# xenial's git doesn't support that. Use the more concise form once we -# require focal. -GIT_BRANCH := $(shell if [ -d .git ]; then git rev-parse --abbrev-ref HEAD; fi) +GIT_BRANCH := $(shell if [ -d .git ]; then git branch --show-current; fi) TARBALL_REVISION ?= $(shell if [ -d .git ]; then git rev-parse HEAD; fi) ifeq ($(GIT_BRANCH),db-devel) TARBALL_SUFFIX := db
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
