chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into refs/top-bases/debian/locations
[topgit.git]
/
tg-create.sh
diff --git
a/tg-create.sh
b/tg-create.sh
index 6e8490742282f86f4bebf1908b0e0504e6753e6e..2edd5379d54c9cc533a0904dafc51b6f566e728c 100644
(file)
--- 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"
rm -f "$git_dir/top-name" "$git_dir/top-deps" "$git_dir/top-merge"
-##
Creat
e base
+##
Find starting commit to create th
e 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#* }"
# Unshift the first item from the to-merge list
branch="${merge%% *}"
merge="${merge#* }"