chiark
/
gitweb
/
~ian
/
topgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tg info: Show information about remote branches
[topgit.git]
/
tg-create.sh
diff --git
a/tg-create.sh
b/tg-create.sh
index 939af33b14e3d9941788e3d4426734e618e521bc..dd95e6596876d38e1357435267c46f67783ebbe0 100644
(file)
--- a/
tg-create.sh
+++ b/
tg-create.sh
@@
-51,10
+51,10
@@
fi
[ -n "$merge" -o -n "$restarted" ] || merge="$deps "
for d in $deps; do
[ -n "$merge" -o -n "$restarted" ] || merge="$deps "
for d in $deps; do
-
git rev-parse --verify "$d" >/dev/null 2>&1
||
+
ref_exists "$d"
||
die "unknown branch dependency '$d'"
done
die "unknown branch dependency '$d'"
done
-!
git rev-parse --verify "$name" >/dev/null 2>&1
||
+!
ref_exists "$name"
||
die "branch '$name' already exists"
# Clean up any stale stuff
die "branch '$name' already exists"
# Clean up any stale stuff
@@
-100,7
+100,7
@@
git update-ref "refs/top-bases/$name" "HEAD" ""
git checkout -b "$name"
echo "$deps" | sed 's/ /\n/g' >"$root_dir/.topdeps"
git checkout -b "$name"
echo "$deps" | sed 's/ /\n/g' >"$root_dir/.topdeps"
-git add "$root_dir/.topdeps"
+git add
-f
"$root_dir/.topdeps"
author="$(git var GIT_AUTHOR_IDENT)"
author_addr="${author%> *}>"
author="$(git var GIT_AUTHOR_IDENT)"
author_addr="${author%> *}>"
@@
-118,7
+118,7
@@
author_addr="${author%> *}>"
Signed-off-by: $author_addr
EOT
} >"$root_dir/.topmsg"
Signed-off-by: $author_addr
EOT
} >"$root_dir/.topmsg"
-git add "$root_dir/.topmsg"
+git add
-f
"$root_dir/.topmsg"