From 3a4d5750119c7fc9c775775c91cfe61cbf319743 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sat, 23 Oct 2010 14:46:35 -0400 Subject: [PATCH] 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. --- posts/Xmodmap/Makefile | 3 +-- posts/problempack/Makefile | 3 +-- posts/sawsim/Makefile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/posts/Xmodmap/Makefile b/posts/Xmodmap/Makefile index 77259ab..de35624 100644 --- 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 9f335f6..a70ebfa 100644 --- 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 37bbbad..7b62e6e 100644 --- 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) $@ -- 2.26.2