Second attempt at a clean checkout fix.

Previous clean checkout fix was polluting posts/ with working
directory cruft (possible bug with --work-tree?).  The new
implementation seems to work.

diff --git a/posts/Xmodmap/Makefile b/posts/Xmodmap/Makefile
index 77259ab64e819c0bcc7801bf1a153e4ab9b94616..de35624e6672ec6fe1b68596c5b790df72f9d0b7 100644 (file)
--- a/posts/Xmodmap/Makefile
+++ b/posts/Xmodmap/Makefile
@@ -12,8 +12,7 @@ $(PACKAGE) :
        git clone $(REPO) $@
 
 checkout : $(PACKAGE)
-       git --git-dir $(<:%=%/.git) --work-tree ../ pull
-       git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
+       (cd $(PACKAGE) && git pull && git reset --hard HEAD)
 
 _Xmodmap : checkout
        cp $(PACKAGE:%=%/$@) $@

diff --git a/posts/problempack/Makefile b/posts/problempack/Makefile
index 9f335f64ec7ab0a42d4a199a7090e9b10c2e36e0..a70ebfaf627bae5ebf7f3bb65447291bebd79dd0 100644 (file)
--- a/posts/problempack/Makefile
+++ b/posts/problempack/Makefile
@@ -12,8 +12,7 @@ $(PACKAGE) :
        git clone $(REPO) $@
 
 checkout : $(PACKAGE)
-       git --git-dir $(<:%=%/.git) --work-tree ../ pull
-       git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
+       (cd $(PACKAGE) && git pull && git reset --hard HEAD)
 
 %.pdf : checkout
        $(MAKE) -C $(PACKAGE:%=%/test) $@

diff --git a/posts/sawsim/Makefile b/posts/sawsim/Makefile
index 37bbbad8eafd9a1e08c63f457a50f46b1d1edf4a..7b62e6ee9964b312b7b2c83aca11a620153ab52b 100644 (file)
--- a/posts/sawsim/Makefile
+++ b/posts/sawsim/Makefile
@@ -12,8 +12,7 @@ $(PACKAGE) :
        git clone $(REPO) $@
 
 checkout : $(PACKAGE)
-       git --git-dir $(<:%=%/.git) --work-tree ../ pull
-       git --git-dir $(<:%=%/.git) --work-tree ../ reset --hard HEAD
+       (cd $(PACKAGE) && git pull && git reset --hard HEAD)
 
 README.rst : checkout
        cp $(PACKAGE:%=%/README) $@