From: Jānis Rūcis <parasti@gmail.com>
Date: Mon, 16 Aug 2010 14:33:53 +0000 (+0300)
Subject: import-pk3: force reading of .gitignore from index
X-Git-Tag: xonotic-v0.1.0preview~292^2~2
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=59e9149f753eb195ecc71d97e45104b702ffd65a

import-pk3: force reading of .gitignore from index
---

diff --git a/misc/tools/git-import-pk3 b/misc/tools/git-import-pk3
index f9680ac7..b6d04826 100755
--- a/misc/tools/git-import-pk3
+++ b/misc/tools/git-import-pk3
@@ -109,9 +109,15 @@ die "couldn't initialize index"
 [ -z "$(git diff-files --diff-filter=M)" ] ||
 die "found changes to files in master"
 
+# Force reading of .gitignore files from cache, not the work tree
+git ls-files --cached -z |
+grep -z '\.gitignore$' |
+git update-index --skip-worktree -z --stdin ||
+die "couldn't set up exclude patterns from index"
+
 # Add untracked files; to filter out generated files such as BSP, add
-# them to .gitignore and push, --exclude-standard should take care of
-# the rest
+# them to .gitignore and push, --exclude-standard (and the above hack)
+# takes care of the rest
 git ls-files --exclude-standard -o -z |
 git update-index --add -z --stdin ||
 die "couldn't add files to index"