Re: [git-users] Re: git push over cntlm

2012-08-02 Thread Konstantin Khomoutov
On Thu, 2 Aug 2012 02:03:34 -0700 (PDT)
MohanR  wrote:

> Looks like this is the problem. But I got this error through Github
> for Windows which is configured to use cntlm. Clone is fine.
> 
> Sending PROXY auth request...
> Host   => github.com:443
> User-Agent => git/1.7.11.msysgit.1
> Proxy-Connection   => keep-alive
> Content-Type   =>
> application/x-git-receive-pack-request Accept
> => application/x-git-receive-pack-result
> Proxy-Authorization=> NTLM
> TlRMTVNTUAABBbIIogMAAwAsDAAMACBGU1NDSE5EMTE2MDdGU1M=
> Content-Length => 0
> 
> Reading PROXY auth response...
> HEAD: HTTP/1.1 407 Proxy Authentication Required ( Access is
> denied.  )

What if you try to access http://github.com:443 from your web-browser
(which is supposed to be able to authenticate OK)?

The problem is that it seems like the authentication phase does happen,
and your request thus might be denied by the access policy of your
corporate HTTP proxy.

Even if you will access the URL OK in your browser, the proxy can deny
your request based on the request's content type, for instance.
It's hard to guess, so I'd ask the system administrators.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Is it possible to merge blank change and text change in the same line?

2012-08-02 Thread Miro Kropáček
Hi,

I'm really surprised that git can't merge following simple scenario:

branch1 contains xxx.txt with " 5 spaces before"
branch2 contains xxx.txt with " 5 spaces before" 
master contains xxx.txt with " 5 spaces before" 

now I change it:

branch1 contains xxx.txt with " 5 spaces before with a change"
branch2 contains xxx.txt with "5 spaces before" (one space removed)
master contains xxx.txt with " 5 spaces before"

now I want to merge it:

master <- branch2 is OK
master <- branch1 gives an error?

I wonder why git can't detect it's only a white space change and go along?

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/5x-29AGqxisJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: git push over cntlm

2012-08-02 Thread MohanR
Looks like this is the problem. But I got this error through Github for 
Windows which is configured to use cntlm. Clone is fine.

Sending PROXY auth request...
Host   => github.com:443
User-Agent => git/1.7.11.msysgit.1
Proxy-Connection   => keep-alive
Content-Type   => application/x-git-receive-pack-request
Accept => application/x-git-receive-pack-result
Proxy-Authorization=> NTLM 
TlRMTVNTUAABBbIIogMAAwAsDAAMACBGU1NDSE5EMTE2MDdGU1M=
Content-Length => 0

Reading PROXY auth response...
HEAD: HTTP/1.1 407 Proxy Authentication Required ( Access is denied.  )


Thanks.

On Thursday, 2 August 2012 13:47:47 UTC+5:30, MohanR wrote:
>
> Hi,
>   This is about cntlm. I am able to view the cntlm verbose and 
> clone  is successful. 
>
> http.proxy=http://localhost:3128
> user.name=Mohan Radhakrishnan
> user.email=radhakrishnan.mo...@gmail.com
> core.repositoryformatversion=0
> core.filemode=true
> core.bare=false
> core.logallrefupdates=true
> core.ignorecase=true
> remote.origin.url=http://github.com/mohanr/pdq.git
> remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*
>
>
> Is it that my git requires a username/password ? The repository is public.
>
>
>
> Thanks,
> Mohan
>
> On Thursday, 2 August 2012 12:17:32 UTC+5:30, Thomas Ferris Nicolaisen 
> wrote:
>>
>> How have you configured Git to use the proxy?
>>
>> Do this inside your clone:
>>
>>  git config -l 
>>
>> and paste the output here, please.
>>
>> On Thursday, August 2, 2012 8:14:20 AM UTC+2, MohanR wrote:
>>>
>>> I even tried NTLMAPS
>>>
>>> $ git push origin master
>>> error: The requested URL returned error: 407 while accessing 
>>> http://github.com/mohanr/pdq.git/info/refs
>>>
>>> fatal: HTTP request failed
>>>
>>> Thanks.
>>>
>>> On Thursday, 2 August 2012 11:06:48 UTC+5:30, MohanR wrote:

 Hi,
   I am able to clone successfully through cntlm. But when I try 
 to issue 'git push origin master' I get

 HEAD: HTTP/1.1 401 Authorization Required

 Mine is a NTLM proxy. Is it possible to push over HTTP ? 


 Thanks,
 Mohan

>>>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/8BV0goFZxi4J.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.



[git-users] Re: git push over cntlm

2012-08-02 Thread MohanR
Hi,
  This is about cntlm. I am able to view the cntlm verbose and 
clone  is successful. 

http.proxy=http://localhost:3128
user.name=Mohan Radhakrishnan
user.email=radhakrishnan.mo...@gmail.com
core.repositoryformatversion=0
core.filemode=true
core.bare=false
core.logallrefupdates=true
core.ignorecase=true
remote.origin.url=http://github.com/mohanr/pdq.git
remote.origin.fetch=+refs/heads/*:refs/remotes/origin/*


Is it that my git requires a username/password ? The repository is public.



Thanks,
Mohan

On Thursday, 2 August 2012 12:17:32 UTC+5:30, Thomas Ferris Nicolaisen 
wrote:
>
> How have you configured Git to use the proxy?
>
> Do this inside your clone:
>
>  git config -l 
>
> and paste the output here, please.
>
> On Thursday, August 2, 2012 8:14:20 AM UTC+2, MohanR wrote:
>>
>> I even tried NTLMAPS
>>
>> $ git push origin master
>> error: The requested URL returned error: 407 while accessing 
>> http://github.com/mohanr/pdq.git/info/refs
>>
>> fatal: HTTP request failed
>>
>> Thanks.
>>
>> On Thursday, 2 August 2012 11:06:48 UTC+5:30, MohanR wrote:
>>>
>>> Hi,
>>>   I am able to clone successfully through cntlm. But when I try 
>>> to issue 'git push origin master' I get
>>>
>>> HEAD: HTTP/1.1 401 Authorization Required
>>>
>>> Mine is a NTLM proxy. Is it possible to push over HTTP ? 
>>>
>>>
>>> Thanks,
>>> Mohan
>>>
>>

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
https://groups.google.com/d/msg/git-users/-/jbq6AdNUv4MJ.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.