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:
58eccfa
)
tg-update.sh: Abort on missing dependencies
author
Petr Baudis
<pasky@suse.cz>
Sun, 3 Aug 2008 17:47:46 +0000
(19:47 +0200)
committer
Petr Baudis
<pasky@suse.cz>
Sun, 3 Aug 2008 17:47:46 +0000
(19:47 +0200)
tg-update.sh
patch
|
blob
|
history
diff --git
a/tg-update.sh
b/tg-update.sh
index ec14bf68049d1dcffcf8b68b3d5ec36226c847af..5bd9de55455a5b2b1397c35e9e9b9851ec544491 100644
(file)
--- a/
tg-update.sh
+++ b/
tg-update.sh
@@
-22,7
+22,9
@@
base_rev="$(git rev-parse --short --verify "refs/top-bases/$name" 2>/dev/null)"
## First, take care of our base
depcheck="$(mktemp)"
+missing_deps=
needs_update "$name" >"$depcheck"
+[ -z "$missing_deps" ] || die "some dependencies are missing: $missing_deps"
if [ -s "$depcheck" ]; then
# We need to switch to the base branch
# ...but only if we aren't there yet (from failed previous merge)