From 16db6f132f3896fad4782c750230adf4ad1e8b86 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Sun, 30 Dec 2012 12:12:24 +0000
Subject: [PATCH] support: ensure git tree properly cleaned.

---
 support/launchpad-ppa | 5 ++++-
 support/tarball       | 6 +++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/support/launchpad-ppa b/support/launchpad-ppa
index c3f5936e..ff367d04 100755
--- a/support/launchpad-ppa
+++ b/support/launchpad-ppa
@@ -26,11 +26,14 @@ TVH_ROOT=$(cd $(dirname $0)/..; pwd)
 
 # Setup
 cd $TVH_ROOT || exit 1
-git checkout $1 && git checkout . || exit 1
 NOW=`date -R`
 CHANGELOG=$TVH_ROOT/debian/changelog
 VERFILE=$TVH_ROOT/src/version.c
 
+# Checkout
+git checkout $REL || die "could not checkout $REL"
+git clean -dfx || die "could not clean git tree"
+
 # Create version file
 VER=$($TVH_ROOT/support/version $VERFILE)
 
diff --git a/support/tarball b/support/tarball
index ca65b664..2d5b809e 100755
--- a/support/tarball
+++ b/support/tarball
@@ -16,12 +16,12 @@ cd $SRCDIR
 
 # Arguments
 REL=$1
+
+# Checkout
 if [ ! -z "$REL" ]; then
   git checkout $REL || die "could not checkout $REL"
 fi
-
-# Clean
-git checkout . || die "could not clean git tree"
+git clean -dfx || die "could not clean git tree"
 
 # Version
 VER=$(./support/version)