From 6eb1aeab29e0a238619acb53ccbdeecfafa61616 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Tue, 19 Jan 2010 14:57:22 -0800 Subject: [PATCH] Use the upstream-1.5 branch for experimental import-upstream --- debian/import-upstream | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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" -- 2.39.5