From d1ab5ab0b5fe40f801fddb4bbacf9343fa8d4d5b Mon Sep 17 00:00:00 2001
From: "Kyle J. McKay" <mackyle@gmail.com>
Date: Mon, 27 Mar 2017 16:18:45 -0700
Subject: [PATCH] tg-create.sh: prevent existing "clean" .topfiles from
 aborting creation

Make sure that any pre-existing .topdeps and/or .topmsg files are blown
away (provided they are "clean" of course) before attempting to write
the new ones or add them to the index.

Also make sure that the new branch starts out with a "clean" slate.

This prevents unexpected errors from occurring and is primarily of a
preventative nature, but it doesn't hurt to be careful.

Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
---
 tg-create.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tg-create.sh b/tg-create.sh
index a385111..1a00833 100644
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -404,6 +404,11 @@ fi
 
 ## Set up the topic branch
 
+git update-index --index-info <<EOT || die "git update-index failed"
+0 $nullsha$tab.topdeps
+0 $nullsha$tab.topmsg
+EOT
+rm -rf "$root_dir/.topdeps" "$root_dir/.topmsg"
 init_reflog "refs/$topbases/$name"
 if [ -n "$unborn" ]; then
 	mttree="$(git mktree </dev/null)"
@@ -424,6 +429,7 @@ else
 		basecommit="HEAD"
 	fi
 	git update-ref -m "tgcreate: set $topbases/$name base" "refs/$topbases/$name" "$basecommit" ""
+	[ "$basecommit" = "HEAD" ] || git update-ref -m "tgcreate: set $topbases/$name base" "HEAD" "$basecommit"
 	git checkout $iowopt -b "$name"
 fi
 
-- 
2.11.4.GIT