'make prep' breaks on private branches.

[Steve Dickson]

Here is what I'm doing:

fedpkg clone kernel
fedpkg switch-branch f14
git checkout -b pnfs-all-2.6.35-2010-08-05
make prep
fedpkg -v prep --arch=noarch
Creating module object from /Build/steved/fc/git/kernel
Traceback (most recent call last):
  File "/usr/bin/fedpkg", line 1062, in <module>
    args.command(args)
  File "/usr/bin/fedpkg", line 577, in prep
    mymodule = pyfedpkg.PackageModule(args.path)
  File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 841, in
__init__
    self.branch = self._findbranch()
  File "/usr/lib/python2.6/site-packages/pyfedpkg/__init__.py", line 787, in
_findbranch
    merge = self.repo.git.config('--get', 'branch.%s.merge' %
localbranch)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 127, in
<lambda>
    return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 342, in
_call_process
    return self.execute(call, **_kwargs)
  File "/usr/lib/python2.6/site-packages/git/cmd.py", line 249, in execute
    raise GitCommandError(command, status, stderr_value)
git.errors.GitCommandError: 'git config --get
branch.pnfs-all-2.6.35-2010-08-05.merge' returned exit status 1: 
make: *** [prep] Error 1

I get the same error with 'fedpkg build'

any ideas?

tia...

steved.

[Roland McGrath]

>  Here is what I'm doing:
>  
>  fedpkg clone kernel
>  fedpkg switch-branch f14
>  git checkout -b pnfs-all-2.6.35-2010-08-05 
Make that 'git checkout --track -b pnfs-blah-blah origin/f14/master'.
Or, equivalently, after the fact, do:
	git config branch.pnfs-blah-blah.remote origin
	git config branch.pnfs-blah-blah.merge refs/heads/f14/master

>  git.errors.GitCommandError: 'git config --get
> branch.pnfs-all-2.6.35-2010-08-05.merge' returned exit status 1:  
fedpkg is using this to figure out which dist to build for.
Having it set up also means that 'git pull' et al will automagically
know to merge the f14/master branch into your branch.


Thanks,
Roland

[Steve Dickson]

On 08/19/2010 01:57 PM, Roland McGrath wrote:
> > Here is what I'm doing:
> >
> > fedpkg clone kernel
> > fedpkg switch-branch f14
> > git checkout -b pnfs-all-2.6.35-2010-08-05
>  
>  Make that 'git checkout --track -b pnfs-blah-blah origin/f14/master'.
>  Or, equivalently, after the fact, do:
>  	git config branch.pnfs-blah-blah.remote origin
>  	git config branch.pnfs-blah-blah.merge refs/heads/f14/master
>  
> > git.errors.GitCommandError: 'git config --get
> branch.pnfs-all-2.6.35-2010-08-05.merge' returned exit status 1: 
>  
>  fedpkg is using this to figure out which dist to build for.
>  Having it set up also means that 'git pull' et al will automagically
>  know to merge the f14/master branch into your branch. 
Ok thanks... 

steved.

>  
>  
>  Thanks,
>  Roland

[Todd Zullinger]

Roland McGrath wrote:
> > Here is what I'm doing:
> >
> > fedpkg clone kernel
> > fedpkg switch-branch f14
> > git checkout -b pnfs-all-2.6.35-2010-08-05
>
>  Make that 'git checkout --track -b pnfs-blah-blah origin/f14/master'.
>  Or, equivalently, after the fact, do:
>  	git config branch.pnfs-blah-blah.remote origin
>  	git config branch.pnfs-blah-blah.merge refs/heads/f14/master 
FWIW, since git-1.7.0, you can do this directly with git branch:

git branch --set-upstream pnfs-all-2.6.35-2010-08-05 origin/f14/master

So if you've left off the --track (-t) option to checkout, you don't
have to bother setting the config entries manually.

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
He may look like an idiot and talk like an idiot but don't let that
fool you. He really is an idiot.
    -- Groucho Marx

[M A Young]

On Thu, 19 Aug 2010, Roland McGrath wrote:

> > Here is what I'm doing:
> >
> > fedpkg clone kernel
> > fedpkg switch-branch f14
> > git checkout -b pnfs-all-2.6.35-2010-08-05
>
>  Make that 'git checkout --track -b pnfs-blah-blah origin/f14/master'.
>  Or, equivalently, after the fact, do:
>  	git config branch.pnfs-blah-blah.remote origin
>  	git config branch.pnfs-blah-blah.merge refs/heads/f14/master 
but don't do a git push without specifying which branch you want to write 
to, because in this case the default will be the main f14/master branch on 
the server.

 	Michael Young