diff options
| author | Rob Austein <sra@hactrn.net> | 2016-12-14 17:21:51 -0500 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2016-12-14 17:21:51 -0500 |
| commit | 05b269a88a47d3f9cb3d22d1d638cdff8f012da5 (patch) | |
| tree | b7b44adaf5dc098761512be2c638358aa033ee6a /Makefile | |
| parent | 5318fa839106c61b18af0038b147b977e29f59f3 (diff) | |
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.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 |