From: Russ Allbery <rra@debian.org>
Date: Tue, 19 Jan 2010 22:57:22 +0000 (-0800)
Subject: Use the upstream-1.5 branch for experimental import-upstream
X-Git-Tag: debian/1.5.73.3-1~47
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6eb1aeab29e0a238619acb53ccbdeecfafa61616;p=packages%2Fo%2Fopenafs.git

Use the upstream-1.5 branch for experimental import-upstream
---

diff --git a/debian/import-upstream b/debian/import-upstream
index 995deb72c..62a361a65 100755
--- a/debian/import-upstream
+++ b/debian/import-upstream
@@ -37,10 +37,10 @@ tar xzf "$tarball"
 git add -f "$dir"
 tree=$(git write-tree --prefix="$dir"/)
 commit=$(echo "Imported upstream tag $upstream via tarball" | \
-    git commit-tree "$tree" -p upstream -p $(git rev-list -n1 "$upstream"))
+    git commit-tree "$tree" -p upstream-1.5 -p $(git rev-list -n1 "$upstream"))
 
 # Now that we have a commit, repoint upstream at that commit, tag it, and then
 # remove the unpacked upstream tarball from our index.
-git branch -f upstream "$commit"
+git branch -f upstream-1.5 "$commit"
 git tag "$tag" "$commit"
 git rm -q -r -f "$dir"