From 7fd155b38dee9ab4abaf92edb6ecb2681aebaa4a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@docker.com>
Date: Wed, 28 Jun 2017 14:29:01 +0100
Subject: [PATCH] pkg: Do not mark user supplied HASH as dirty

If a user passes a HASH e.g. HASH=dev then assume they know what they are doing
and don't need dirty tracking.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
---
 pkg/package.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkg/package.mk b/pkg/package.mk
index 5ca8c14c1..f1592b563 100644
--- a/pkg/package.mk
+++ b/pkg/package.mk
@@ -2,15 +2,19 @@
 default: push
 
 ORG?=linuxkit
+ifeq ($(HASH),)
 HASH_COMMIT?=HEAD # Setting this is only really useful with the show-tag target
 HASH?=$(shell git ls-tree --full-tree $(HASH_COMMIT) -- $(CURDIR) | awk '{print $$3}')
-BASE_DEPS=Dockerfile Makefile
 
 ifneq ($(HASH_COMMIT),HEAD) # Others can't be dirty by definition
 DIRTY=$(shell git diff-index --quiet HEAD -- $(CURDIR) || echo "-dirty")
 endif
+endif
+
 TAG=$(ORG)/$(IMAGE):$(HASH)$(DIRTY)
 
+BASE_DEPS=Dockerfile Makefile
+
 # Get a release tag, if present
 RELEASE=$(shell git tag -l --points-at HEAD)