Launchpad itself

Merge ~cjwatson/launchpad:simplify-git-branch-handling into launchpad:master

  1. Git
  2. lp:~cjwatson/launchpad
  3. simplify-git-branch-handling
  4. Merge into master
Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: d8f321a0c3d58f7ad6ba59e5eda184f911aa9b5d
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:simplify-git-branch-handling
Merge into: launchpad:master
Diff against target: 16 lines (+1/-4)
1 file modified
Makefile (+1/-4)
Reviewer Review Type Date Requested Status
Ines Almeida Approve
Review via email: mp+456132@code.launchpad.net

Commit message

Revert "Restore compatibility with xenial's git"

Description of the change

This reverts commit 2e6a49ed728bd461999fdc5bba7ef63a86e83882, since we now require focal so we might as well.

To post a comment you must log in.
Revision history for this message
Ines Almeida (ines-almeida) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/Makefile b/Makefile
2index 7bb06c0..a310604 100644
3--- a/Makefile
4+++ b/Makefile
5@@ -88,10 +88,7 @@ PIP_BIN = \
6
7 # Create archives in labelled directories (e.g.
8 # <rev-id>/$(PROJECT_NAME).tar.gz)
9-# XXX cjwatson 2023-04-11: Should be "git branch --show-current", but
10-# xenial's git doesn't support that. Use the more concise form once we
11-# require focal.
12-GIT_BRANCH := $(shell if [ -d .git ]; then git rev-parse --abbrev-ref HEAD; fi)
13+GIT_BRANCH := $(shell if [ -d .git ]; then git branch --show-current; fi)
14 TARBALL_REVISION ?= $(shell if [ -d .git ]; then git rev-parse HEAD; fi)
15 ifeq ($(GIT_BRANCH),db-devel)
16 TARBALL_SUFFIX := db

Subscribers

People subscribed via source and target branches

to status/vote changes: