From: W. Trevor King <wking@drexel.edu>
Date: Sat, 23 Oct 2010 18:24:15 +0000 (-0400)
Subject: Ensure clean checkouts when building from git repositories.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=97ca207c9fe01661226530c3575aea48189f0676;p=blog.git

Ensure clean checkouts when building from git repositories.
---

diff --git a/posts/Xmodmap/Makefile b/posts/Xmodmap/Makefile
index ce0d210..77259ab 100644
--- a/posts/Xmodmap/Makefile
+++ b/posts/Xmodmap/Makefile
@@ -13,6 +13,7 @@ $(PACKAGE) :
 
 checkout : $(PACKAGE)
 	git --git-dir $(<:%=%/.git) --work-tree ../ pull
+	git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
 
 _Xmodmap : checkout
 	cp $(PACKAGE:%=%/$@) $@
diff --git a/posts/problempack/Makefile b/posts/problempack/Makefile
index 4cfa7d8..9f335f6 100644
--- a/posts/problempack/Makefile
+++ b/posts/problempack/Makefile
@@ -13,6 +13,7 @@ $(PACKAGE) :
 
 checkout : $(PACKAGE)
 	git --git-dir $(<:%=%/.git) --work-tree ../ pull
+	git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
 
 %.pdf : checkout
 	$(MAKE) -C $(PACKAGE:%=%/test) $@
diff --git a/posts/sawsim/Makefile b/posts/sawsim/Makefile
index b9842f7..37bbbad 100644
--- a/posts/sawsim/Makefile
+++ b/posts/sawsim/Makefile
@@ -13,6 +13,7 @@ $(PACKAGE) :
 
 checkout : $(PACKAGE)
 	git --git-dir $(<:%=%/.git) --work-tree ../ pull
+	git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
 
 README.rst : checkout
 	cp $(PACKAGE:%=%/README) $@