Hmm...you might need to add "git remote update" in there. git pull does that by default.
On Mon, Aug 19, 2013 at 1:22 PM, me 1 <[email protected]> wrote: > > On Sun, Aug 18, 2013 at 9:04 PM, me 1 <[email protected]> wrote: >> >>> On Sunday, August 18, 2013 6:13:38 PM UTC-4, Jim Toth wrote: >>>> >>>> There are a few ways to go; probably the best way is to set up a bare >>>> repository that you push and pull from in both places, but I'd probably add >>>> the development environment as a remote in the in-production directory. >>>> >>>> cd /path/to/production/repository >>>> git remote add devel /path/to/development/directory >>>> git merge --ff-only devel/master >>>> >>>> (--ff-only because I'm paranoid -- that will give you the same sort of >>>> warnings that "git push" would give you if you the trees had diverged). >>>> >>> >>> >>> So you're saying adding to the development environment as a remote in >>> the in-production directory is an alternative to using a bare repository >>> then? >>> >> >> Yes. >> >> >>> I'm new to git and just trying to find an easy way, if using bare >>> repositories is necessary, I don't think git is very good for this at all, >>> its too much trouble for what its worth. (except for extremely large >>> environments, which is rare) >>> >> >> I'd say what it's good for is multi-user environments. Or single-user >> environments, if that user happens to be familiar with git. :-) >> >> > > ok, then here is the problem: > > $ git merge --ff-only preprod/master > > fatal: 'preprod/master' does not point to a commit > > $ git remote -v > preprod /etc/puppet/environments/preprod/puppet/ (fetch) > preprod /etc/puppet/environments/**preprod/puppet/ (push) > > $ pwd > /etc/puppet > > > -- > You received this message because you are subscribed to the Google Groups > "Puppet Users" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To post to this group, send email to [email protected]. > Visit this group at http://groups.google.com/group/puppet-users. > For more options, visit https://groups.google.com/groups/opt_out. > -- Jim Toth [email protected] Applications Analyst, Technology Services (804) 827-1227 -- You received this message because you are subscribed to the Google Groups "Puppet Users" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. Visit this group at http://groups.google.com/group/puppet-users. For more options, visit https://groups.google.com/groups/opt_out.
