adding missing upstream/pristine-tar branches to git

[Hans-Christoph Steiner]

On May 24, 2011, at 6:47 AM, IOhannes m zmoelnig wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 2011-05-23 00:48, Hans-Christoph Steiner wrote:
>>
>> Hey IOhannes,
>>
>> Thanks for fixing the missing upstream/pristine-tar branches in the
>> pd-pdogg package, that was my mistake.  There are two other  
>> packages of
>> mine that are missing these branches.  Could you illuminate me as  
>> to how
>> you fixed this so I can do the same with the rest?
>
> actually no, as i cannot remember out of the box :-)
>
> however, looking at pd-pdogg, it seems like there already was a
> pristine-tar, and i simply updated that with a new upstream, using
> $ git-import-orig --pristine-tar --keyid=<MYKEYID> /path/to/ 
> upstream.tgz
>
> also i fail to see which packages you have that are missing a
> pristine-tar or upstream branch. at least all repos that match
> "git.debian.org:/git/pkg-multimedia/pd-*" have all relevant branches.

Ah, doh, I just hadn't checked out those branches, I just needed to  
check them out:

git checkout -b pristine-tar refs/remotes/origin/pristine-tar
git checkout -b upstream refs/remotes/origin/upstream

> and finally, i noticed that you managed to merge pristine-tar and  
> master
> in pd-pdogg (?)


The merge happened automatically after your 'pristine-tar data for pd- 
pdogg_0.25.1.orig.tar.bz" commit  
667bf3d23add9b4ace5c45f29d8941762eb2b9e3 after I did what I always do  
to update (git pull).  I don't know why it did that, but it doesn't  
seem to hurt anything.

.hc



----------------------------------------------------------------------------

Programs should be written for people to read, and only incidentally  
for machines to execute.
  - from Structure and Interpretation of Computer Programs