Use tags if available, otherwise use branch

Author: bluecmd

Makefile

@@ -1,5 +1,7 @@
 
 TAG=$(shell git name-rev --tags --name-only $(shell git rev-parse HEAD))
+BRANCH=$(shell git rev-parse --abbrev-ref HEAD)
+TREE=$(shell test $(TAG) = undefined && echo $(BRANCH) || echo $(TAG))
 
 distclean:
 
@@ -15,10 +17,11 @@ test:
 	coverage report -m
 
 deb:
-	git checkout $(TAG)
+	echo Using $(TREE)
+	git checkout $(TREE)
 	cp debian/changelog debian/changelog.old
 	gbp dch --snapshot --auto --ignore-branch
 	rm -f ../dhmon_*.orig.tar.gz
-	gbp buildpackage --git-upstream-tree=$(TAG) --git-submodules \
+	gbp buildpackage --git-upstream-tree=$(TREE) --git-submodules \
 		--git-ignore-new --git-ignore-branch --git-builder='debuild -i -I -us -uc'
 	mv debian/changelog.old debian/changelog