Re: [git-users] Unable to push

2012-11-05 Thread PJ Weisberg
On Monday, November 5, 2012, kramer.newsreader 
wrote:
> * nov20127fc7d04 [origin/nov2012] Little more javadoc
...
>   remotes/origin/nov2012 7fc7d04 Little more javadoc

Same commit on both the local and remote branches.  It looks like you have
nothing to push, or you've already pushed it.

-- 
-PJ

Gehm's Corollary to Clark's Law: Any technology distinguishable from
magic is insufficiently advanced.

-- 




Re: [git-users] Unable to push

2012-11-05 Thread William Mizuta
Try to say the branch you want to pull and push:

git pull origin nov2012 --rebase
git push origin nov2012


William Seiti Mizuta
@williammizuta
Desenvolvedor da Caelum



On Tue, Nov 6, 2012 at 3:43 AM, kramer.newsreader <
kramer.newsrea...@gmail.com> wrote:

>
>
>  Is your remote a 'bare' repository, or does it have a working directory?
>> -- I ask because you say you are working on the branch on both sides.
>>
>
>
>> It is normal to have your remote as a 'bare' repo, though you can manage
>> if both are 'working' but in such cases you would use different branches on
>> the repos so that you won't loose data.
>>
>
> I am not really sure I understand your question.  I didn't set up this
> repository.  I have to work on it.
>
> The person who did is mostly unavailable.
>
> Having said that I *think* it is bare but I'm not sure.
>
> Does the output that I pasted above bear on that fact? If not, is there
> more information I can give?
>
> Sorry, but git is very confusing to me.
>
> --
>
>
>

-- 




Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader


 Is your remote a 'bare' repository, or does it have a working directory? 
> -- I ask because you say you are working on the branch on both sides. 
>
  

> It is normal to have your remote as a 'bare' repo, though you can manage 
> if both are 'working' but in such cases you would use different branches on 
> the repos so that you won't loose data.
>

I am not really sure I understand your question.  I didn't set up this 
repository.  I have to work on it.

The person who did is mostly unavailable.  

Having said that I *think* it is bare but I'm not sure.

Does the output that I pasted above bear on that fact? If not, is there 
more information I can give?

Sorry, but git is very confusing to me.

-- 




Re: [git-users] git compilation problem

2012-11-05 Thread Konstantin Khomoutov
On Mon, Nov 05, 2012 at 09:21:13AM -0800, Mathieu Dutour wrote:

First, note that this list is a support channel for Git newbies, and
your question appears to be more about Git source code itself so I'd say
it better fits the main Git list which is git at vger.kernel.org.
I Cc'ed this my response here in the hope someone with the platform
similar to yours might chime in; so please keep the Cc list in your
responses.

> I tried to install git on an IBM power 6 computer and I had the following
> problem when doing "gmake install"

This doesn't sound quite descriptive.  From what I gather from the
Internet, IBM POWER 6 is a CPU brand, targeted at mainframes.  I vaguely
recall IBM mainframes typically run their own OS (z/OS?) but have
extensive support for virtualization so I recall I read somewhere it's
customary to run, say, a virtualized Linux-based OS on it.

Since what matters here is a *software* platform, please be (way) more
precise about this.

> ./configure[6213]: syntax error at line 6367 : `;' unexpected

"configure" is just a shell script usually generated by the "autoconf"
program from a template file named "configure.in".
"configure" is meant to be über-portable, but it assumes your /bin/sh is
a shell implementing the command language defined by POSIX, plus a
standard set of text-processing tools (such as sed and grep) is
available.
I can make a guess that whatever is available as /bin/sh in your system
might not quite fit the expectations of "configure".
I envision two ways to fix this:
1) Install autoconf and run it to regenerate the configure script;
   then try the compilation again.
2) Try to force configure using a different shell, if available.
   GNU bash should cut it, ash and dash [1] too.

In either case note that there isn't any indication that that syntax
error actually made the build process to fail; the only failing error
in the output you quoted is that of the `install` command which runs
after the compilation is done to install things (obviously).

By this I mean, if you will be able to fix that `install` error it might
turn out you could ignore the configure error whatsoever.

> gmake[2]: `GIT-VERSION-FILE' is up to date.
> GEN git-instaweb
> SUBDIR git-gui
> SUBDIR gitk-git
> gmake[1]: Nothing to be done for `all'.
> SUBDIR perl
> SUBDIR git_remote_helpers
> SUBDIR templates
> install -d -m 755 '/home/ar69ovim/opt/git-1.8.0/bin'
> /usr/bin/getopt: Not a recognized flag: d
> Usage: install [-c DirectoryA] [-f DirectoryB] [-i] [-m] [-M Mode] [-O
> Owner]
>[-G Group] [-S] [-n DirectoryC] [-o] [-s] File [DirectoryX
> ...]

Supposedly Git makefiles expect the `install` program to support the
"-d" command line option.  On my Linux system with `install` provided by
GNU coreutils [2], the "-d" command line option of this tool is used to
create the whole directory hierarchy according to the argument passed to
that option.  Obviously your `install` does not support this option.
Moreover, from the error output it follows, that your `install` is
implemented as a shell script which calls /usr/bin/getopt to parse its
command-line options.

Again, I can see several ways to fix that:
1) Patch Git makefile(s) to use some other means to create directory
   hierarchies.  For instance, some versions of `mkdir` support the "-p"
   command line option to do this.  You could combine `mkdir -p` with
   `chmod 755` to do what `install -d -m 755` would do.
2) (Somehow) get GNU coreutils and make Git makefiles see
   /usr/bin/install provided by this package.
3) Patch your `install` to support "-d".

> gmake: *** [install] Error 2

That's what makes the whole thing fail.

1. http://en.wikipedia.org/wiki/Debian_Almquist_shell
2. http://gnu.org/software/coreutils

-- 




Re: [git-users] Re: git checkout-index unable to create file (permission denied) on some files

2012-11-05 Thread Konstantin Khomoutov
On Tue, Oct 30, 2012 at 12:55:52PM -0700, Philipp Kraus wrote:

> > My gut feeling is that Git is not wrong here. Try the following:
> >
> > Do a sudo su webserver ("become" the webserver user), and do the exact 
> > commands it (or PHP) is trying to do in the exact same directories.
> >
> > If you don't get the same error message, you better share your PHP script 
> > so we can scan it for any obvious problems.
> >
> 
> I have run the command with sudo and it creates the same error. 
> I run this command: '/usr/bin/git' 
> '--git-dir=/tmp/gitzip_1b1f12ff79322b9e6515e3aeff3390b4/.git' 'pull' '-f'
> I think this is incorrect. I would like to get all changes into the repo 
> from the  orgigin. Can anybody explain which is the correct call?

It's not clear what do you really want to do from this description,
and anyway pulling changes from the remote has nothng to do with the
error mentioned in your original post.
But anyway, assuming the repository in that temporary directory has a
remote named "origin" configured in it, the command "to bring all
changes ... from the «origin»" would be:

$ git --git-dir=... fetch origin

This command would update (or create) the so-called "remote branches"
for that "origin" repository in your local repository.
It is then up to you to update whatever local branches in your
repository by the data contained in those just updated remote branches.
Usually this means merging or rebasing for the branches of interest.
(Note that `git pull` combines `git fetch` with `git merge`.)

But like Thomas in his reply, I, too, have a gut feeling it's not really
what you want (since you clearly employ scripting and deal with a
repository which looks like a scratch place, and all this hints you're
doing deployment or something other automated task).  So I'll do a wild
guess and assume you really want to make your local repository to look
*exactly* like "origin".  If so, the proper way to do that would be

$ git --git-dir=... fetch origin +refs/*:refs/*

(or +refs/heads/*:refs/heads/* for the last argument if you want only
branches and no tags, notes etc).  This command would just force-update
or create all the branches and tags the remote "origin" has in your
local repository (so that your local "master" is identical to the
origin's "master" and so on for every other branch "origin" has).

Note that that last argument to `git fetch` (called "the refspec")
allows for very flexible operation: using asterisks obviously means
"all available" but you can use specific branch (or tag or whatnot)
names, and specify several refspecs at once.  For instance,

$ git ... fetch origin +refs/heads/master:refs/heads/foo \
  refs/heads/devel:refs/heads/bar

would use the origin's branch "master" to force-update your local branch
"foo" and origin's branch "devel" to update the local branch "bar"
(failing the operation if "devel" does not contain "bar" so the latter
cannot be fast-forwarded by the update).

Keeping this in mind (and reading the `git fetch` manual carefully) you
can set up whatever updating scenariou your situation requires.

-- 




Re: [git-users] Unable to push

2012-11-05 Thread Philip Oakley
Is your remote a 'bare' repository, or does it have a working directory? -- I 
ask because you say you are working on the branch on both sides. 

It is normal to have your remote as a 'bare' repo, though you can manage if 
both are 'working' but in such cases you would use different branches on the 
repos so that you won't loose data.
  - Original Message - 
  From: kramer.newsreader 
  To: git-users@googlegroups.com 
  Sent: Monday, November 05, 2012 9:59 PM
  Subject: Re: [git-users] Unable to push


  Here you go.  I've anonymized checkin messages, domains, etc.

  By the way, I am *attempting* to work on the nov2012 branch both locally and 
remotely.

  $ git branch -avv
master f645170 Fix over_18 parameter. See #19010
  * nov20127fc7d04 [origin/nov2012] Little more javadoc
ticket/15734   251a314 Adding support for ...
ticket/17513   5251a79 Updated ...
tmp_branch 3f4b7bd Fixed ...
remotes/origin/HEAD-> origin/master
remotes/origin/master  9ecfb22 Support for ...
remotes/origin/mojiva  71ef51a Fix ...
remotes/origin/nov2012 7fc7d04 Little more javadoc
remotes/origin/testa2b09e8 Recalculate ...
remotes/origin/test-branch 443339d Fix ...
  $ git remote -vv
  gerritssh://@gerrit.:29418/ (fetch)
  gerritssh://@gerrit.:29418/ (push)
  originssh://git@git./ (fetch)
  originssh://git@git./ (push)

  On Monday, November 5, 2012 4:52:06 PM UTC-5, Alexandru Pătrănescu wrote:
maybe you have multiple remotes and you pull from one and try to push to 
another.
show us as possible an output from:
git branch -avv

and
git remote -vv




On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote:
  Yeah that's what I would figure, but it isn't the case.  Git status shows 
no conflicts.  

  I did a git pull(and did pull in a change or two that was made since my 
last post here).  Git status still showed no conflicts, so I tried a push 
again, but got the same error.


  On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:
Is there conflicts in your repository? What is the result of a git 
status?


If there is no conflicts, I think that someome pushed new commits and 
you need to do a git pull --rebase again.


William Seiti Mizuta
@williammizuta

Desenvolvedor da Caelum




On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader 
 wrote:

  Frustrated new git user here...

  Anyway, I have some changes that I would like to push but am unable I 
get the following error:

  error: failed to push some refs to 'ssh://git@<...>'
  To prevent you from losing history, non-fast-forward updates were 
rejected
  Merge the remote changes (e.g. 'git pull') before pushing again.  See 
the
  'Note about fast-forwards' section of 'git push --help' for details.

  Okay, so if I am translating git's terminology back to human 
language, I believe that this is telling me that I cannot push because I would 
lose history.  My change is not downstream of where the head is.

  The thing is that I just did a successful git pull -rebase, so my 
changes should be right on top of the head.  I can confirm that by attempting 
another pull:

  JohnKramer-2:statistics jkramer$ git pull --rebase
  Current branch nov2012 is up to date.


  What's going on here?


  -- 
   
   




  -- 
   
   

  No virus found in this message.
  Checked by AVG - www.avg.com
  Version: 2013.0.2742 / Virus Database: 2617/5874 - Release Date: 11/04/12

-- 




Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
I see
I haven't use gerrit but from what I know, in a gerrit setup, you should 
not use the original repository.

you can fetch from gerrit from the branch named "nov2012"
and push to gerrit on a branch named "for/nov2012"

most probably in this setup, origin could read-only

I might suggest to you to not do this kind of branches base on time 
interval and start doing multiple of them based on topic.



On Monday, November 5, 2012 11:59:07 PM UTC+2, kramer.newsreader wrote:
>
> Here you go.  I've anonymized checkin messages, domains, etc.
>
> By the way, I am *attempting* to work on the nov2012 branch both locally 
> and remotely.
>
> $ git branch -avv
>   master f645170 Fix over_18 parameter. See #19010
> * nov20127fc7d04 [origin/nov2012] Little more javadoc
>   ticket/15734   251a314 Adding support for ...
>   ticket/17513   5251a79 Updated ...
>   tmp_branch 3f4b7bd Fixed ...
>   remotes/origin/HEAD-> origin/master
>   remotes/origin/master  9ecfb22 Support for ...
>   remotes/origin/mojiva  71ef51a Fix ...
>   remotes/origin/nov2012 7fc7d04 Little more javadoc
>   remotes/origin/testa2b09e8 Recalculate ...
>   remotes/origin/test-branch 443339d Fix ...
> $ git remote -vv
> gerritssh://@gerrit.:29418/ (fetch)
> gerritssh://@gerrit.:29418/ (push)
> originssh://git@git./ (fetch)
> originssh://git@git./ (push)
>
> On Monday, November 5, 2012 4:52:06 PM UTC-5, Alexandru Pătrănescu wrote:
>>
>> maybe you have multiple remotes and you pull from one and try to push to 
>> another.
>> show us as possible an output from:
>> *git branch -avv*
>> and
>> *git remote -vv*
>> *
>> *
>>
>> On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote:
>>>
>>> Yeah that's what I would figure, but it isn't the case.  Git status 
>>> shows no conflicts.  
>>>
>>> I did a git pull(and did pull in a change or two that was made since my 
>>> last post here).  Git status still showed no conflicts, so I tried a push 
>>> again, but got the same error.
>>>
>>>
>>> On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:

 Is there conflicts in your repository? What is the result of a git 
 status?

 If there is no conflicts, I think that someome pushed new commits and 
 you need to do a git pull --rebase again.


 William Seiti Mizuta
 @williammizuta
 Desenvolvedor da Caelum



 On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader <
 kramer.n...@gmail.com> wrote:

> Frustrated new git user here...
>
> Anyway, I have some changes that I would like to push but am unable I 
> get the following error:
>
> error: failed to push some refs to 'ssh://git@<...>'
> To prevent you from losing history, non-fast-forward updates were 
> rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See 
> the
> 'Note about fast-forwards' section of 'git push --help' for details.
>
> Okay, so if I am translating git's terminology back to human language, 
> I believe that this is telling me that I cannot push because I would lose 
> history.  My change is not downstream of where the head is.
>
> The thing is that I just did a successful git pull -rebase, so my 
> changes should be right on top of the head.  I can confirm that by 
> attempting another pull:
>
> JohnKramer-2:statistics jkramer$ git pull --rebase
> Current branch nov2012 is up to date.
>
>
> What's going on here?
>
> -- 
>  
>  
>



-- 




Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader
Here you go.  I've anonymized checkin messages, domains, etc.

By the way, I am *attempting* to work on the nov2012 branch both locally 
and remotely.

$ git branch -avv
  master f645170 Fix over_18 parameter. See #19010
* nov20127fc7d04 [origin/nov2012] Little more javadoc
  ticket/15734   251a314 Adding support for ...
  ticket/17513   5251a79 Updated ...
  tmp_branch 3f4b7bd Fixed ...
  remotes/origin/HEAD-> origin/master
  remotes/origin/master  9ecfb22 Support for ...
  remotes/origin/mojiva  71ef51a Fix ...
  remotes/origin/nov2012 7fc7d04 Little more javadoc
  remotes/origin/testa2b09e8 Recalculate ...
  remotes/origin/test-branch 443339d Fix ...
$ git remote -vv
gerritssh://@gerrit.:29418/ (fetch)
gerritssh://@gerrit.:29418/ (push)
originssh://git@git./ (fetch)
originssh://git@git./ (push)

On Monday, November 5, 2012 4:52:06 PM UTC-5, Alexandru Pătrănescu wrote:
>
> maybe you have multiple remotes and you pull from one and try to push to 
> another.
> show us as possible an output from:
> *git branch -avv*
> and
> *git remote -vv*
> *
> *
>
> On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote:
>>
>> Yeah that's what I would figure, but it isn't the case.  Git status shows 
>> no conflicts.  
>>
>> I did a git pull(and did pull in a change or two that was made since my 
>> last post here).  Git status still showed no conflicts, so I tried a push 
>> again, but got the same error.
>>
>>
>> On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:
>>>
>>> Is there conflicts in your repository? What is the result of a git 
>>> status?
>>>
>>> If there is no conflicts, I think that someome pushed new commits and 
>>> you need to do a git pull --rebase again.
>>>
>>>
>>> William Seiti Mizuta
>>> @williammizuta
>>> Desenvolvedor da Caelum
>>>
>>>
>>>
>>> On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader >> > wrote:
>>>
 Frustrated new git user here...

 Anyway, I have some changes that I would like to push but am unable I 
 get the following error:

 error: failed to push some refs to 'ssh://git@<...>'
 To prevent you from losing history, non-fast-forward updates were 
 rejected
 Merge the remote changes (e.g. 'git pull') before pushing again.  See 
 the
 'Note about fast-forwards' section of 'git push --help' for details.

 Okay, so if I am translating git's terminology back to human language, 
 I believe that this is telling me that I cannot push because I would lose 
 history.  My change is not downstream of where the head is.

 The thing is that I just did a successful git pull -rebase, so my 
 changes should be right on top of the head.  I can confirm that by 
 attempting another pull:

 JohnKramer-2:statistics jkramer$ git pull --rebase
 Current branch nov2012 is up to date.


 What's going on here?

 -- 
  
  

>>>
>>>

-- 




Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
maybe you have multiple remotes and you pull from one and try to push to 
another.
show us as possible an output from:
*git branch -avv*
and
*git remote -vv*
*
*

On Monday, November 5, 2012 11:33:06 PM UTC+2, kramer.newsreader wrote:
>
> Yeah that's what I would figure, but it isn't the case.  Git status shows 
> no conflicts.  
>
> I did a git pull(and did pull in a change or two that was made since my 
> last post here).  Git status still showed no conflicts, so I tried a push 
> again, but got the same error.
>
>
> On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:
>>
>> Is there conflicts in your repository? What is the result of a git status?
>>
>> If there is no conflicts, I think that someome pushed new commits and you 
>> need to do a git pull --rebase again.
>>
>>
>> William Seiti Mizuta
>> @williammizuta
>> Desenvolvedor da Caelum
>>
>>
>>
>> On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader 
>> wrote:
>>
>>> Frustrated new git user here...
>>>
>>> Anyway, I have some changes that I would like to push but am unable I 
>>> get the following error:
>>>
>>> error: failed to push some refs to 'ssh://git@<...>'
>>> To prevent you from losing history, non-fast-forward updates were 
>>> rejected
>>> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>>> 'Note about fast-forwards' section of 'git push --help' for details.
>>>
>>> Okay, so if I am translating git's terminology back to human language, I 
>>> believe that this is telling me that I cannot push because I would lose 
>>> history.  My change is not downstream of where the head is.
>>>
>>> The thing is that I just did a successful git pull -rebase, so my 
>>> changes should be right on top of the head.  I can confirm that by 
>>> attempting another pull:
>>>
>>> JohnKramer-2:statistics jkramer$ git pull --rebase
>>> Current branch nov2012 is up to date.
>>>
>>>
>>> What's going on here?
>>>
>>> -- 
>>>  
>>>  
>>>
>>
>>

-- 




Re: [git-users] Unable to push

2012-11-05 Thread Alexandru Pătrănescu
maybe you have multiple remotes and you pull from one and try to push to
another.
show us as possible an output from:
*git branch -avv*
and
*git remote -vv*


Alexandru Patranescu
Tel: 0721378395


On Mon, Nov 5, 2012 at 11:33 PM, kramer.newsreader <
kramer.newsrea...@gmail.com> wrote:

> Yeah that's what I would figure, but it isn't the case.  Git status shows
> no conflicts.
>
> I did a git pull(and did pull in a change or two that was made since my
> last post here).  Git status still showed no conflicts, so I tried a push
> again, but got the same error.
>
>
>
> On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:
>
>> Is there conflicts in your repository? What is the result of a git status?
>>
>> If there is no conflicts, I think that someome pushed new commits and you
>> need to do a git pull --rebase again.
>>
>>
>> William Seiti Mizuta
>> @williammizuta
>> Desenvolvedor da Caelum
>>
>>
>>
>> On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader 
>> wrote:
>>
>>> Frustrated new git user here...
>>>
>>> Anyway, I have some changes that I would like to push but am unable I
>>> get the following error:
>>>
>>> error: failed to push some refs to 'ssh://git@<...>'
>>> To prevent you from losing history, non-fast-forward updates were
>>> rejected
>>> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>>> 'Note about fast-forwards' section of 'git push --help' for details.
>>>
>>> Okay, so if I am translating git's terminology back to human language, I
>>> believe that this is telling me that I cannot push because I would lose
>>> history.  My change is not downstream of where the head is.
>>>
>>> The thing is that I just did a successful git pull -rebase, so my
>>> changes should be right on top of the head.  I can confirm that by
>>> attempting another pull:
>>>
>>> JohnKramer-2:statistics jkramer$ git pull --rebase
>>> Current branch nov2012 is up to date.
>>>
>>>
>>> What's going on here?
>>>
>>> --
>>>
>>>
>>>
>>
>>  --
>
>
>

-- 




Re: [git-users] Unable to push

2012-11-05 Thread kramer.newsreader
Yeah that's what I would figure, but it isn't the case.  Git status shows 
no conflicts.  

I did a git pull(and did pull in a change or two that was made since my 
last post here).  Git status still showed no conflicts, so I tried a push 
again, but got the same error.


On Monday, November 5, 2012 3:58:22 PM UTC-5, William Mizuta wrote:
>
> Is there conflicts in your repository? What is the result of a git status?
>
> If there is no conflicts, I think that someome pushed new commits and you 
> need to do a git pull --rebase again.
>
>
> William Seiti Mizuta
> @williammizuta
> Desenvolvedor da Caelum
>
>
>
> On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader 
> 
> > wrote:
>
>> Frustrated new git user here...
>>
>> Anyway, I have some changes that I would like to push but am unable I get 
>> the following error:
>>
>> error: failed to push some refs to 'ssh://git@<...>'
>> To prevent you from losing history, non-fast-forward updates were rejected
>> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
>> 'Note about fast-forwards' section of 'git push --help' for details.
>>
>> Okay, so if I am translating git's terminology back to human language, I 
>> believe that this is telling me that I cannot push because I would lose 
>> history.  My change is not downstream of where the head is.
>>
>> The thing is that I just did a successful git pull -rebase, so my changes 
>> should be right on top of the head.  I can confirm that by attempting 
>> another pull:
>>
>> JohnKramer-2:statistics jkramer$ git pull --rebase
>> Current branch nov2012 is up to date.
>>
>>
>> What's going on here?
>>
>> -- 
>>  
>>  
>>
>
>

-- 




Re: [git-users] Unable to push

2012-11-05 Thread William Mizuta
Is there conflicts in your repository? What is the result of a git status?

If there is no conflicts, I think that someome pushed new commits and you
need to do a git pull --rebase again.


William Seiti Mizuta
@williammizuta
Desenvolvedor da Caelum



On Mon, Nov 5, 2012 at 6:54 PM, kramer.newsreader <
kramer.newsrea...@gmail.com> wrote:

> Frustrated new git user here...
>
> Anyway, I have some changes that I would like to push but am unable I get
> the following error:
>
> error: failed to push some refs to 'ssh://git@<...>'
> To prevent you from losing history, non-fast-forward updates were rejected
> Merge the remote changes (e.g. 'git pull') before pushing again.  See the
> 'Note about fast-forwards' section of 'git push --help' for details.
>
> Okay, so if I am translating git's terminology back to human language, I
> believe that this is telling me that I cannot push because I would lose
> history.  My change is not downstream of where the head is.
>
> The thing is that I just did a successful git pull -rebase, so my changes
> should be right on top of the head.  I can confirm that by attempting
> another pull:
>
> JohnKramer-2:statistics jkramer$ git pull --rebase
> Current branch nov2012 is up to date.
>
>
> What's going on here?
>
> --
>
>
>

-- 




[git-users] Unable to push

2012-11-05 Thread kramer.newsreader
Frustrated new git user here...

Anyway, I have some changes that I would like to push but am unable I get 
the following error:

error: failed to push some refs to 'ssh://git@<...>'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again.  See the
'Note about fast-forwards' section of 'git push --help' for details.

Okay, so if I am translating git's terminology back to human language, I 
believe that this is telling me that I cannot push because I would lose 
history.  My change is not downstream of where the head is.

The thing is that I just did a successful git pull -rebase, so my changes 
should be right on top of the head.  I can confirm that by attempting 
another pull:

JohnKramer-2:statistics jkramer$ git pull --rebase
Current branch nov2012 is up to date.


What's going on here?

-- 




Re: [git-users] [PATCH] Remove terminal symbols from non-terminal console

2012-11-05 Thread Konstantin Khomoutov
On Sun, Nov 04, 2012 at 04:57:11PM -0800, Michael Naumov wrote:

> As per discussion on msysgit user group: 
> https://groups.google.com/forum/?fromgroups=#!topic/msysgit/U_a982_a3rc/discussion
> we found the following patch is required to get rid of weird terminal 
> characters for other tools such as GitExtensions for Windows
[...]

This is not the Git list you intended to post your patch to -- the main
Git list (for developers) is git at vger.kernel.org, please post your
patch there instead.

This list is titled "Git for human beings" and is intended for providing
support to Git novices.  The development of Git itself is discussed on
the main Git list.

-- 




[git-users] git compilation problem

2012-11-05 Thread Mathieu Dutour
Dear all,

I tried to install git on an IBM power 6 computer and I had the following
problem when doing "gmake install"

./configure[6213]: syntax error at line 6367 : `;' unexpected
gmake[2]: `GIT-VERSION-FILE' is up to date.
GEN git-instaweb
SUBDIR git-gui
SUBDIR gitk-git
gmake[1]: Nothing to be done for `all'.
SUBDIR perl
SUBDIR git_remote_helpers
SUBDIR templates
install -d -m 755 '/home/ar69ovim/opt/git-1.8.0/bin'
/usr/bin/getopt: Not a recognized flag: d
Usage: install [-c DirectoryA] [-f DirectoryB] [-i] [-m] [-M Mode] [-O
Owner]
   [-G Group] [-S] [-n DirectoryC] [-o] [-s] File [DirectoryX
...]
gmake: *** [install] Error 2

--