From 05b269a88a47d3f9cb3d22d1d638cdff8f012da5 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Wed, 14 Dec 2016 17:21:51 -0500 Subject: Minor tweaks to branch-based package conflict hacks. Get conflict indentation right in generated Homebrew formula. Consider remote branches as well as local ones when constructing conflict list, so that we don't omit a conflicting package just because we've never checked it out in this build tree. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3d4fde2..d3318e9 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ PACKAGE_BASE_VERSION := 2.0 GIT_VERSION := $(shell git show -s --format=%ct HEAD) GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) -GIT_BRANCHES := $(notdir $(shell git for-each-ref --format '%(refname)' refs/heads/)) +GIT_BRANCHES := $(filter-out HEAD,$(sort $(notdir $(shell git for-each-ref --format '%(refname)' refs/heads/ refs/remotes/)))) # Make voodoo: construct the package name, version number, and list of # other package names (constructed on other branches) with which this -- cgit v1.2.3