From: Uwe Kleine-König Date: Tue, 24 Aug 2010 18:56:06 +0000 (+0200) Subject: Fix pretty_tree to work in a subdirectory X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=d1c89c7b3c303883528e3a2ca45d9b4daf1f1e71 Fix pretty_tree to work in a subdirectory Without this change a freshly exported branch contains the .top* files when tg export was started from a subdirectory. Reported-by: Per Cederqvist Signed-off-by: Uwe Kleine-König --- diff --git a/tg-export.sh b/tg-export.sh index a16c290..6d82d55 100644 --- a/tg-export.sh +++ b/tg-export.sh @@ -67,10 +67,9 @@ trap 'rm -rf "$playground"' EXIT # Output tree ID of a cleaned-up tree without tg's artifacts. pretty_tree() { - (export GIT_INDEX_FILE="$playground/^index" - git read-tree "$1" - git update-index --force-remove ".topmsg" ".topdeps" - git write-tree) + git ls-tree --full-tree "$1" \ + | awk -F ' ' '$2 !~ /^.top/' \ + | git mktree } create_tg_commit()