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 commit 'refs/top-bases/debian/locations' into debian/locations
[topgit.git]
/
tg-info.sh
diff --git
a/tg-info.sh
b/tg-info.sh
index 17eca60853d6553af370202a6d9095336e1a7580..90762479eb44f3b0ef2f366fc4a7865e05087c76 100644
(file)
--- a/
tg-info.sh
+++ b/
tg-info.sh
@@
-20,7
+20,7
@@
while [ -n "$1" ]; do
esac
done
esac
done
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/
heads
/##')"
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/
\(heads\|top-bases\)
/##')"
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
die "not a TopGit-controlled branch"
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" ||
die "not a TopGit-controlled branch"