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:
d55f021
)
tg summary: Fix spurious errors on tg-inconsistent remotes
author
Petr Baudis
<pasky@suse.cz>
Tue, 9 Sep 2008 20:18:23 +0000
(22:18 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Tue, 9 Sep 2008 20:18:23 +0000
(22:18 +0200)
tg-summary.sh
patch
|
blob
|
history
diff --git
a/tg-summary.sh
b/tg-summary.sh
index bb71971aad2055c2d7d8388e59b4091dd9650256..4ffebcefda524f434860306779cd541d21477af5 100644
(file)
--- a/
tg-summary.sh
+++ b/
tg-summary.sh
@@
-29,11
+29,11
@@
git for-each-ref refs/top-bases |
[ -z "$base_remote" ] || remote='l'
! has_remote "$name" || remote='r'
rem_update=' '
[ -z "$base_remote" ] || remote='l'
! has_remote "$name" || remote='r'
rem_update=' '
- [ "$remote" != 'r' ] || {
+ [ "$remote" != 'r' ] ||
! ref_exists "refs/remotes/$base_remote/top-bases/$name" ||
{
branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
branch_contains "$name" "refs/remotes/$base_remote/$name"
} || rem_update='R'
branch_contains "refs/top-bases/$name" "refs/remotes/$base_remote/top-bases/$name" &&
branch_contains "$name" "refs/remotes/$base_remote/$name"
} || rem_update='R'
- [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name" ||
+ [ "$rem_update" = 'R' ] || branch_contains "refs/remotes/$base_remote/$name" "$name"
2>/dev/null
||
rem_update='L'
deps_update=' '
needs_update "$name" >/dev/null || deps_update='D'
rem_update='L'
deps_update=' '
needs_update "$name" >/dev/null || deps_update='D'