X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=blobdiff_plain;f=tg-create.sh;h=2edd5379d54c9cc533a0904dafc51b6f566e728c;hp=6ee3f027d23e797ac80e07c1024b22aaedc461f5;hb=0c676b4580dfdc67563529a03fa830f98d57c4a7;hpb=ce7d8a0e041070b5773325da256113a10e344eb1

diff --git a/tg-create.sh b/tg-create.sh
index 6ee3f02..2edd537 100644
--- a/tg-create.sh
+++ b/tg-create.sh
@@ -78,9 +78,9 @@ done
 rm -f "$git_dir/top-name" "$git_dir/top-deps" "$git_dir/top-merge"
 
 
-## Create base
+## Find starting commit to create the base
 
-if [ -n "$merge" ]; then
+if [ -n "$merge" -a -z "$restarted" ]; then
 	# Unshift the first item from the to-merge list
 	branch="${merge%% *}"
 	merge="${merge#* }"
@@ -141,3 +141,5 @@ git add -f "$root_dir/.topmsg"
 
 info "Topic branch $name set up. Please fill .topmsg now and make initial commit."
 info "To abort: git rm -f .top* && git checkout ${deps%% *} && $tg delete $name"
+
+# vim:noet