Skip to content

Commit

Permalink
BUILD: Fix the gitstamp dirty flag not correctly updating
Browse files Browse the repository at this point in the history
Yeah, if we're calling "update-index" instead of "git update-index",
no wonder it's fickle...
  • Loading branch information
DrMcCoy committed Jul 23, 2015
1 parent 45ca866 commit 70f3ec4
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion gitstamp/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ LIBS =
.PHONY: gitstamp
gitstamp:
@-$(eval $@_REVLINE := $(shell git describe --long --match desc/\* | cut -d '/' -f 2- | sed -e 's/\(.*\)-\([^-]*\)-\([^-]*\)/\1+\2.\3/'))
@-$(eval $@_REVDIRT := $(shell update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo ".dirty"))
@-$(eval $@_REVDIRT := $(shell git update-index --refresh --unmerged 1>/dev/null 2>&1; git diff-index --quiet HEAD || echo ".dirty"))
@-$(eval $@_REVDESC := $(shell if test x$($@_REVLINE) != "x"; then echo $($@_REVLINE)$($@_REVDIRT); fi ))
@[ -f $@ ] || touch $@
$(AM_V_GEN)echo $($@_REVDESC) | cmp -s $@ - || echo $($@_REVDESC) > $@
Expand Down

0 comments on commit 70f3ec4

Please sign in to comment.