|
Added
Link Here
|
| 1 |
diff --git tg-base.sh tg-base.sh |
| 2 |
index c42157f..5ef4084 100644 |
| 3 |
--- tg-base.sh |
| 4 |
+++ tg-base.sh |
| 5 |
@@ -20,7 +20,7 @@ fi |
| 6 |
|
| 7 |
rv=0 |
| 8 |
for rev in "$@"; do |
| 9 |
- name="$( { git symbolic-ref -q "$rev" || echo "$rev"; } | sed 's#^refs/\(heads\|top-bases\)/##')" |
| 10 |
+ name="$( { git symbolic-ref -q "$rev" || echo "$rev"; } | sed -r 's#^refs/(heads|top-bases)/##')" |
| 11 |
git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null || { |
| 12 |
rv=1 |
| 13 |
echo $rev is not a TopGit branch >&2 |
| 14 |
diff --git tg-depend.sh tg-depend.sh |
| 15 |
index cf78946..64073df 100644 |
| 16 |
--- tg-depend.sh |
| 17 |
+++ tg-depend.sh |
| 18 |
@@ -43,7 +43,7 @@ branchrev="$(git rev-parse --verify "$name" 2>/dev/null)" || |
| 19 |
die "invalid branch name: $name" |
| 20 |
|
| 21 |
# Check that we are on a TopGit branch. |
| 22 |
-current_name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')" |
| 23 |
+current_name="$(git symbolic-ref HEAD | sed -r 's#^refs/(heads|top-bases)/##')" |
| 24 |
current_base_rev="$(git rev-parse --short --verify "refs/top-bases/$current_name" 2>/dev/null)" || |
| 25 |
die "not a TopGit-controlled branch" |
| 26 |
|
| 27 |
diff --git tg-info.sh tg-info.sh |
| 28 |
index 0ff82d1..98140ba 100644 |
| 29 |
--- tg-info.sh |
| 30 |
+++ tg-info.sh |
| 31 |
@@ -20,7 +20,7 @@ while [ -n "$1" ]; do |
| 32 |
esac |
| 33 |
done |
| 34 |
|
| 35 |
-[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')" |
| 36 |
+[ -n "$name" ] || name="$(git symbolic-ref HEAD | sed -r 's#^refs/(heads|top-bases)/##')" |
| 37 |
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)" || |
| 38 |
die "not a TopGit-controlled branch" |
| 39 |
|
| 40 |
diff --git tg-summary.sh tg-summary.sh |
| 41 |
index 3b4331c..affdf14 100644 |
| 42 |
--- tg-summary.sh |
| 43 |
+++ tg-summary.sh |
| 44 |
@@ -31,7 +31,7 @@ while [ -n "$1" ]; do |
| 45 |
esac |
| 46 |
done |
| 47 |
|
| 48 |
-curname="$(git symbolic-ref HEAD | sed 's#^refs/\(heads\|top-bases\)/##')" |
| 49 |
+curname="$(git symbolic-ref HEAD | sed -r 's#^refs/(heads|top-bases)/##')" |
| 50 |
|
| 51 |
[ "$terse$graphviz$sort$deps" = "" ] || |
| 52 |
[ "$terse$graphviz$sort$deps" = "1" ] || |
| 53 |
diff --git tg-update.sh tg-update.sh |
| 54 |
index ce64789..1a73b1d 100644 |
| 55 |
--- tg-update.sh |
| 56 |
+++ tg-update.sh |
| 57 |
@@ -31,7 +31,7 @@ while [ -n "$1" ]; do |
| 58 |
done |
| 59 |
[ -z "$pattern" ] && pattern=refs/top-bases |
| 60 |
|
| 61 |
-current="$(git symbolic-ref HEAD 2>/dev/null | sed 's#^refs/\(heads\|top-bases\)/##')" |
| 62 |
+current="$(git symbolic-ref HEAD 2>/dev/null | sed -r 's#^refs/(heads|top-bases)/##')" |
| 63 |
if [ -z "$all" ]; then |
| 64 |
if [ -z "$name" ]; then |
| 65 |
name="$current" |
| 66 |
@@ -76,8 +76,8 @@ update_branch() { |
| 67 |
|
| 68 |
cat "$depcheck" | |
| 69 |
sed 's/ [^ ]* *$//' | # last is $name |
| 70 |
- sed 's/.* \([^ ]*\)$/+\1/' | # only immediate dependencies |
| 71 |
- sed 's/^\([^+]\)/-\1/' | # now each line is +branch or -branch (+ == recurse) |
| 72 |
+ sed -r 's/.* ([^ ]*)$/+\1/' | # only immediate dependencies |
| 73 |
+ sed -r 's/^([^+])/-\1/' | # now each line is +branch or -branch (+ == recurse) |
| 74 |
uniq -s 1 | # fold branch lines; + always comes before - and thus wins within uniq |
| 75 |
while read depline; do |
| 76 |
action="$(echo "$depline" | cut -c 1)" |