X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=tg-create.sh;h=2edd5379d54c9cc533a0904dafc51b6f566e728c;hb=c917284a3e29f41949bf9ea46a49e590a608f7ba;hp=677c19ddf8c05876b1cb9927ffd6e8765cc054c3;hpb=c2a8552c1775ff8846ef749dc6ca001f40bb0f97;p=topgit.git

diff --git a/tg-create.sh b/tg-create.sh
index 677c19d..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#* }"
@@ -142,4 +142,4 @@ 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:sw=8:ts=8:noet
+# vim:noet