stuck on git (again)

[Neal Becker]

$ fedpkg push
Everything up-to-date
$ fedpkg build
Could not initiate build: There are unpushed changes in your repo

Clue?

[Stephen Gallagher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/25/2010 09:39 AM, Neal Becker wrote:
>  $ fedpkg push
>  Everything up-to-date
>  $ fedpkg build
>  Could not initiate build: There are unpushed changes in your repo
>  
>  Clue?
>   
Sounds like you have modified files in your checkout that aren't
committed and pushed to the master.

- -- 
Stephen Gallagher
RHCE 804006346421761

Delivering value year after year.
Red Hat ranks #1 in value among software vendors.
http://www.redhat.com/promo/vendor/
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.10 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
>
> iEYEARECAAYFAkx1HoIACgkQeiVVYja6o6NdxACdGYQoTJhh5iTPrSo2C3eloQID
> IiAAoIzfQF7NMyzNKMCFbf26T0uVX/d8
> =dtSe
> -----END PGP SIGNATURE-----

[Neal Becker]

Neal Becker wrote:

>  $ fedpkg push
>  Everything up-to-date
>  $ fedpkg build
>  Could not initiate build: There are unpushed changes in your repo
>  
>  Clue?
>   
Here's what I tried to do.
After clone, then build for F15 OK.

 git merge -m "Initial pseudo merge for dist-git setup" -s ours 
origin/{f12,f13}/master

OK, now try f13 branch:

 fedpkg switch-branch f13

I see my f13 files are not updated, so I do:

 git merge master
Updating 095f524..d2d9bec
Fast-forward
 .gitignore  |    1 +
 Cython.spec |   11 ++++++++---
 sources     |    2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

Now seems to be updated.

 git push
Counting objects: 1, done.
Writing objects: 100% (1/1), 259 bytes, done.
Total 1 (delta 0), reused 0 (delta 0)
To ssh://[e-mail]/Cython
   793e85d..d2d9bec  master -> master

Then:

fedpkg build
Could not initiate build: There are unpushed changes in your repo

fedpkg push
Everything up-to-date

[Till Maas]

On Wed, Aug 25, 2010 at 09:39:09AM -0400, Neal Becker wrote:
>  $ fedpkg push
>  Everything up-to-date
>  $ fedpkg build
>  Could not initiate build: There are unpushed changes in your repo
>  
>  Clue? 
You might need to do this to get the push working:
git config  --add push.default tracking

Regards
Till

[Andreas Schwab]

Till Maas <opensource(a)till.name&gt; writes:

>  git config  --add push.default tracking 
push.default can only have one value, so --add does not make sense.

Andreas.

-- 
Andreas Schwab, schwab(a)redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

[Till Maas]

On Wed, Aug 25, 2010 at 03:57:31PM +0200, Andreas Schwab wrote:
>  Till Maas <opensource(a)till.name&gt; writes:
>  
>  > git config  --add push.default tracking
>  
>  push.default can only have one value, so --add does not make sense. 
Ok, I adjusted it here:
https://fedoraproject.org/wiki/Using_Fedora_GIT

Regards
Till

[Neal Becker]

Till Maas wrote:

>  On Wed, Aug 25, 2010 at 03:57:31PM +0200, Andreas Schwab wrote:
> > Till Maas <opensource(a)till.name&gt; writes:
> > 
> > > git config  --add push.default tracking
> > 
> > push.default can only have one value, so --add does not make sense.
>  
>  Ok, I adjusted it here:
>  https://fedoraproject.org/wiki/Using_Fedora_GIT
>  
>  Regards
>  Till 
git config --global push.default tracking
seems to have fixed things.  (Still don't know what this magic means)

[Michael Cronenworth]

Neal Becker wrote:
>  git config --global push.default tracking
>  seems to have fixed things.  (Still don't know what this magic means) 
Git can push to one or many branches. You have to specify which branch 
to push - it can't read your mind. :)

Without that config option you need:

$ git push f13/master

With that config option:

$ git push

Defaults to whatever branch you are currently tracking.

[Andreas Schwab]

Michael Cronenworth <mike(a)cchtml.com&gt; writes:

>  Without that config option you need:
>
>  $ git push f13/master 
The first argument is the repository to push to.  Also, since local and
remote branch have different names you have to specify both.

$ git push origin f13:f13/master

(fedpkg should have reverted to use matching branch names!)

Andreas.

-- 
Andreas Schwab, schwab(a)redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

[Marcin Zajączkowski]

On 2010-08-25 16:55, Andreas Schwab wrote:
>  Michael Cronenworth <mike(a)cchtml.com&gt; writes:
>  
> > Without that config option you need:
> >
> > $ git push f13/master
>  
>  The first argument is the repository to push to.  Also, since local and
>  remote branch have different names you have to specify both.
>  
>  $ git push origin f13:f13/master 
Thanks for a tip.


Marcin

>  
>  (fedpkg should have reverted to use matching branch names!)
>  
>  Andreas.
>

[Andreas Schwab]

Neal Becker <ndbecker2(a)gmail.com&gt; writes:

>  $ fedpkg push
>  Everything up-to-date
>  $ fedpkg build
>  Could not initiate build: There are unpushed changes in your repo
>
>  Clue? 
$ git status

Andreas.

-- 
Andreas Schwab, schwab(a)redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84  5EC7 45C6 250E 6F00 984E
"And now for something completely different."

[Neal Becker]

Andreas Schwab wrote:

>  Neal Becker <ndbecker2(a)gmail.com&gt; writes:
>  
> > $ fedpkg push
> > Everything up-to-date
> > $ fedpkg build
> > Could not initiate build: There are unpushed changes in your repo
> >
> > Clue?
>  
>  $ git status
>  
>  Andreas.
>   
 git status
# On branch f13
# Your branch is ahead of 'origin/f13/master' by 10 commits.
#
nothing to commit (working directory clean)

No idea what this means.

[Michael Cronenworth]

Neal Becker wrote:
>  No idea what this means. 
It means it has been 10 commits since you have pushed ("synced") with 
the git repo living on pkgs.fedoraproject.org. Remember that you have 
your own unique git repository living on your local system.

[Neal Becker]

Michael Cronenworth wrote:

>  Neal Becker wrote:
> > No idea what this means.
>  
>  It means it has been 10 commits since you have pushed ("synced") with
>  the git repo living on pkgs.fedoraproject.org. Remember that you have
>  your own unique git repository living on your local system. 
But all I did was update the spec file (and did new sources), so how is that 
10 commits?

[Michael Cronenworth]

Neal Becker wrote:
>  But all I did was update the spec file (and did new sources), so how
> is that
>  10 commits? 
$ git log
Check out who has been committing?

You might also find the gitk tool (or other equivalents found in the 
Fedora repos) useful for visualizing the history.

[Todd Zullinger]

Neal Becker wrote:
>  Michael Cronenworth wrote:
>
> > Neal Becker wrote:
> >> No idea what this means.
> >
> > It means it has been 10 commits since you have pushed ("synced")
> > with the git repo living on pkgs.fedoraproject.org. Remember that
> > you have your own unique git repository living on your local
> > system.
>
>  But all I did was update the spec file (and did new sources), so how
>  is that 10 commits? 
You mentioned doing a merge of the origin/master branch.  That would
likely pull in a number of new commits.

Prior to the switch to git, the imported cvs "branches" might look
identical, but when they were imported to git, they have different
histories and different commit id's.  So the first merge you do to
sync f13 with master will bring in all the commits that are on master
which aren't on f13.  Future merges should be less noisy.

-- 
Todd        OpenPGP -> KeyID: 0xBEAF0CE3 | URL: www.pobox.com/~tmz/pgp
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Don't take life seriously, you'll never get out alive.