[Pkg-ocaml-maint-commits] [SCM] dh-ocaml packaging branch, master, updated. debian/0.9.5-5-g5b034ba

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 53aa0f58a7bc864a8bf80e80b435a46b31b9a70f
Author: Stephane Glondu <steph at glondu.net>
Date:   Tue Aug 3 20:18:39 2010 -0400

    Check for existence of upstream/pristine-tar (Closes: #591555)

diff --git a/debian/changelog b/debian/changelog
index 84b67f0..b003e2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ dh-ocaml (0.9.6) UNRELEASED; urgency=low
 
   * Explicitly use sh when executing remote commands via ssh
     (Closes: #588371)
+  * Check for existence of upstream/pristine-tar remote branches
+    before creating local ones (Closes: #591555)
 
- -- Stéphane Glondu <glondu at debian.org>  Thu, 08 Jul 2010 21:40:07 +0100
+ -- Stéphane Glondu <glondu at debian.org>  Tue, 03 Aug 2010 20:17:35 -0400
 
 dh-ocaml (0.9.5) unstable; urgency=low
 
diff --git a/tools/dom-git-checkout b/tools/dom-git-checkout
index 4a1696d..bbd6464 100755
--- a/tools/dom-git-checkout
+++ b/tools/dom-git-checkout
@@ -24,7 +24,9 @@ git clone "$PROTOCOL://git.debian.org/$REPODIR"
 echo "I: setting up remote tracking"
 (cd $PACKAGE
  for branch in $REMOTE_BRANCHES ; do
-   git branch --track $branch remotes/origin/$branch
+   if git show-ref -q remotes/origin/$branch; then
+     git branch --track $branch remotes/origin/$branch
+   fi
  done)
 
 echo "I: all done, enjoy."

-- 
dh-ocaml packaging