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 import: Fix up process_commit() progress reporting
[topgit.git]
/
tg-delete.sh
diff --git
a/tg-delete.sh
b/tg-delete.sh
index 287c4fa738366fac09d0ce126a8f5a55d28644dc..075d15c3ab76ea402cddce32fb72ff1b030ae8ff 100644
(file)
--- a/
tg-delete.sh
+++ b/
tg-delete.sh
@@
-15,7
+15,7
@@
while [ -n "$1" ]; do
-f)
force=1;;
-*)
-f)
force=1;;
-*)
- echo "Usage: tg delete [-f] NAME" >&2
+ echo "Usage: tg
[...]
delete [-f] NAME" >&2
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
exit 1;;
*)
[ -z "$name" ] || die "name already specified ($name)"
@@
-35,7
+35,7
@@
baserev="$(git rev-parse --verify "refs/top-bases/$name" 2>/dev/null)" ||
die "cannot delete your current branch"
nonempty=
die "cannot delete your current branch"
nonempty=
-
[ -z "$(git diff-tree "refs/top-bases/$name" "$name" | fgrep -v " .top")" ]
|| nonempty=1
+
branch_empty "$name"
|| nonempty=1
[ -z "$nonempty" ] || [ -n "$force" ] || die "branch is non-empty: $name"
[ -z "$nonempty" ] || [ -n "$force" ] || die "branch is non-empty: $name"