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=6e8490742282f86f4bebf1908b0e0504e6753e6e;hb=5de3bb2aa0e2bd96ae2c981ba356b07f1bad6301;hpb=c4c57a55aa1b825109f0ce0547994ad394812902 diff --git a/tg-create.sh b/tg-create.sh index 6e84907..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#* }"