chiark
/
gitweb
/
~ian
/
topgit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8a6b65b
)
tg info, tg patch: Work on top-base HEAD too
author
Petr Baudis
<pasky@suse.cz>
Mon, 22 Sep 2008 15:24:25 +0000
(17:24 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Mon, 22 Sep 2008 15:24:25 +0000
(17:24 +0200)
tg-info.sh
patch
|
blob
|
history
tg-patch.sh
patch
|
blob
|
history
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"
diff --git
a/tg-patch.sh
b/tg-patch.sh
index 7a2471827d1e27db9a520f51541cecc4dd69c12a..97338ab63ef77f52eb876c77ca50b669c458f333 100644
(file)
--- a/
tg-patch.sh
+++ b/
tg-patch.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"