Re: git:// protocol over SSL/TLS

[Konstantin Khomoutov]

On Fri, 27 Dec 2013 18:59:00 +0600
Sergey Sharybin sergey@gmail.com wrote:

 Quick question is, is it possible to use git:// protocol over
 SSL/TLS/other secure transport?

The Git protocol does not implement it itself but you can channel it
over a TLS tunnel (via stunnel for instance).  Unfortunately, this
means a specialized software and setup on both ends so if the question
was about a general client using stock Git then the answer is no, it's
impossible.

 Or the recommended way to do secure anonymous checkout is to simply
 use https:// ?

Yes, but it will only be secure if you've managed to verify the
server's certificate and do trust its issuer (or a CA higher up the
cert's trust chain) -- people tend to confuse encrypted with
secure which is not at all the same thing.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git:// protocol over SSL/TLS

[Konstantin Khomoutov]

On Fri, 27 Dec 2013 19:58:19 +0600
Sergey Sharybin sergey@gmail.com wrote:

[...]
  Yes, but it will only be secure if you've managed to verify the
  server's certificate and do trust its issuer (or a CA higher up the
  cert's trust chain) -- people tend to confuse encrypted with
  secure which is not at all the same thing.
 
 We've got CA-signed certificate atm and it's about to be also
 EV-signed for our server (git.blender.org). So this is not gonna to be
 an issue. Cloning over https:// works fine, but we wanted to be sure
 all the bits are secure.

This setup sounds to be just the right thing.

 So guess we just need to recommend using https:// protocol instead of
 git:// for our users?

I think yes.  HTTP[S] once was dumb and slow but now it should be
comparable in speed to git:// as essentially using this protocol (which
became smart [1]) means spawning a git server process once per fetch/push
session and making the client and server Git processes communicate all by
themselves, so HTTP is there for request routing, authentication and
session setup while data transfer is carried out by Git processes
themselves [2].

1. http://git-scm.com/blog/2010/03/04/smart-http.html
2. https://www.kernel.org/pub/software/scm/git/docs/git-http-backend.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git:// protocol over SSL/TLS

[Konstantin Khomoutov]

On Fri, 27 Dec 2013 15:12:07 +0100
Andreas Schwab sch...@linux-m68k.org wrote:

  So guess we just need to recommend using https:// protocol instead
  of git:// for our users?
 
 Given how easy it is to verify the integrity of a git repository out
 of band there isn't really much of added security by using TLS for
 transport.

If the devs employ signed tags then yes but otherwise you'd have to
have some reference repository to compare with.  Sure they target for a
more no-brainer setup. ;-)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git:// protocol over SSL/TLS

[Konstantin Khomoutov]

On Fri, 27 Dec 2013 20:25:16 +0600
Sergey Sharybin sergey@gmail.com wrote:

 Security in this case is about being sure everyone gets exactly the
 same repository as stored on the server, without any modifications to
 the sources cased by MITM.
 
 As for smart http, this seems pretty much cool.However, we're
 currently using lighthttpd, so it might be an issue. We'll check on
 whether smart http is used there, and if not guess it wouldn't be a
 big deal to switch to apache.

The web server software has nothing to do with HTTP[S] used by Git being
smart, I think, it just has to be set up properly.

As discussed in an earlier thread here, a good indication of the
dumb version of the protocol being in use is no display of the
fetching progress on the client while doing `git clone` because this
information (like compressing objects ... etc) is sent by the
server-side Git process which is only there if HTTP[S] was smart.
Otherwise the client just GETs packs of objects, traverses them, GETs
more and so on, so batches of HTTP GET requests correlating to clone
sessions in the web server logs should also be indicative of the
problem.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git:// protocol over SSL/TLS

[Konstantin Khomoutov]

On Fri, 27 Dec 2013 20:47:54 +0600
Sergey Sharybin sergey@gmail.com wrote:

[...]
  As discussed in an earlier thread here, a good indication of the
  dumb version of the protocol being in use is no display of the
  fetching progress on the client while doing `git clone` because this
  information (like compressing objects ... etc) is sent by the
  server-side Git process which is only there if HTTP[S] was smart.
  Otherwise the client just GETs packs of objects, traverses them,
  GETs more and so on, so batches of HTTP GET requests correlating to
  clone sessions in the web server logs should also be indicative of
  the problem.
 
 Just to verify, if i see messages like Receiving objects:   1%
 (7289/705777), 1.72 MiB | 340.00 KiB/s it means server is smart ?

I would say yes, because your Git knows the precise number of objects to
receive.  Unfortunately, I won't swear by this as this was a long time
ago I have seen cloning using the dumb protocol.

By the way, here [1] is that discussion.

1. http://thread.gmane.org/gmane.comp.version-control.git/238933/focus=238946
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Compiling git for Windows

[Konstantin Khomoutov]

On Wed, 26 Feb 2014 12:23:35 -0600
Robert Dailey rcdailey.li...@gmail.com wrote:

 Oddly I'm not able to find any instructions on how to build Git for
 Windows. I've done a clone of the repository here:
 
 https://github.com/msysgit/git
 
 I did attempt to try doing it myself. I installed 'make' and mingw-gcc
 in Cygwin and attempted 'make' from the git directory but it fails
 immediately (I can post information on the failure if needed, but I'm
 assuming I'm not taking the correct approach).
 
 Can someone point me to some instructions on how to build Git for
 Windows? Thanks.

https://github.com/msysgit/msysgit/wiki/InstallMSysGit
and then
https://github.com/msysgit/msysgit/wiki/WorkingOnMsysGit

You might want to start at the README at
https://github.com/msysgit/msysgit
and then navigate to the wiki:
https://github.com/msysgit/msysgit/wiki
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Bug report -- Illegal instruction on Mac 10.6.8 without XCode installed

[Konstantin Khomoutov]

On Tue, 18 Mar 2014 01:33:25 -0700
Ray Hengst rkhen...@gmail.com wrote:

 Hi,
 I am running a Mac 10.6.8 and tried to install git-1.9.0 off of the
 installer (git-1.9.0-intel-universal-snow-leopard.dmg). The
 installation worked fine and gave no error messages. But whenever I
 type in a git command (see below for some I tried), it gives me this
 error message:
 Illegal instruction
 
 I am completely new to git and mostly new of Unix, but here are some
 commands I tried:
 git
 git help
 git config
 git init
 git clean
 git config --global user.name John Doe
 git status
 
 However, typing man git displays typical man pages.

This has nothing to do with your problem: the `man` program is not part
of Git and presumably works; it just finds and reads the specified
manual page--which is just plain text--renders it and shows to you.
And your problem is with misbehaving Git binary.

 I do not have Xcode installed. (it's very hard to find a legacy copy);
 the make command also is not present, so I can't use any of the
 workarounds I saw listed.
 I uninstalled git-1.9.0 successfully using the provided script, then
 downloaded the same file again (and installed it) to make sure I
 didn't get a corrupt copy. I had the same problem, however.
 If I can provide any more information just let me know.
 Thanks for any help you can provide.

I once came across this thread [1] on SO which says this might be due
to the binaries compiled for a newer version of the OS than you have
installed.  In any case, [2] suggests the installer is prepared by the
guy behind [3], and that project's bug tracker has a bug for exactly
your problem already filed [4].  You might want to chime in there
with more details if you feel like it.

1. http://stackoverflow.com/q/14268887/720999
2. http://git-scm.com/download/mac
3. http://sourceforge.net/projects/git-osx-installer/
4. http://sourceforge.net/p/git-osx-installer/tickets/97/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [ANNOUNCE] WinGit - native x86/x64 Git for Windows

[Konstantin Khomoutov]

On Thu, 3 Apr 2014 17:18:50 +0400
ma...@slonopotamus.org wrote:

 I'm proud to announce WinGit:
 an attempt to bring Git powers to 64-bit Windows.
[...]
 Relationship with msysgit
 =
 
 Unlike msysgit, WinGit is a pure-Windows binary build with MSVC.
 
 Like msysgit, WinGit also uses msys environment (sh/perl/etc) both
 during build-time and runtime.
 
 WinGit adds a few patches to Git itself on top of msysgit ones.
 Patches are required due to insufficient testing of MSVC builds
 (caused by total absence of any MSVC-built Git distributions).
 
 All WinGit patches are sent upstream, just didn't get to master yet.

What is the state of Unicode support in WinGit?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: EXT :Re: GIT and large files

[Konstantin Khomoutov]

On Tue, 20 May 2014 18:18:08 +
Stewart, Louis (IS) louis.stew...@ngc.com wrote:

 From you response then there is a method to only obtain the Project,
 Directory and Files (which could hold 80 GBs of data) and not the
 rest of the Repository that contained the full overall Projects?

Please google the phrase Git shallow cloning.

I would also recommend to read up on git-annex [1].

You might also consider using Subversion as it seems you do not need
most benefits Git has over it and want certain benefits Subversion has
over Git:
* You don't need a distributed VCS (as you don't want each developer to
  have a full clone).
* You only need a single slice of the repository history at any given
  revision on a developer's machine, and this is *almost* what
  Subversion does: it will keep the so-called base (or pristine)
  versions of files comprising the revision you will check out, plus
  the checked out files theirselves.  So, twice the space of the files
  comprising a revision.
* Subversion allows you to check out only a single folder out of the
  entire revision.
* IIRC, subversion supports locks, when a developer might tell the
  server they're editing a file, and this will prevent other devs from
  locking the same file.  This might be used to serialize editions of
  huge and/or unmergeable files.  Git can't do that (without
  non-standard tools deployed on the side or a centralized meeting
  point repository).

My point is that while Git is fantastic for managing source code
projects and project of similar types with regard to their contents,
it seems your requirements are mainly not suitable for the use case
Git is best tailored for.  Your apparent lack of familiarity with Git
might as well bite you later should you pick it right now.  At least
please consider reading a book or some other introduction-level
material on Git to get the feeling of typical workflows used with it.


1. https://git-annex.branchable.com/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: BUG I can't start git on Windows 7

[Konstantin Khomoutov]

On Mon, 8 Sep 2014 11:15:44 +0200
Petr Bena benap...@gmail.com wrote:

 I installed git on my system using official package from git-scm.com
 but I can't launch it, I am always getting this error:
 
 C:\Users\petr.benaC:\Program Files (x86)\Git\bin\sh.exe --login -i
   0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32
 error 487 AllocationBase 0x0, BaseAddress 0x6857, RegionSize
 0x4, State 0x1 C:\Program Files (x86)\Git\bin\sh.exe: ***
 Couldn't reserve space for cygwin's heap, Win32 error 0
 
 
 At some point this could be an issue with cygwin, but I am not sure.
 Did anyone had similar issue?

Does [1] help?

I wonder, why the error message mentions Cygwin though.
One reason might be is that MinGW is originally a fork of some very
early Cygwin release so may be some error message is lingering there,
unmodified.

1. http://stackoverflow.com/a/24406417/720999
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Smart HTTP

[Konstantin Khomoutov]

On Mon, 13 Oct 2014 17:29:05 +
John Norris j...@norricorp.f9.co.uk wrote:

 I guess this comment is aimed at Scott Chacon.
 I have read your blog post on Smart HTTP 
 (http://git-scm.com/blog/2010/03/04/smart-http.html) and wondered if 
 there is any documentation that compares in terms of thoroughness
 with your sections in the book on using SSH, which does explain the
 basics so that anyone can get it working.
 I have tried setting up authenticated pull and push with HTTP (not 
 HTTPS) and Apache never asks for authentication during a pull and 
 refuses a push with a 403 error.

Looks like a sort-of followup to this discussion [1].

(John, being a good netizen, you should have included the link to that
discussion yourself, to put your uh comment in context and may be
actually get some useful responses.)

1. https://groups.google.com/d/topic/git-users/zcXYY1Le_F4/discussion
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git download --- Virus

[Konstantin Khomoutov]

On Thu, 16 Oct 2014 12:35:33 +0300 (EEST)
risto.makini...@pp.inet.fi risto.makini...@pp.inet.fi wrote:

 I downloaded and started to Install Git.
 
 There is a Virus on you setup.
 Program that appears to have trojan-like features or behavior.
 
 Git/bin/pdfinfo.exe
 
 trojan.generic.[variant], gen:trojan.[variant]
 
 Why???

Because your antivirus software applies its (seemingly imperfect)
heuristics and thinks there's a virus while there's none.

To state this in a more blunt way: no there's no any virus in the Git
for Windows installation package.

The other possibility is you obtaining the installation package from
a place other than http://git-scm.com or some malware active on your
computer is changing the packages you're downloading on the fly.  The
latter is highly unlikely though.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

fatal unresolved deltas error

[Konstantin Khomoutov]

Hi,

I'm posting on behalf of Anjib Mulepati (Cc'ed) whose mails have
troubles getting in here.  Originally posted to git-users [*] but the
problem appears to be too complicated for that list.

[*] https://groups.google.com/d/topic/git-users/fnU3JtRuwH8/discussion

Below is the original Anjib's message.

I am trying to do push but getting this error

$ git push
Counting objects: 83, done.
Delta compression using up to 8 threads.
Compressing objects: 100% (16/16), done.
Writing objects: 100% (17/17), 1.32 KiB | 0 bytes/s, done.
Total 17 (delta 12), reused 0 (delta 0)
remote: fatal: unresolved deltas left after unpacking
error: unpack failed: unpack-objects abnormal exit
To //myserver/git/apps/myApp.git
! [remote rejected] master - master (unpacker error)
error: failed to push some refs to '//myserver/git/apps/myApp.git'

1. When I do new clean of the repo in new directory (say \newRepoDir)
I am getting error

$ git clone //myserver/git/apps/myApp.git/
Cloning into 'MyApp'...
done.
fatal: unable to read tree 18295307f1270da3c09e3de91890652af4ff7ca8
warning: Clone succeeded, but checkout failed.
You can inspect what was checked out with 'git status'
and retry the checkout with 'git checkout -f HEAD'

2. When I do cat in  new directory I am getting fatal: ..bad file error

$ git cat-file -t 18295307f1270da3c09e3de91890652af4ff7ca8
fatal: git cat-file 18295307f1270da3c09e3de91890652af4ff7ca8: bad file

3. But if I do cat in my current working directory it can tell its tree

$ git cat-file -t 18295307f1270da3c09e3de91890652af4ff7ca8
tree

My git repo is in network share drive and its Windows 7 and I am
working on Windows 7 machine too.

As client tool I am using Git for Windows 1.9.2.msysgit.0.

At this point I am thinking I have to push this tree in repo but not
sure how to do it or really that a solution.

Let me know what I have to do and if any further information is needed.

Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Error

[Konstantin Khomoutov]

On Tue, 9 Jul 2013 20:30:37 -0500
Chanakya Vattikuti gk2cverag...@gmail.com wrote:

 I get this error message when trying to create a shared ssh key in
 Mac osx Lion

This problem has nothing to do with Git as it purely is about
transferring a public part of your SSH key to another host.
So try asking on the OS support channels.

 scp .ssh/id_rsa.pub cvatt...@cook.cs.uno.edu:~/
 ssh_exchange_identification: Connection closed by remote host
 lost connection

Since the public part of your key is not transferred to that remote host
yet, and it is not registered as a trusted key there, you have to use
an SSH authentication method other than publickey.  Or, if you have
another SSH key which is registered as trusted on the remote host, you
might try to use it explicitly using the -i private_key_file_
command-line option to `scp`.

If this fails or not applicable, at least try to run `scp` with
multiple -v command-line options (like `scp - ...`) to get
extensive details about authentication protocols it tried with the
server and which of them were agreed upon by both sides and tried.

It might turn out that the server only accepts publickey authentication
mechanism, and so you are not able to upload and register your public
key yourself (chicken and egg problem).  In that case, contact the
server's system administrator for assistance.

If the server has certain Git hosting solution like Gitlab, you might
need to try registering your key using some other means like logging to
your Git account via some web interface and pasting the key there --
just like you'd do this on github.

If studying that information won't help you, provide it when you will
be asking this question on the Mac OS support channels.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Fwd: Online book has incorrect link

[Konstantin Khomoutov]

On Wed, 24 Jul 2013 16:46:46 +0400
Konstantin Konovalov kostya.konova...@gmail.com wrote:

 During reading the online book (http://git-scm.com/book/ru - russian
 translation) I found some bugs.
[...]

Please report them at https://github.com/github/gitscm-next/issues
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git and cyrillic branches

[Konstantin Khomoutov]

On Thu, 25 Jul 2013 15:19:48 +0300
иванов иван xowi...@yandex.ru wrote:

 hello! there is problem vith git and cyrillic (utf-8) names of
 branches. branch creates perfectly, but when i clone this remote
 branch to local host, there are 2 bugs:
 1) git branch doesnt show checked branch with asterisk (while on
 remote server it does)
 2) git push gives 2 errors: fatal: BRANCH_NAME cannot be resolved
 to branch. and fatal: The remote end hung up unexpectedly thanks.

Works for me across two Debian systems: both have Git 1.7.10.4; user
accounts on both systems have LANG=en_US.UTF-8 configured in their
environment.

Do both of your systems (local and remote) have an UTF-8-enabled (or
encoding-agnostic, like C) locale active?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git and cyrillic branches

[Konstantin Khomoutov]

On Thu, 25 Jul 2013 17:06:41 +0400
ксовиран xowi...@yandex.ru wrote:

   hello! there is problem vith git and cyrillic (utf-8) names of
   branches. branch creates perfectly, but when i clone this remote
   branch to local host, there are 2 bugs:
   1) git branch doesnt show checked branch with asterisk (while on
   remote server it does)
   2) git push gives 2 errors: fatal: BRANCH_NAME cannot be
  resolved to branch. and fatal: The remote end hung up
  unexpectedly thanks.
 
  Works for me across two Debian systems: both have Git 1.7.10.4; user
  accounts on both systems have LANG=en_US.UTF-8 configured in their
  environment.
 
  Do both of your systems (local and remote) have an UTF-8-enabled (or
  encoding-agnostic, like C) locale active?

 oh, yes indeed. i was pushing from mac to ubuntu, but ubuntu to
 ubuntu works fine. although #locale gives almost identical output, so
 it is something to work out. спасибо за помощь! 25.07.2013, 16:45,

I'm afraid, this might be not that simple: Git received certain tweaks
to work around certain problems Mac OS X has (as I understand it) with
handling UTF-8 on various filesystems it supports; in particular, see
commits 76759c7dff53e8c84e975b88cb8245587c14c7ba [1]
and b856ad623e4f686815986c0b9341dd1bfd791e71 [2] which were released as
part of v1.7.12.

So... I'm not sure, but I beleive these fixes might have been related to
handling filenames in the work tree and the index only, not branches, as
having branches with non-ASCII names is a weird idea to most
developers, I think.  So the question is: do you have Git = 1.7.12 on
your Mac OS X machine?  If so, do you still experience this problem (I
think that Macs do not have non-UTF-8 locales anyway, so this is
unlikely the root cause).

P.S.
Please don't top-post as this breaks discussion flow and hence sucks.

1. https://github.com/git/git/commit/76759c7
2. https://github.com/git/git/commit/b856ad6
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git and cyrillic branches

[Konstantin Khomoutov]

On Thu, 25 Jul 2013 18:51:57 +0400
ксовиран xowi...@yandex.ru wrote:

[...]
  I'm afraid, this might be not that simple: Git received certain
  tweaks to work around certain problems Mac OS X has (as I
  understand it) with handling UTF-8 on various filesystems it
  supports; in particular, see commits
[...]
  So... I'm not sure, but I beleive these fixes might have been
  related to handling filenames in the work tree and the index only,
  not branches, as having branches with non-ASCII names is a weird
  idea to most developers, I think.
[...]
 there is nothing wrong with having branches with non-ASCII names as
 english is not the only language in the world.

Well, this my remark was just to explain why the problem with branches
which *are* files (well, unless they have become packed refs) in the
reference Git implementation, might had good chances to escape the
scope of the tweaks being discussed.  Of course, there's nothing wrong
with non-ASCII branch names unless this impedes collaboration on a
project which uses them.

 problem is still here, i've got ubuntu on VM and same shared
 git-folder causes this problem on Mac Os and no problems on Ubuntu.
 git version on Mac is 1.8.0.1 (on Ubuntu is 1.7.10.4)

I hope someone possessing the necessary knowledge will look at it.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git and cyrillic branches

[Konstantin Khomoutov]

On Thu, 25 Jul 2013 18:51:57 +0400
ксовиран xowi...@yandex.ru wrote:

[...]
  I'm afraid, this might be not that simple: Git received certain
  tweaks to work around certain problems Mac OS X has (as I
  understand it) with handling UTF-8 on various filesystems it
  supports; in particular, see commits
  76759c7dff53e8c84e975b88cb8245587c14c7ba [1] and
  b856ad623e4f686815986c0b9341dd1bfd791e71 [2] which were released as
  part of v1.7.12.
[...]

And while we're at it, commit message of 76759c7 tells that in order
for the fixes to work, the core.precomposedunicode configuration
variable has to be set to 'true'.  Did you do that?  Did that help?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Why can't I push from a shallow clone?

[Konstantin Khomoutov]

On Thu, 25 Jul 2013 19:33:16 -0700
Gulshan Singh gsingh2...@gmail.com wrote:

 I've been trying to figure out why I can't push from a shallow clone
 (using --depth) to a repository. I've made simple examples where it
 works, but I've read that in doesn't work in every case. However, I
 can't come up with a case where it doesn't work. Googling gives this
 answer:
 http://stackoverflow.com/questions/6900103/why-cant-i-push-from-a-shallow-clone,
 but I don't completely understand the explanation, so I was hoping
 someone could explain it.

See also this thread [1] which originated from this SO question [2].

1. http://thread.gmane.org/gmane.comp.version-control.git/221634
2. http://stackoverflow.com/q/16077691/720999
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git on intranet

[Konstantin Khomoutov]

On Fri, 26 Jul 2013 16:21:28 +0200
Muhammad Bashir Al-Noimi mbno...@gmail.com wrote:

  I want to use Git over the local network in our company because the 
  internet connection isn't stable so I wonder how can I use git with 
  pull request (similar to Github)?

Depends on what feature set you imply when you refer to pull request.
The problem with the terminology here is that the term pull request
might refer both to a social act and to a formal technical action
supported by a particular software (Git-hosting or otherwise).  I mean,
it's perfectly OK for one developer to push a branch in a repository and
then ask another developer (directly, by mail or otherwise) to pull the
changes from that branch, integrating them into some other branch.
I think, for intranet this should cover 99% of use cases.
The github software platform allows to formalize this process by
providing web interface knobs to do pull requests -- this is useful
exactly because it stipulates contributions to a project by *random
people.*  Conversely, the people working on your projects in your
intranet are usually not random, and are usually well connected by
corporate e-mail, chat, phone and other means.

  As I read about Gitorious.org I found it most candidate but I'm not 
  sure is it supports this feature or maybe there is better open
  source solutions!
 
 Best search result I got is: http://stackoverflow.com/a/2593330 the
 user says that both *Gitolite* http://sitaramc.github.com/gitolite/
 and *Gitorious* http://gitorious.com/local_install/ are very hard
 to configure!!! What do you suggest?

As to gitolite, for me personally installing it was a matter of running
`apt-get install gitolite` on one of my Debian machines.  But
administering it might require some getting used to as it uses a
special administrative Git repository to manage public SSH keys for your
Git developers and configuration of repositories.  You will also need
to possess at least some level of knowledge about what a Git repository
is, after all.  But in any case, gitolite only manages repos and users,
it has no web UI and no format support for github-style pull requests.

Coming back to F/OSS turn-key Git-hosting solutions, GitLab [1]
supports github-style pull requests since some version.  It's written
in Ruby so I, personally, would not touch it to avoid administrative
nightmares when the next upgrade comes but YMMV.
Gitorious also seems to support merge requests [3] which are actually
the same thing, I fancy.  Again, Ruby.
Gitblit and Girocco seem not to support such a feature yet (but the
former appears to have it in the works [2]).

1. http://gitlab.org/
2. http://code.google.com/p/gitblit/issues/detail?id=215
3. http://gitorious.wordpress.com/2009/07/15/new-merge-request-functionality/
4. http://repo.or.cz/w/girocco.git
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problem setting up a shared git repository

[Konstantin Khomoutov]

On Thu, 5 Sep 2013 14:43:52 -0700 (PDT)
Eyal Zinder ezin...@yahoo.com wrote:

[...]
 The problem I faced later on was in parallel development, when
 changes were made to a file in one repository, and at the same time
 other changes made to the same file in another repository..  I
 couldh't push changes from the dev\foo to prod\foo or to origin..
[...]

Did Git tell you the push failed because of non-fast-forward update?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: coming from git, understanding mercurial branching

[Konstantin Khomoutov]

On Thu, 5 Sep 2013 21:27:14 -0500
Tim Chase g...@tim.thechases.com wrote:

[...]
 Do any git users here have good understanding Mercurial branches
 for the git user resources they've found helpful when working with
 Mercurial?  Preferably a for dummies resource with illustrations 
 comparison charts so I can see the big picture.

I found this guide [1] very useful back in the time I tried to grok
Mercurial.

1. http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to pull from windows box

[Konstantin Khomoutov]

On Thu, 16 Aug 2012 07:11:28 -0600
J.V. jvsr...@gmail.com wrote:

 We have a central/shared bare repo setup on a Linux box by our
 scc/build team.
 
 Each developer pulls/pushes to this repo.  I have two windows boxes 
 where I have cloned the repo.  I want to commit and then on my second 
 windows box pull from my other box and keep those in sync until it is 
 time to push to central.
 
 What do I need to setup on each Windows 7 box to get this working?

Create a regular Windows share for the project directory on the box
you want to fetch from, ensure your user from another box is able to
successfully authenticate on that share, and then on that box add
the created share as a remote like this:

git remote add otherbox file:thatbox/sharename

To fetch from that otherbox remote you then go like this:
1) Run Windows Explorer, navigate to \\thatbox\sharename,
   authenticate (if needed).  This will ensure all the next accesses
   will be automatically authenticated.
2) Do `git fetch otherbox`.

Of course, you can just attach that share as a network drive and then
modify the URL for your remote accordingly.

Note that since the repos are normal (non-bare) this will work well only
for fetches (see the FAQ for more info).
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: exporting a .git file ?

[Konstantin Khomoutov]

On Mon, 27 Aug 2012 15:32:40 +0100
Aaron Gray aaronngray.li...@gmail.com wrote:

 Is there anyway to get my git repository as a single file ?
Depends on what you really need.

If you need to export the repository *history* of one or more
references (branches or tags), use `git bundle` to create a
specially-formatted file which can be imported using Git on another
machine.

If you need to just export the snapshot of the files maintained in the
repository at the specified commit, use `git export`.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Clone to an SSH destination

[Konstantin Khomoutov]

On Mon, 3 Sep 2012 11:21:43 +0100 (BST)
Mark Hills mark.hi...@framestore.com wrote:

 How do I clone a repo _to_ a new repo over SSH? I tried:
 
   cd xx
   git clone --bare . gitserver:/scm/xx.git
   git clone --bare . ssh://gitserver/scm/xx.git

 This does not have the expected result, and instead a local path of
 the given name is created (eg. a 'gitserver:' directory)

No, `git clone` is intended to work with your local machine.
And I can't really imagine how it would work in a way you want.

 This seems to be a FAQ, but the only answer I can find (Google) is to 
 login to the server and create the repo, setup a remote and push to
 it. 
 This is quite cumbersome; we have a large team of devs who use a
 simple 'git clone' to an NFS directory, but we wish to retire NFS
 access.
 
 Is there a technical limiation preventing clone-to-ssh, or just
 something waiting to be implemented?

I think this is more a conceptual issue: such a remote cloning would
mean *creation* of a repository as part of the process.  I'm not aware
of any [D]VCS system which would routinely allow such a thing: usually
the creation of a repository is an administrative act, which is
distinct from regular (push/fetch) access to that repository.

gitolite kind of implements this (wild repos) [1], you could look if
it suits your needs.

Now back to your problem.

If you have NFS access, you can probably do proper cloning using NFS:
1) Export via NFS the directory in which you want your resulting
   bare repository located.
2) Do simple *local* clone (using paths accessed by NFS):
   git clone --bare /path/to/source/repo /path/to/destination/repo
3) Do certain fixups in the destination repo, if needed, then
   access it normally via SSH (or whatever protocol you prefer).

If you don't want to do this, then revert to a normal two-step
procedure:
1) Log into the server, create a repo by hand:
   git init --bare /path/to/repo
2) Push everything relevant from a source repo there:
   cd /path/to/local/repo
   git remote add origin ssh://gitserver/scm/xx.git
   git push origin refs/*:refs/*

Step (1) may depends on what server-side solution your need; for
instance, in gitolite you would be configuring a new repo in the
configuration file in your local clone of the gitolite admin repo and
pushing your changes to the server.

1. http://sitaramc.github.com/gitolite/wild.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Clone to an SSH destination

[Konstantin Khomoutov]

On Mon, 3 Sep 2012 14:07:48 +0100 (BST)
Mark Hills mark.hi...@framestore.com wrote:

[...]
  But I'm actually more curious about why you need this in the first
  place, there's a bunch of devs where I work as well, but they never
  have the need to create new repos on some NFS drive in this manner.
 
 Without a command-line onto the filesystem (either local or NFS), how
 do you create a new repository for a new project?
 
 We have a fairly large team on a diverse set of projects. Projects
 come and go, so it's a burden if the administrator is needed just to
 create repos.
 
 Likewise, it's a step backwards for the developer to need to login 
 themselves over SSH -- whereas 'git clone' is so easy to NFS.
 
  What are your devs doing when they do clone their current working 
  directory to some NFS location, maybe there's a better way to do it.
 
 Most projects start as a small test at some point; eg.
 
   mkdir xx
   cd xx
   git init
   write some code
   git commit
   ...
 
 When a project becomes more official, the developer clones to a
 central location; eg.
 
   git clone --bare . /net/git/xx.git
 
 This is the step that is inconvenient if only SSH access is available.

Well, then it looks you want something like github.
In this case look at some more integrated solution such as Gitlab [1]
-- I did not try it, but it looks like you import your users there and
then they can log in, add their SSH keys and create their projects.

I also think gitolite has some way to actually use regular SSH users
(or even users coming from a web server which is a front-end for Smart
HTTP Git transport, doing its own authentication).  This is explained
in [2], and I hope Sitaram could provide more insight on setting things
up this way, if needed  (I did not use this feature).

1. http://gitlabhq.com/
2. http://sitaramc.github.com/gitolite/g2/auth.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Bug report

[Konstantin Khomoutov]

On Fri, 5 Oct 2012 14:13:49 +0400
Муковников Михаил m.mukovni...@gmail.com wrote:

 There's a problem using git with files having cyrillic 'й' in their
 name, git just can't track them.
 
 uname: Darwin 12.2.0 Darwin Kernel Version 12.2.0: Sat Aug 25
 00:48:52 PDT 2012; root:xnu-2050.18.24~1/RELEASE_X86_64 x86_64 git
 version: 1.7.12.1 (from macports)
 
 Steps to reproduce:
 - git init
 - touch test_й
 - git status (should be untracked files present)
 - git add test_й
 - git status
 
 # Untracked files:
 #   (use git add file... to include in what will be committed)
 #
 # test_\320\270\314\206
 nothing added to commit but untracked files present (use git add to
 track)
 
 Could this be helped somehow?--

What this?  If you mean displaying escapes for UTF-8 bytes
representing that letter й, then try setting core.quotepath to false
for this repository and see if that helps.

More info can be found in the git-config manual page.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Fw: [git-users] How do I git-push to an FTP server?

[Konstantin Khomoutov]

On the git-users mailing list we're trying someone to help with
running `git push` over FTP.  That person is runnig Git 1.7.9.5
on Ubuntu 12.04.

Below is the trace captured while trying to perform such a faulty push.
The oddity (in my eyes) is that after uploading the files, Git executes
`git http-push` which manual page does not mention FTP at all.

So I'd like to ask experts on Git transports for any advice in this
situation.

Begin forwarded message:

Date: Fri, 5 Oct 2012 05:07:24 -0700 (PDT)
From: August Karlstrom fusio...@gmail.com
To: git...@googlegroups.com
Cc: August Karlstrom fusio...@gmail.com
Subject: Re: [git-users] How do I git-push to an FTP server?

Den fredagen den 5:e oktober 2012 kl. 11:38:43 UTC+2 skrev Konstantin 
Khomoutov:

 On Fri, 5 Oct 2012 01:24:21 -0700 (PDT) 
 August Karlstrom fusio...@gmail.com javascript: wrote: 

  I get the following error when I run `git push' in a repository 
  called test: 
  
  error: Cannot access URL ftp://my-ftp-server/git/test.git/, return 
  code 3 fatal: git-http-push failed 
  
  This is after having successfully cloned the repository from the 
  address above. 
 Try to run your command while having set GIT_TRACE=1 and 
 GIT_CURL_VERBOSE=1, like 

 $ GIT_TRACE=1 GIT_CURL_VERBOSE=1 git push 

 and post the results here (if you will fail to infer the cause from
 its output by yourself). 


Thanks for the input, Konstantin. Below is the output (with identifying 
info removed). I can't see what caused Uploading to a URL without a
file name at the end.

$ GIT_TRACE=1 GIT_CURL_VERBOSE=1 git push
trace: built-in: git 'push'
trace: run_command: 'git-remote-ftp' 'origin' 
'ftp://my-ftp-server/git/test.git'
* About to connect() to my-ftp-server port 21 (#0)
*   Trying my-ftp-ip... * Connected to my-ftp-server (my-ftp-ip) port
21 (#0)
 220-- Welcome to Pure-FTPd [privsep] [TLS] -- 
 220-You are user number 6 of 400 allowed. 
 220-Local time is now 11:23. Server port: 21. 
 220-This is a private system - No anonymous login 
 220 You will be disconnected after 15 minutes of inactivity. 
 USER my-username 
 331 User my-username OK. Password required 
 PASS my-password 
 230-User my-username has group access to:  my-group 
 230 OK. Current restricted directory is / 
 PWD 
 257 / is your current location 
* Entry path is '/'
 CWD git 
 250 OK. Current directory is /git 
 CWD test.git 
 250 OK. Current directory is /git/test.git 
 CWD info 
 250 OK. Current directory is /git/test.git/info 
 EPSV 
* Connect data stream passively
 500 Unknown command 
* disabling EPSV usage
 PASV 
 227 Entering Passive Mode ([not shown]) 
*   Trying my-ftp-ip... * Connecting to my-ftp-ip (my-ftp-ip) port 63983
 TYPE I 
 200 TYPE is now 8-bit binary 
 SIZE refs 
 213 59 
 RETR refs 
 150 Accepted data connection 
* Maxdownload = -1
* Getting file with size: 59
* Remembering we are in dir git/test.git/info/
 226-File successfully transferred 
 226 0.000 seconds (measured here), 1.34 Mbytes per second 
* Connection #0 to host my-ftp-server left intact
* Re-using existing connection! (#0) with host my-ftp-server
* Connected to my-ftp-server (my-ftp-ip) port 21 (#0)
 CWD / 
 250 OK. Current directory is / 
 CWD git 
 250 OK. Current directory is /git 
 CWD test.git 
 250 OK. Current directory is /git/test.git 
 PASV 
* Connect data stream passively
 227 Entering Passive Mode ([not shown]) 
*   Trying my-ftp-ip... * Connecting to my-ftp-ip (my-ftp-ip) port 63462
 SIZE HEAD 
 213 23 
 RETR HEAD 
 150 Accepted data connection 
* Maxdownload = -1
* Getting file with size: 23
* Remembering we are in dir git/test.git/
 226-File successfully transferred 
 226 0.000 seconds (measured here), 0.63 Mbytes per second 
* Connection #0 to host my-ftp-server left intact
trace: run_command: 'http-push' '--helper-status' 
'ftp://my-ftp-server/git/test.git/'
'refs/heads/master:refs/heads/master' trace: exec: 'git' 'http-push'
'--helper-status' 'ftp://my-ftp-server/git/test.git/'
'refs/heads/master:refs/heads/master' trace: exec: 'git-http-push'
'--helper-status' 'ftp://my-ftp-server/git/test.git/'
'refs/heads/master:refs/heads/master' trace: run_command:
'git-http-push' '--helper-status' 'ftp://my-ftp-server/git/test.git/'
'refs/heads/master:refs/heads/master'
* About to connect() to my-ftp-server port 21 (#0)
*   Trying my-ftp-ip... * Connected to my-ftp-server (my-ftp-ip) port
21 (#0)
 220-- Welcome to Pure-FTPd [privsep] [TLS] -- 
 220-You are user number 7 of 400 allowed. 
 220-Local time is now 11:23. Server port: 21. 
 220-This is a private system - No anonymous login 
 220 You will be disconnected after 15 minutes of inactivity. 
 USER my-username 
 331 User my-username OK. Password required 
 PASS my-password 
 230-User my-username has group access to:  my-group 
 230 OK. Current restricted directory is / 
 PWD 
 257 / is your current location 
* Entry path is '/'
* Uploading to a URL without a file name!
* Closing connection #0
error: Cannot access URL ftp://my

Re: Fw: [git-users] How do I git-push to an FTP server?

[Konstantin Khomoutov]

On Fri, 5 Oct 2012 15:46:33 +0200
Philippe Vaucher philippe.vauc...@gmail.com wrote:

  On the git-users mailing list we're trying someone to help with
  running `git push` over FTP.  That person is runnig Git 1.7.9.5
  on Ubuntu 12.04.
 
 I don't think vanilla git supports pushing over ftp.
 
 There are plugins like https://github.com/resmo/git-ftp tho.

git-ftp's functionality is completely orthogonal to `git push` -- this
script allows to sync a tree referenced by the specified Git commit
with a remote directory accessible via FTP, transferring only
new and modified files and deleting disappeared files and directories.
IOW, git-ftp is a (very handy) Git-powered *deployment* tool, not a
backend for `git push` or something like that.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git-svn too slow, contacts upstream svn repo

[Konstantin Khomoutov]

On Tue, 28 May 2013 15:42:57 +0800 (SGT)
Quark unixuser2000-f...@yahoo.com wrote:

  I have been using git-svn in an corporate environment where svn
  repo has lot of branches, (lot means  100). To avoid cloning all
  branches my config looks as below
[...]
 is this not right forum?

As a matter of fact, this mailing list is the only correct place to ask
questions like yours.  But this is free software after all -- people
who could answer your question may be busy/absent at the moment or even
not involved in the project anymore (in the worst case).  So be
prepared to wait some time.  Also be prepared for your particular
trouble not being solved.

In the meantime, I think Thomas provided you with valuable suggestions
in reply to your mirror post on git-users, so you could possibly
explore them.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: GIt error

[Konstantin Khomoutov]

On Mon, 17 Jun 2013 13:28:30 +
justin.sathyanat...@accenture.com wrote:

 For Below issue , O/S is Windows7.
[...]
 1.Iam getting error attached when cloning of repository is done:

What error?

 2.Also, when file is tried to be added,it gives error below:
 
 $ git add *
 fatal: unable to stat
 'src/development_architecture/integration_application_proj
 ect_template/provider_archetype/provider_archetype/src/main/resources/archetype-
 resources/__rootArtifactId__-data/src/main/java/com/accenture/afpj/sample/skelet
 on/visitor/data/VisitorRepositoryJpaImpl.java': Filename too long
[...]

This is a limitation of Git for Windows: the standard Windows API which
works with unmangled filenames limits their length to 260 characters
while your particular entry is 262 characters long.

AFAIK, there's no clean/easy way to make use of extended Windows API
which requires mangling filenames by adding the \\?\ to them.

You could read [1] for more details.

So it seems you have two options for now:

* Restructure the project.
* Use Git under Cygwin [2] which might not have this limitation
  (personally, I do not know whether it does).

P.S.

Please next time you ask consider doing two things:
* If you post your message to several groups, take care to mention this
  fact in each of them.
* Do not require anyone to do anything ASAP unless this claim is
  backed by your or your employer's wallet.

1. http://msdn.microsoft.com/en-us/library/aa365247#maxpath
2. http://cygwin.com/packages/git/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: GIt error

[Konstantin Khomoutov]

On Mon, 17 Jun 2013 17:47:07 +0400
Konstantin Khomoutov kostix+...@007spb.ru wrote:

  For Below issue , O/S is Windows7.
  1.Iam getting error attached when cloning of repository is done:
 
 What error?

Okay, the Microsoft Word document with two screenshots has been
scrubbed by the list software but passed through the git-users list
where you posted this as well; answering here.

The errors shown there most probably has the same nature: Git failed to
create a filesystem entry while attempting to check out a revision
after cloning the project.  So the error is not about cloning, it's
about checking out actual files to the work tree.

The rest is explained in my first reply.

[...]
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [git-users] Git clone fails with bad pack header, how to get remote log

[Konstantin Khomoutov]

On Mon, 29 Oct 2012 09:52:54 -0700 (PDT)
Kevin Molcard kev2...@gmail.com wrote:

 I have a problem with my build system.
 
 I have a remote server with a relatively large repository (around 12
 GB, each branch having a size of 3 GB). 
 
 I have also 2 build servers (Mac, Windows) that are cloning the repo
 from the remote.
 
 Sometimes (very often when several git clone are sent at the same
 time), I have the following error:
 
 remote: internal server error
 fatal: protocol error: bad pack header
 
 I know that it happens when the remote is compressing objects (thanks
 to `--progress -v` flags) because the last line of the log before the
 erro is: 
 remote: Compressing objects:  93% (17959/19284)   [K
 
  * So I have 2 questions, does anybody what is the problem and what
 should I do?
  * Is there a way to get a more precise log from the remote to debug
 this problem?

This reminds me of a bug fixed in 1.7.12.1 [1]:

* When git push triggered the automatic gc on the receiving end, a
  message from git prune that said it was removing cruft leaked to
  the standard output, breaking the communication protocol.

In any case, bugs should be reported to the main Git list (which is
git at vger.kernel.org), not here.
I'm Cc'ing the main Git list so you'll get any responses from there, if
any.

Kevin, please answer to this message (keeping all the Ccs -- use Reply
to group or Reply to all in your MUA) and describe exactly what Git
versions on which platforms your have.

1. https://raw.github.com/git/git/master/Documentation/RelNotes/1.7.12.1.txt
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Set core.ignorecase globally

[Konstantin Khomoutov]

On Fri, 2 Nov 2012 18:39:26 +0400
Kirill Likhodedov kirill.likhode...@jetbrains.com wrote:

 Currently, core.ignorecase is set to true on case insensitive system
 like Windows or Mac on `git init` and `git clone`, and this setting
 is local to the created/cloned repository.
[...]
 I suggest to set this globally by default when Git is installed,
 because there is little sense to have this option false on case
 insensitive systems (it will lead to confusions when renaming a file
 by changing only the case of letters). 

Case sensitivity is a property of a file system, not the OS.
What if I mount a device with ext3 file system via ext2fsd driver in on
my Windows workstation?  extN have POSIX semantics so it's pointless to
enforce case insensitivity on them.  The same possibly applies to NFS
mounts.

Also note that NTFS (at least by default) is case insensitive but is
case preserving, observe:

C:\tmpdir /b
foo

C:\tmprename foo Foo

C:\tmpdir /b
Foo

C:\tmpdel fOO

C:\tmpdir /b

C:\tmpver

Microsoft Windows XP [Версия 5.1.2600]

I don't really know what to make out of this, but I'd not change the
defaults until the reasons to do this are not really pressing (and
they're not for now).
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Set core.ignorecase globally

[Konstantin Khomoutov]

On Fri, 2 Nov 2012 19:03:37 +0400
Konstantin Khomoutov flatw...@users.sourceforge.net wrote:

  Currently, core.ignorecase is set to true on case insensitive system
  like Windows or Mac on `git init` and `git clone`, and this setting
  is local to the created/cloned repository.
 [...]
  I suggest to set this globally by default when Git is installed,
  because there is little sense to have this option false on case
  insensitive systems (it will lead to confusions when renaming a file
  by changing only the case of letters). 
 
 Case sensitivity is a property of a file system, not the OS.
 What if I mount a device with ext3 file system via ext2fsd driver in
 on my Windows workstation?  extN have POSIX semantics so it's
 pointless to enforce case insensitivity on them.  The same possibly
 applies to NFS mounts.
 
 Also note that NTFS (at least by default) is case insensitive but is
 case preserving, observe:
[...]

On the other hand, on NTFS, if I unset core.ignorecase or set it to
false locally, `git mv foo Foo` fails to rename a tracked file foo
with the destination file exists error.  I would say I would expect it
to work under the conditions I've just described.  Not sure if this
thould be considered a bug in Git for Windows or not -- would be great
to hear opinions of the msysgit port developers.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: how the commit ID come from in GIT?

[Konstantin Khomoutov]

On Mon, Nov 05, 2012 at 12:04:06PM -0800, hong zhang wrote:

 Could anyone explain how the git commit ID will include all the files
 that devloper makes changes on?
 
 How git commit ID works?

To expand on the answer provided by Magnus, I would also suggest reading
the classic Git from the bottom up document [1], and if you want a
totally informal and fun introduction to how these cryptographic hashes
come about and why they are useful, I suggest reading
The Git Parable [2].

1. http://newartisans.com/2008/04/git-from-the-bottom-up/
2. http://tom.preston-werner.com/2009/05/19/the-git-parable.html

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [git-users] git compilation problem

[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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: three questions: proper forum? reverting changes to the working directory

[Konstantin Khomoutov]

On Thu, 8 Nov 2012 08:26:22 -0600
McKown, John john.mck...@healthmarkets.com wrote:

 1) is this the proper forum for asking general git usage questions,
 such as how to? If not, what is?

This list is okay for the general usage questions.
But since it's the place where the development questions are discussed
as well, and patches get posted, you might find its signal-to-noise
ratio to be not very convenient for a casual user.

For mere mortals, we have another list, git-users, hosted on Google
Groups [1].  It deals only with problems Git newbies have with Git.

 2) I am unsure that I did things the proper way. I have a git
 maintained subdirectory. I made some changes and saved them in the
 working directory, but did not git add or git commit them. I then
 decided that I really messed up what I was doing (basically
 reformatting some source code). So to revert the changes back to what
 was last committed, I did a git reset --hard HEAD. I think this is
 the proper way. But I picked up that command in the section of the
 documentation which was talking about abandoning a git merge
 attempt. What I did worked, but is it the proper way? If not, what
 is?

Yes, that was the proper way.  A failed Git merge attempt could be
considered as just another case of a messed-up state of the work tree
and the index.

You might want to read the Reset Demystified [2] document for a
friendly descriptions of how different ways to invoke `git reset`
affect the repository, the index and the work tree.
 
 3) More generically, suppose I have a file in my working directory
 that I want to put back the way it was n commits ago. The best that
 I can see, so far, is git show HEAD~n:file |file, replacing the
 n and file with appropriate values.

`git checkout` is able to fetch specific versions of the specified
files if called like this:

$ git checkout HEAD~n -- filename 

1. http://groups.google.com/group/git-users/
2. http://git-scm.com/2011/07/11/reset.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Can I zip a git repo without losing anything?

[Konstantin Khomoutov]

On Mon, 26 Nov 2012 04:55:10 +
Carl Smith carl.in...@gmail.com wrote:

 After suggesting using zip files to move our projects around, I was
 told that you can not zip a git repo without loosing all the history.
 This didn't make sense to me, but two people told me the same thing,
 so I wasn't sure. I think they may have been confusing the zipped file
 you can download from GitHub with a zipped git repo.
 
 If someone could put me straight on this, I'd really appreciate it.

To amend the already provided answer -- if you need to move repos
around using the sneakernet, the tool you should probably use is
`git bundle`.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Understanding When to Use Branches

[Konstantin Khomoutov]

On Tue, 08 Jan 2013 08:46:21 -0500
gw1500 wtriker@gmail.com wrote:

 As a git noobie I am beginning get get my head around git's version
 control philosophy. I am now trying to understand the purposes of
 branches or rather when to use them. In my case I have a Java
 application under version control with git. I am planning to port it
 into a mobile app. Is that an appropriate use of branches or should it
 be created as a new repository? What is the relationship between the
 same source code in different branches? Do changes to code in one
 branch get ported to another branch somehow or do all changes then
 have to be made twice? The documentation tells how to branch but not
 the general philosophy behind it from a best practices standpoint.
 Thanks in advance for any insight.

Supposedly you should start with the chapter on branching in
The Book [1] and then read two classic blog posts [2, 3] describing two
different branching models.  The branching models described there are
not the only two possible models to use with Git, but they are different
enough to give you a good overview of possibilities.
Note that mere googling for git branching model would yield a fair
number of blog posts on people's pet branching models; these two
documents just appear to be more classic than others.

If you have difficulty to even grasping the concept of branches and [1]
feeld hard to digest, try first reading The Git Parable [4] which, I
think, is the friendliest possible introduction to the basics of DVCS,
branching included.

1. http://git-scm.com/book/en/Git-Branching
2. http://nvie.com/posts/a-successful-git-branching-model/
3. http://scottchacon.com/2011/08/31/github-flow.html
4. http://tom.preston-werner.com/2009/05/19/the-git-parable.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git checkout bug on Win7 x64

[Konstantin Khomoutov]

On Fri, 11 Jan 2013 11:30:01 +0400
Ishayahu Lastov meoc...@mail.ru wrote:

[...]
 As I understand after last git checkout in git status I should see
 that I gave no changes. It looks like an bug, isn't it?

Looks like an EOL-conversion problem rather typical to Windows, see
http://stackoverflow.com/a/2016426/720999
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Question re. git remote repository

[Konstantin Khomoutov]

On Wed, 16 Jan 2013 17:49:09 +
Lang, David david.l...@uhn.ca wrote:

 We're just in the process of investigating a versioning tool and are
 very interesting in git. We have one question we're hoping someone
 can answer. In regards to the repositories, I think I understand
 correctly that each developer will have a local repository that they
 will work from, and that there will also be a remote repository
 (origin) that will hold the original version of the project.

The name origin is purely arbitrary: any local repository might have

 It appears from the limited reading I've done that the remote
 repository must be hosted at github.com. Is this the case?
Of course not.  github is just a Git hosting provider.  There are
plenty of them -- both commercial and not-for-profit (a well-known
service bitbucket.org is one example).

 Ideally we'd prefer to simply create our remote repository on a drive
 of one of our local network servers. Is this possible?

Yes, this is possible, but it's not advised to keep such a reference
repository on an exported networked drive for a number of reasons (both
performance and bug-free operation).

Instead, the canonical way to host reference repositories is to make
them accessible via SSH or via HTTP[S].  To do this, a server running
some POSIX OS (Linux- or *BSD-based) is the best bet.  Both kinds of
access require Git itself installed on the server.  Obviously, SSH
access requires an SSH server software (such as OpenSSH) as well and
HTTP[S] access requires a web server (such as Apache).  Of course,
everything mentioned is available on any sensible OS you might install
on your server.  Read-only access might be provided by a special tool
named Git daemon which is a part of Git.

If you have more than a couple of developers you might want to install
certain front-end Git software on the server which provides for
virtualized Git users and fine-grained control over who can do what.
Using gitolite [3] for this is the current trend.

Web-browsing for your repositories, if needed, is usually provided by
the tool named gitweb [4].

Everything I've just summarised is well explained in [5] and [6] (as an
addendum).

Another approach is to set up a turn-key solution such as GitLab [1]
or gitblit [2].

1. http://gitlabhq.com/
2. http://gitblit.com/
3. https://github.com/sitaramc/gitolite
4. https://git.wiki.kernel.org/index.php/Gitweb
5. http://git-scm.com/book/en/Git-on-the-Server
6. http://git-scm.com/2010/03/04/smart-http.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Question re. git remote repository

[Konstantin Khomoutov]

On Wed, 16 Jan 2013 10:21:56 -0800
Jeff King p...@peff.net wrote:

Thanks for elaborating on the origin -- I intended to write up on its
special status but got distracted and sent my message missing that
bit ;-)

[...]
   Ideally we'd prefer to simply create our remote repository on a
   drive of one of our local network servers. Is this possible?
  
  Yes, this is possible, but it's not advised to keep such a
  reference repository on an exported networked drive for a number
  of reasons (both performance and bug-free operation).
 
 I agree that performance is not ideal (although if you are on a fast
 LAN, it probably would not matter much), but I do not recall any
 specific bugs in that area. Can you elaborate?

This one [1] for instance.  I also recall seing people having other
mystical problems with setups like this so I somehow developed an idea
than having a repository on a networked drive is asking for troubles.
Of course, if there are happy users of such setups, I would be glad to
hear as my precautions might well be unfounded for the recent versions
of Git.

1. http://code.google.com/p/msysgit/issues/detail?id=130
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git-core vs git package on ubuntu

[Konstantin Khomoutov]

On Fri, 25 Jan 2013 14:50:24 +0100
Mario Michael Krell supermari...@googlemail.com wrote:

 In your documentation you say, that git should be installed on Unix
 using
 
 apt-get install git-core

Note that Ubuntu is not Unix.

 Unfortunately it tells the user, that this package is obsolete and
 git should be used instead. Is this an error in the package manager
 or in the website documentation?

Neither of them.  Git was packaged for Debian (and hence appeared in
Ubuntu) when another package with the name git already existed in the
archive, and was unrelated to Git.  So the Git package maintainer
picked the name git-core.  After that, the maintainers of both
packages discussed this issue and the maintainer of the original
package named git agreed to change the name of his package, and then,
subsequently, git-core has been renamed to git, and the git-core
package has been turned into transitional dummy obsolete package.

Now, whenever you're trying to install the git-core package, the
package system tells you it's obsolete and suggests the correct
package to install.  After some time (the next OS release or later),
the git-core package will be removed completely from the archive.

This is the standard way to handle such situations in Debian and its
derivatives, so nothing special here.  The documentation on the
whatever site you were referring to should probably be updated as
git-core is obsolete even in the current stable release of Debian [1].
I'm not sure which LTS release of Ubuntu is currently supported, but
you might check the state of the git-core package in it yourself,
using [2].

1. http://packages.debian.org/squeeze/git-core
2. http://packages.ubuntu.com
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Feature request: Allow extracting revisions into directories

[Konstantin Khomoutov]

On Sun, Feb 03, 2013 at 03:18:05PM +0100, Robert Clausecker wrote:

 git currently has the archive command that allows to save an arbitrary
 revision into a tar or zip file. Sometimes it is useful to not save this
 revision into an archive but to directly put all files into an arbitrary
 directory. Currently this seems to be not possible to archive directly;
 the only way I found to do it is to run git archive and then directly
 unpack the archive into a directory.
 
 git --git-dir REPO archive REVISION | tar x
 
 It would be nice to have a command or simply a switch to git archive
 that allows the user to put the files of REVISION into a directory
 instead of making an archive.

You could use plumbing commands combined with a throwaway custom index
file and a separate work tree which will receive the tree at REVISION:

export GIT_WORK_TREE=/path/to/dest/directory
export GIT_DIR=/path/to/repo/.git
export GIT_INDEX_FILE=$GIT_WORK_TREE/.index
git read-tree REVISION
git checkout-index -a
rm -f $GIT_INDEX_FILE

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Pushing a git repository to a new server

[Konstantin Khomoutov]

On Sun, Feb 10, 2013 at 04:00:56PM -0500, Ethan Reesor wrote:

 I'm looking to make a command to push a git repo to a new server. The
 way I just did it is as follows:
 
 localhost git clone --bare /path/to/MyRepo /path/to/tmpdir/MyRepo.git
 localhost tar xz /path/to/tmpdir/MyRepo.git | ssh myuser@remotehost
 tar cz \~/  # If I don't escape '~', my local machine expands it
 localhost ssh myuser@remotehost
 remotehost sudo chown -R git:git MyRepo.git

What's wrong with
$ ssh myuser@remotehost 'mkdir /path/to/MyRepo.git; cd $_; git init --bare'
$ git push --all git@remotehost:MyOtherRepo.git
?

 The reason I had to use my user is the git user's shell is git-prompt

There's no such thing as git-prompt.  The restricted login shell for
SSH-only access typically used for such a virtual Git user is
git-shell.

 and ~git/git-shell-commands is empty. I have repos set up using
 'git@remotehost:MyOtherRepo.git' as the remote and everything works.
 
 How do I make a git command that can talk to the server using
 git-prompt like the other commands do?

It's not really clear what do you want to achieve.
The reason the git-shell shell is *restricted* (read its manual page)
is to shrink the surface of possible attacks in the case the shell
account used for accessing Git repos over SSH is compromized (the key or
password stolen, for instance).  This is achieved by only allowing
commands like git-upload-pack etc in the shell (no general file
manipulation commands etc).  So what creating git command that can
talk to the server using git-prompt ... would really buy you?

I think the way to go is to start using gitolite [1] or implement by
hand a subset of what it does (a custom login shell which is allowed to
do certain things in a special area of the filesystem designated to keep
Git repositories) or just set up a special account on the server
(git-admin, for instance) which would have a regular login shell set
for it and would be in the same group as the user git (or even have
the same UID) so that they could share the files they create (subject to
active umasks of processes run as both users though).

1. https://github.com/sitaramc/gitolite

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git svn init throws Not a git repository (or any of the parent directories): .git

[Konstantin Khomoutov]

On Wed, 13 Feb 2013 14:01:36 +0100
amccl...@gmail.com amccl...@gmail.com wrote:

 I have problem with git svn init:
 When I execute
 git svn init svn+ssh://usern...@example.com/path/repo
 I see:
 fatal: Not a git repository (or any of the parent directories): .git
 Already at toplevel, but .git not found
  at /usr/lib/git-core/git-svn line 342

Are you doing `git init` first before running `git svn init ...`?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: running git from non-standard location on Mac

[Konstantin Khomoutov]

On Thu, 21 Feb 2013 09:48:36 +
James French james.fre...@naturalmotion.com wrote:

 I wonder if someone could help me. I installed git on a Mac and then
 I copied the install somewhere else (which I do want to do, trust
 me).  I'm now having trouble with git svn. I'm getting Can't locate
 Git/SVN.pm in @INC...
 
 I've added the bin folder to PATH. What else do I need to do? Do I
 need to use -exec-path=/MyPathToGit/libexec/git-core? How do I change
 the content of @INC?
 
 Apologies if this is a dumb question, I'm not much of a unix man.

`git svn` is implemented in Perl (which is supposedly bundled with your
Git package, but I'm not sure), and SVN.pm is a Perl module (a
library written in Perl, .pm stands for Perl Module).

@INC is an internal variable used by Perl to locate its modules.
Its contents is partially inferred from the Perl's installation
location and partially from the environment.

This [1] should help you get started with affecting @INC.

1. http://stackoverflow.com/a/2526809/720999
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git-scm.com/book/ru -- incorrect next link containing a question mark

[Konstantin Khomoutov]

On Thu, 7 Mar 2013 00:01:31 -0800 (PST)
Aleksey Rozhkov ekker...@gmail.com wrote:

 The page http://git-scm.com/book/ru/
 Введение-Первоначальная-настройка-Git contains incorrect link next
 Now this link to the page 
 http://git-scm.com/book/ru/Введение-Как-получить-помощь? , but this
 page does not exist

I would say ? is just interpreted as a request part of the URL.

Indeed, the page source contains:

a href=/book/ru/Введение-Установка-Gitprev/a | a
href=/book/ru/Введение-Как-получить-помощь?next/a

so the question mark is really included verbatim.

 So, correct link is 
 http://git-scm.com/book/ru/Введение-Как-получить-помощь%3F

Good point, thanks.  I Cc'ed the main Git list and made the message
title a bit more clear.

To the Pro Git book maintainer: is it possible to somehow fix the HTML
generation script to URL-encode any special characters if they're to
appear in an URL?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Updating not actual branch

[Konstantin Khomoutov]

On Tue, 12 Mar 2013 14:22:00 +0100
Jan Pešta jan.pe...@certicon.cz wrote:

 I have a question if there is a posibility tu update a branch which
 is not actual working copy.
 
 I have following situation:
 
 A - B - C - I - J   master
\ - D - E - F   feature 1
  \ G - H feature 2 (working copy)
 
 I would like tu update whole tree with latest changes in master
 
 A - B - C - I - J  master
\ - D* - E* - F*  feature 1
\ G* - H*
 feature 2 (working copy)
 
 
 Is there some way how to do it without swithing to each branch and
 update them manually?

It's partially possible to do: you are able to forcibly fetch a remote
object into any local branch provided it's not checked out.  Hence, in
your case you'll be able to update any branch excapt for feature 2.

To do this, you could use the explicit refspec when fetching, like this:

$ git fetch origin +src1:dst1 '+blooper 1:feature 1'

(Consult the `git fetch` manual for more info on using refspecs.)

One possible downside is that I'm not sure this approach would play
nicely with remote branches, if you have any.  I mean, direct fetching
into local branches will unlikely to update their matching upstream
remote branches.

So supposedly a better way to go would be to write a script which would
go like this:
1) Do a simple one-argument `git fetch remotename` to fetch from
   the specified remote and update its remote branches.
2) Run `git for-each-ref`, and for each local branch found first check
   whether it's currently checked out (that is, HEAD points at it)
   and ignore the branch if it is; otherwise do `git update-ref`
   updating the branch pointer from its upstream branch -- referring to
   that using the ref@{upstream} syntax.
   (Consult the gitrevisions manual for more info on this syntax.)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: building git ; need suggestion

[Konstantin Khomoutov]

On Fri, 15 Mar 2013 13:44:15 +0100
Fredrik Gustafsson iv...@iveqy.com wrote:

[...]
 The webgui that's most populair is cgit and git-web. They don't do ACL
 afaik.

gitweb passes around branch names using a specific parameter in the
GET queries it operates on, like
http://gitweb.domain.local/?p=repo.git;a=shortlog;h=refs/heads/master

So I think it should be possible to somehow implement different
access rules in the front-end web server based on the qieries.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: SSH version on Git 1.8.1.2 for Windows is outdated.

[Konstantin Khomoutov]

On Fri, 15 Mar 2013 11:05:11 +0100
Kristof Mattei kris...@kristofmattei.be wrote:

 We're having issues with the version of SSH included in git version
 1.8.1.msysgit.1 (Git-1.8.1.2-preview20130201.exe)
 
 The included version of SSH is from 2007:
 
 C:\Program Files (x86)\Git\bin - Oldssh -V
 OpenSSH_4.6p1, OpenSSL 0.9.8e 23 Feb 2007
 
 Updating the OpenSSH component (downloaded with Cygwin, cumbersome!!!)
 resolves the issue:
 
 C:\Program Files (x86)\Git\binssh -V
 OpenSSH_6.1p1, OpenSSL 1.0.1e 11 Feb 2013
 
 Is there any way you can incorporate this update in the installer?

Yes, you should grab the msysGit (the Git for Windows build
environment) [2], tweak it to include the new OpenSSH binary, ensure it
builds and works OK and then send a pull request (or post your patchset
to the msysgit mailing list [3].

A sort of crash course on how to get started is [1].
The main page for the msysGit/Git for Windows development is [4].

Note that there should be no Cygwin involved, of course.
Git for Windows is built completely from the sources of all the
components it includes, using MinGW/MSYS so no component of Git for
Windows depends on the Cygwin runtime DLL.

1. https://github.com/msysgit/msysgit/issues/102#issuecomment-13572331
2. http://github.com/msysgit/msysgit
3. http://groups.google.com/group/msysgit
4. http://msysgit.github.com/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git build fails on `make`, undefined references in libcrypto.a.

[Konstantin Khomoutov]

On Sun, Mar 17, 2013 at 10:03:37PM -0600, zero modulo wrote:

 $ LDFLAGS=-L/sandbox/builds/lib CPPFLAGS=-I/sandbox/builds/include
 ./configure --prefix=$PREFIX
 
 $ make
 […]
 /sandbox/builds/lib/libcrypto.a(dso_dlfcn.o): In function 
 `dlfcn_globallookup':
 dso_dlfcn.c:(.text+0x1b): undefined reference to `dlopen'
[...]
 make: *** [git-imap-send] Error 1

FYI, I've already tried to answer this exact question [1] with no
comments from the OP.

1. http://serverfault.com/a/488604/118848

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git status takes 30 seconds on Windows 7. Why?

[Konstantin Khomoutov]

On Wed, 27 Mar 2013 11:39:31 -0500
Jim Kinsman jakins...@gmail.com wrote:

 git status takes 30 seconds on Windows 7. Here are some stats:
[...]
 What can I do??? This is so slow it is unbearable.
 By the way i've done git gc several times and nothing changed.

You could try some voodoo [1] or experimental caching features [2].

1. http://groups.google.com/group/msysgit/browse_thread/thread/02e3c0e046f07215
2. 
http://groups.google.com/group/msysgit/browse_thread/thread/7cbfe3ca452650d1/93ce48e3875f7416
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problems pushing???

[Konstantin Khomoutov]

On Sun, Jul 08, 2012 at 02:12:46AM -0700, pbGit wrote:

   I have installed git locally to my machine.  It is running mac os lion. 
 This is intended to be the remote machine too. I have followed, what I think
 is the correct way to do this, using 
 http://www.petermac.com/setup-git-local-and-remote-repositories/ this .  All
 seemed to be ok until I tried to push.  When I try the following command.
 
 git push --all --repo=project
 
 I get the following output
 
 Counting objects: 12, done.
 Delta compression using up to 4 threads.
 Compressing objects: 100% (11/11), done.
 Writing objects: 100% (12/12), 5.23 KiB, done.
 Total 12 (delta 1), reused 0 (delta 0)
 remote: error: refusing to update checked out branch: refs/heads/master
[...]
 Hope someone can help with this because I have spent a bit of time trying to
 solve this and still stuck!!!
Becasue pushing to a so-called non-bare repository (this is a normal
repository, in which there is a work tree) either has no sense or
requires extra steps to reconcile the results of pushing with the
repository's work tree.  Most probably you should reconsider your
workflow.

Read [1] for an in-depth explanation.
Googling for receive.denyCurrentBranch will also provide you with
a number of useful links (such as stackoverflow discussions).

1. http://sitaramc.github.com/concepts/bare.html

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Problems pushing???

[Konstantin Khomoutov]

On Sun, Jul 08, 2012 at 01:52:03PM +0200, Holger Hellmuth wrote:

http://www.petermac.com/setup-git-local-and-remote-repositories/ this .  All
 
 The recipe at this address seems to have a --bare parameter
 missing at the git init in step 7
The OP stated that «This is intended to be the remote machine too.»
wich hints he wants to also receive changes to this repo from the
outside.
Supposedly he should stick to pulls only.
Or set up a bare repo on the local machine and then clone it to its
working repo using a plain path like /path/to/that/shared/repo.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git and Quilt

[Konstantin Khomoutov]

On Mon, 09 Jul 2012 13:57:09 +0200
Jimmy Thrasibule thrasibule.ji...@gmail.com wrote:

 I have a core project on which I maintain a set of patches using
 Quilt. This allows me to make changes to the project without touching
 the files so I can upgrade to new versions easily.
 
 I keep my patches and the core project in a Git repository. When I
 want to change something, I apply my patches using Quilt, then I
 revert all my changes and I just commit the resulting patch.
 
 I would like to have a branch where all my patches are applied to
 deploy the code but I can't find any good way to do this.
 
 If I create a new branch from master and apply the patches, I will
 have conflicts on the next merge. I need something to apply the
 patches before the merge (maybe using one of the hooks?).

Isn't what you're doing a perfect fit for rebasing [1]?
That is, you keep your changes as a series of commits on top of your
upstream branch and each time you're about to bring upstream changes
in, you rebase your local branch on top on the updated upstream branch.

1. http://git-scm.com/book/en/Git-Branching-Rebasing
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Feature request: fetch --prune by default

[Konstantin Khomoutov]

On Thu, 19 Jul 2012 18:21:21 +0200
Alexey Muranov alexey.mura...@gmail.com wrote:

[...]
 I do not still understand very well some aspects of Git, like the
 exact purpose of remote tracking branches (are they for pull or for
 push?), so i may be wrong.
This is wery well explained in the Pro Git book, for instance.
And in numerous blog posts etc.

 However, i thought that a user was not
 expected to follow the moves of a remote branch of which the user is
 not an owner: if the user needs to follow the brach and not lose its
 commits, he/she should create a remote tracking branch.
This would present another namespacing issue: how would you name the
branches you're interested in so that they don't clash with your own
personal local branches?  You'd have to invent a scheme which would
encode the remote's name in a branch name.  But remote branches already
do just this.  So you create a remote tracking branch when you intend
to actually *develop* something on that branch with the final intention
to push that work back.

  So I think it would be a lot more palatable if we kept reflogs on
  deleted branches. That, in turn, has a few open issues, such as how
  to manage namespace conflicts (e.g., the fact that a deleted foo
  branch can conflict with a new foo/bar branch).
 
 I prefer to think of a remote branch and its local copy as the same
 thing, which are physically different only because of current real
 world/hardware/software limitations, which make it necessary to keep
 a local cache of remote data.  With this approach, reflogs should be
 deleted with the branch, and there will be no namespace conflicts.
It appears, the distributed nature of a DVCS did not fully sink into
your mindset yet. ;-)
Looks like you mentally treat a Git remote as a thing being used to
access a centralized reference server which maintains a master copy
of a repository, of which you happen to also have a local copy.
Then it's quite logically to think that if someone deleted a branch in
the master copy, everyone downstream should have the same
remote branch deleted to be in sync with that master copy.
But this is not the only way to organize your work.
You could fetch from someone else's repository and be interested in
their branch foo, but think what happens when you fetch next time from
that repo and see Git happily deleting your local branch thatremote/foo
simply because someone with push access deleted that branch from the
repo.  This might *not* be what you really want or expect.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: pushing branches

[Konstantin Khomoutov]

On Fri, 20 Jul 2012 12:26:09 -0300
Thiago Farina tfrans...@gmail.com wrote:

 How can I push a working branch to github inside it?
 
 E.g:
 
 # On master:
 $ git checkout -b feature-work
 
 # On feature-work
 # vi, hack, commit, ready to push
 $ git push origin master # here I expected it would working pushing my
 commits to a feature-work branch in github. Or if I omit master it
 gives me a [rejected] error.
$ git push origin master
means update the branch 'master' in the remote repository with the
contents of the branch 'master' in the local repository.
Read the git push manual.

 $ git checkout master
 $ git push origin feature-work # Now the branch is pushed.
Sure, but it has nothing to do with the previous checkout command: you
just told Git to push the contents of your local branch feature-work
to a remote branch feature-work which presumably does not exist and
gets created as a result of your push.

If you want to update the remote master branch with the contents of
your local feature-work branch, do
$ git push origin feature-work:master

As stated below, you should really read the git push manual and reading
through the appropriate sections of the http://git-scm.com/book is also
highly advised.

Also consider reading about the push.default configuration variable
in the git config manual--this might save you from scratching your head
when you try to do simple `git push origin` without specifying any
branches: here again your expectation might differ from the Git
defaults.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: GIT smart http vs GIT over ssh

[Konstantin Khomoutov]

On Tue, Jul 31, 2012 at 08:36:07AM +0530, vishwajeet singh wrote:

 Just wanted to know the difference between smart http and ssh and in
 what scenarios we need them
 I am setting up a git server,  can I just do with smart http support
 or I need to enable the ssh support to use git effectively.
 As I understand github provides both the protocols, what's the reason
 for supporting both protocols.
http://git-scm.com/book/en/Git-on-the-Server-The-Protocols
http://git-scm.com/2010/03/04/smart-http.html

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git send-pack: protocol error: bad band #50

[Konstantin Khomoutov]

On Thu, 11 Apr 2013 07:49:44 +0100
João Joyce joao.jo...@netcabo.pt wrote:

[...]

 but I am getting the following error:
  git send-pack: protocol error: bad band #50
  fatal: The remote end hung up unexpectedly
 
 It seems that something is failing on the remote side but I can't
 find any reference to this protocol error.

I should add that the OP first asked this question on SO [1] and I
advised him to simply run `git --version` on the remote via SSH to
verify Git is working there, and it worked OK.

Another thing the OP failed to provide is the info on his setup.
To cite his message posted to git-users [2]:

 I am using ubuntu 12.10 in my local machine and 12.04 in the remote
 (which is a VPS hosting). The git version is 1.7.9.5 on both.

Hope this might help tracking down the issue.

1. http://stackoverflow.com/q/15921202/720999
2. https://groups.google.com/forum/?fromgroups=#!topic/git-users/eJXASG1GlDA
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git crash in Ubuntu 12.04

[Konstantin Khomoutov]

On Thu, 11 Apr 2013 15:50:31 +0530
Sivaram Kannan siva.de...@gmail.com wrote:

[...]
 Output of coredump gdb:
 
 gitadmin@gitserver:/var/crash/dump$ gdb git CoreDump
 GNU gdb (Ubuntu/Linaro 7.4-2012.04-0ubuntu2.1) 7.4-2012.04
 Copyright (C) 2012 Free Software Foundation, Inc.
 License GPLv3+: GNU GPL version 3 or later
 http://gnu.org/licenses/gpl.html This is free software: you are
 free to change and redistribute it. There is NO WARRANTY, to the
 extent permitted by law.  Type show copying and show warranty for
 details. This GDB was configured as x86_64-linux-gnu.
 For bug reporting instructions, please see:
 http://bugs.launchpad.net/gdb-linaro/...
 Reading symbols from /usr/bin/git...(no debugging symbols
 found)...done. BFD: Warning: /var/crash/dump/CoreDump is truncated:
 expected core file size = 600195072, found: 1114112.

^^^ Try to issue the

$ ulimit -c unlimited

command in your shell before attempting the cloning -- this should
remove the upper limit on the core file size.  And try look for the core
file in the current directory after the crash occurs.  I'm not sure
Ubuntu's crash interceptor won't kick in, but just in case...
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git crash in Ubuntu 12.04

[Konstantin Khomoutov]

On Fri, 12 Apr 2013 18:58:24 +0530
Sivaram Kannan siva.de...@gmail.com wrote:

  ^^^ Try to issue the
 
  $ ulimit -c unlimited
 
 Have set the git user's crash limit to 1GB in
 /etc/security/limits.conf and still getting the same error when
 issuing gdb to the crash file.

Yep, suppsedly in Ubuntu it's not that easy to just get a plain old
coredump file -- see below.

  command in your shell before attempting the cloning -- this should
  remove the upper limit on the core file size.  And try look for the
  core file in the current directory after the crash occurs.  I'm not
  sure Ubuntu's crash interceptor won't kick in, but just in case...
 
 You mean, /usr/bin/git? crash file for git is getting created each
 time it crashes in /var/crash.
 
 Can you please tell me what else I could try?

Googling for ubuntu+disable+crash turns up that your Git crashes are
handled by a system-wide tool called apport [1].

Considering this, I would try to explore two routes:

* [1] Tells that apport has a special tool, apport-retrace, which is
  said to be able to download available matching debug packages, if
  any, and generate the stack traces.  Basically this would do what
  Thomas advised you to attempt to do using GDB.

* Try to disable apprort permanently and then crash Git normally,
  so that apport does not interfere with the crash and the kernel is
  able to generate a regular core file in your current directory.
  Be sure to verify the core-file-size limit has a sensibly large
  value in your shell before attempting to do that.

 Would upgrading to the 1.8.2.1 - latest in Ubuntu PPA would help?

Yes, this is a viable way to try solving the problem.
*But* there's a downside: the crash you're experiencing might affect
later Git versions as well as yours.  And if you just throw your hands
there, the bug will continue to be unfixed.  Hence I urge you to be a
good F/OSS user and help the Git devs investigate the case.

1. https://wiki.ubuntu.com/Apport
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git log - crash and core dump

[Konstantin Khomoutov]

On Wed, 17 Apr 2013 13:14:48 +0400
Ivan Lyapunov dron...@gmail.com wrote:

 netbeans use some integrated git wrapper and I don't know about JGit
 source base or not. In Eclipse we use Egit. Also all broken commits
 limited to november 2012, but we still continue to use the same
 development environments without any problems

Does the same also mean of the same version?
I mean that if, say, you managed to update netbeans after November, 2012
that would explain a lot as the update might just silently pull
a fix for the Git-interfacing code.  The same might apply to Git itself
as well.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Pushing/fetching from/into a shallow-cloned repository

[Konstantin Khomoutov]

The git-clone manual page, both [1] and my local copy coming with
Git for Windows 1.8.1, say about the --depth command-line option:

   --depth depth

 Create a shallow clone with a history truncated to the specified
 number of revisions. A shallow repository has a number of
 limitations (you cannot clone or fetch from it, nor push from nor
 into it), but is adequate if you are only interested in the recent
 history of a large project with a long history, and would want to
 send in fixes as patches.

But having done a shallow clone (--depth=1) of one of my repositories,
I was able to record a new commit, push it out to a reference bare
repository and then fetch back to another clone of the same repository
just fine.  I have then killed my test commit doing a forced push from
another clone and subsequently was able to do `git fetch` in my shallow
clone just fine.

So I observe pushing/fetching works OK at least for a simple case like
this one.

Hence I'd like to ask: if the manual page is wrong or I'm observing
some corner case?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Pushing/fetching from/into a shallow-cloned repository

[Konstantin Khomoutov]

On Thu, 18 Apr 2013 13:52:33 +0400
Konstantin Khomoutov kostix+...@007spb.ru wrote:

 The git-clone manual page, both [1] and my local copy coming with
 Git for Windows 1.8.1, say about the --depth command-line option:

[...]

Oops, by [1] I wanted to refer to this version:
https://www.kernel.org/pub/software/scm/git/docs/git-clone.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Pushing/fetching from/into a shallow-cloned repository

[Konstantin Khomoutov]

On Thu, 18 Apr 2013 15:46:12 -0700
Junio C Hamano gits...@pobox.com wrote:

 Philip Oakley philipoak...@iee.org writes:
 
  So I observe pushing/fetching works OK at least for a simple case
  like this one.
 
  Hence I'd like to ask: if the manual page is wrong or I'm observing
  some corner case?
  --
  The manual is deliberately misleading.
 
 Yes, it is erring on the safe side.
 
 It was not coded with the case where the gap widens (e.g. either
 side rewinds the history) in mind as you explained; for simple cases
 the code just happens to work, but the users are encouraged not to
 rely on it to be safe than sorry.

Well, actually my question arouse during the discussion which followed
by this SO question [1] where someone asked if it's possible to update
just one file in a remote repository without cloning it first (a-la
Subversion, that is).  While I perfectly understand that Git data model
does not support such server-side commits I'm able to envision a case
when, say, a developer is asked to perform some minor tweak to the code
while they're in a situation with no repository clone at hand and only a
crappy/costly cellular link available for communication.  I think
shallow cloning might be a palliative solution to this kind of problem
(a one-off clone/edit/commit/push session).

Taking into account what Duy Nguyen said on this topic, it seems that
that description of the shallow cloning in the git-clone manual page
could supposedly be made somewhat less denying about what could be done
using a shallow clone.  May be a note that such a setup could be okay
for very simple things like clone/edit/push would be just enough?

1. http://stackoverflow.com/q/16077691/720999
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Important articles on git-scm.com no more accessible

[Konstantin Khomoutov]

I maintain a local wiki at my $dayjob which contains a page dedicated
to Git which, among other things, liks to various useful bits of
information on the internets.

Recently I discovered that a number of useful articles which sort of
accompanied the Pro Git book are now inaccessible (404), namely:
Smart HTTP Transport [1], Reset Demystified [2], Note to Self [3]
and Git Loves the Environment [4].  I wonder if this is a known
problem and/or whom I could contact about this issue?

1. http://git-scm.com/2010/03/04/smart-http.html
2. http://git-scm.com/2011/07/11/reset.html
3. http://git-scm.com/2010/08/25/notes.html
4. http://git-scm.com/2010/04/11/environment.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Important articles on git-scm.com no more accessible

[Konstantin Khomoutov]

On Wed, 1 May 2013 14:38:02 -0400
Jeff King p...@peff.net wrote:

[...]
  Recently I discovered that a number of useful articles which sort of
  accompanied the Pro Git book are now inaccessible (404), namely:
  Smart HTTP Transport [1], Reset Demystified [2], Note to
  Self [3] and Git Loves the Environment [4].  I wonder if this is
  a known problem and/or whom I could contact about this issue?
  
  1. http://git-scm.com/2010/03/04/smart-http.html
  2. http://git-scm.com/2011/07/11/reset.html
  3. http://git-scm.com/2010/08/25/notes.html
  4. http://git-scm.com/2010/04/11/environment.html
 
 I think those links were broken by the site reorganization about a
 year ago. You can get to them at:
 
   http://git-scm.com/blog/2010/03/04/smart-http.html

Oh, I was about to respond that links I referred to are returned by
Google search for their respective article titles (it did so
yesterday).  So I went to verify this and just observed that Google
started to return liks pointing to (supposedly) Scott Chacon's site,
like

  http://scottchacon.com/2011/07/11/reset.html

for the Reset demystified article.  Hence I suppose Scott was
just transferring those articles to their new home.

 and so on. In general, problems with git-scm.com should be reported
 at:
 
   https://github.com/github/gitscm-next

Thanks!
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Error message: unable to open object pack directory: .git/objects/pack: Too many open files

[Konstantin Khomoutov]

On Tue, 12 Nov 2013 12:02:38 +0400
Лежанкин Иван  abys...@gmail.com wrote:

 I get this error message every time I want to do a `git push`.
 git version: 1.8.4.2
 
 Is it a known issue? Do you need additional info to investigate it?

What does
ulimit -n
tells to you when you run it before executing `git push`?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 64-bit support.

[Konstantin Khomoutov]

On Thu, 14 Nov 2013 16:58:31 +0400
Лежанкин Иван  abys...@gmail.com wrote:

 Do you plan to implement the 64-bit support in git? - Right now I have
 a problems sometimes with a huge repo and renaming detection. If I
 merge more than 32768 files at once, then the renaming detection
 fails, because of limitation inside git. The limitation is put by max
 32-bit value.
 
 I tweaked sources locally, to use 64-bit value as a number of merging
 files - generally, it works. But I'm not so brave to try to replace it
 everywhere in git.

$ apt-cache policy git
git:
  Installed: 1:1.7.10.4-1+wheezy1
  Candidate: 1:1.7.10.4-1+wheezy1
  Version table:
 *** 1:1.7.10.4-1+wheezy1 0
500 http://cdn.debian.net/debian/ wheezy/main amd64 Packages
100 /var/lib/dpkg/status

Notice the amd64 arch.  So what the question really is about?

If you have found a place where Git explicitly uses a 32-bit integer
where it would better be using a 64-bit one, please propose a patch to
discuss.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: 64-bit support.

[Konstantin Khomoutov]

On Thu, 14 Nov 2013 18:55:52 +0400
Лежанкин Иван  abys...@gmail.com wrote:

 I hit this limit in file 'diffcore-rename.c':
 
 if (rename_limit = 0 || rename_limit  32767)
 rename_limit = 32767;
 
 I just guess, that this limit comes from the O(N^2) complexity of the
 comparison algorithm. Since the max 32-bit signed value is 2^31, then
 the 2^15 = 32768 is somehow correlated with its square root, maybe,
 like 2^(32/2 - 1) - to prevent overflow.
 I'm trying to prepare the patch right now, that changes the `int
 rename_limit` = `long rename_limit` and all intermediate variable
 types. Is it a correct way to do?

I beleive rename_limit comes from reading the diff.renameLimit
configuration variable.  The gitconfig(1) manual page hints to look at
the -l command-line option of `git diff` which is described this way:

  -lnum

The -M and -C options require O(n^2) processing time where n is the
  number of potential rename/copy targets. This option prevents
  rename/copy detection from running if the number of rename/copy
  targets exceeds the specified number.

This description is not too clear, I admit.

Looks like you're on the right track but the patch appears to require a
more wide impact:
* 32767 should be a default limit, applied in the case the user did not
  specify neither diff.renameLimit nor -l.
* If whatever value read from those sources is less than 0, an error
  should be thrown--it looks strange to just revert it to the default
  value in this case.
* If the user-supplied value is = 0, then just use it, assume the user
  knows what they are doing.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Add a bugzilla website

[Konstantin Khomoutov]

On Fri, 15 Nov 2013 10:40:47 +0100 (CET)
ycollette.nos...@free.fr wrote:

 And the conclusion is ? No bugzilla tool installed because somebody
 want to build a gitbased bugzilla thing ?

Well, no, the real answer is that for those who actually write code and
apply patches, an e-mail based workflow is simpler: Git has tools to
apply patches right from Unix mailboxes, so one is able to just save a
thread with the final patch series to a file and apply it.  Some people
also prefer discussing patches inline -- in the same e-mail thread
the patch series being discussed had started.

I'm aware of at least one big project sporting the same approach
to handling bugs -- PostgreSQL.

But there was an announcement that an experimental JIRA instance has
been set up for Git [1].  I'm not sure what its current status is, but
you could look at it.

Also Git's mirror on github [2] supposedly provides for pull requests.
Again, not sure whether/how they're handled.

1. http://git-blame.blogspot.ru/2012/02/experimental-git-bug-tracker.html
2. https://github.com/git/git/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git clone from ftp issue

[Konstantin Khomoutov]

On Sun, 17 Nov 2013 13:22:40 -0700
Zachary Rodriguez zmrodrigue...@gmail.com wrote:

 Hello. I am having trouble setting up a git repository on an ftp
 server. The repository is bare and has had several commits made before
 being moved to the ftp server. I am attempting to clone from my ftp
 server, but git fails with the ftp error code 550. Inspection of the
 ftp packets via wireshark reveals that git is successfully changing to
 its desired working directory on the ftp server, but then it attempts
 to execute the 'size' command on the refs directory which generates
 the error code 550. Is this normal behavior or is it a bug?

http://thread.gmane.org/gmane.comp.version-control.git.user/3469/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Command-line git Vs IDE+plugin?

[Konstantin Khomoutov]

On Mon, 18 Nov 2013 18:42:26 +0100
Philippe Vaucher philippe.vauc...@gmail.com wrote:

[...]
 When they understand git reasonably (or if they are not lazy people
 and willing to learn), then show them full integrations like
 TortoiseGit (or probably the Netbeans plugin), which are nice when
 everything works but you have to know console git to fix things or
 simply to be aware of their limitations.

When it comes to Git on Windows with a GUI front-end, I would recommend
to take a look at Git Extensions [1] as well.

1. http://code.google.com/p/gitextensions/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: How to pre-empt git pull merge error?

[Konstantin Khomoutov]

On Wed, 27 Nov 2013 15:17:27 +
Pete Forman petef4+use...@gmail.com wrote:

 I am looking for a way of detecting up front whether a git pull or git
 merge would fail. The sort of script I want to perform is to update a
 server.
 
 git fetch
 git okay
 stop server
 backup data
 git merge
 start server
 
 Here git okay is a place holder for the command I am asking for.
 
 If a file has been changed outside of a commit then git pull fails
 with the following error.
 
 error: Your local changes to '...' would be overwritten by merge.
 Aborting. Please, commit your changes or stash them before you can
 merge.

What's wrong with git okay being

if git merge whatever 2/dev/null; then
  ... OK path
else
  ... merge failed path
fi

?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git reports

[Konstantin Khomoutov]

On Fri, 6 Dec 2013 18:51:47 +0200
Muzaffer Tolga Ozses to...@ozses.net wrote:

 On another git server, I get reports like
 Cloning into 'tcmb'...
 remote: Counting objects: 704, done.
 remote: Compressing objects: 100% (574/574), done.
 remote: Total 704 (delta 369), reused 107 (delta 60)
 Receiving objects: 100% (704/704), 129.99 KiB | 23 KiB/s, done.
 Resolving deltas: 100% (369/369), done.
 
 whereas I don't get those with my own. What could I be doing wrong?

The documentation on `git push` states:

  --progress

Progress status is reported on the standard error stream by default
  when it is attached to a terminal, unless -q is specified. This flag
  forces progress status even if the standard error stream is not
  directed to a terminal.

So it might turn out on your own server Git for some reason fails to
figure out its standard error stream is connected to a terminal.
Or, the error stream of your shell process is redirected somewhere (and
hence inherited by Git).
Or you pass the -q command-line option to `git clone`.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git reports

[Konstantin Khomoutov]

On Fri, 6 Dec 2013 21:00:35 +0400
Konstantin Khomoutov flatw...@users.sourceforge.net wrote:

[...]
  Resolving deltas: 100% (369/369), done.
  
  whereas I don't get those with my own. What could I be doing wrong?
 
 The documentation on `git push` states:
 
   --progress
 
 Progress status is reported on the standard error stream by
 default when it is attached to a terminal, unless -q is specified.
 This flag forces progress status even if the standard error stream is
 not directed to a terminal.
 
 So it might turn out on your own server Git for some reason fails to
 figure out its standard error stream is connected to a terminal.
 Or, the error stream of your shell process is redirected somewhere
 (and hence inherited by Git).

To underline the fact this is not all too unlikely, you're able to
completely silence error reports in your shell prompt by executing

  exec 2/dev/null

(you can regain it back by doing `exec 21`).

So you might face a misbehaving shell logon script for instance.

As to whether Git senses the TTY -- what does running

  stty

tells you?  Does it fail with something like inappropriate ioctl for
device or prints a couple of settings?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git reports

[Konstantin Khomoutov]

On Fri, 6 Dec 2013 19:44:21 +0200
Muzaffer Tolga Ozses to...@ozses.net wrote:

[...]
   Resolving deltas: 100% (369/369), done.
  
   whereas I don't get those with my own. What could I be doing
   wrong?
[...]
  So it might turn out on your own server Git for some reason fails
  to figure out its standard error stream is connected to a terminal.
  Or, the error stream of your shell process is redirected somewhere
  (and hence inherited by Git).
[...]
  So you might face a misbehaving shell logon script for instance.
 
  As to whether Git senses the TTY -- what does running
 
stty
 
  tells you?  Does it fail with something like inappropriate ioctl
  for device or prints a couple of settings?
 stty tells me
 speed 38400 baud; line = 0;
 eol = M-^?; eol2 = M-^?; swtch = M-^?;
 ixany iutf8
 
 And I run identical commands on both servers, only URL changes.

OK, so we could supposedly rule out the possibility Git does not sense
it's connected to a terminal.

So let's do the next test: does

echo test 2

print test on the box where Git does not report progress?

Another one: does Git report progress if you explicitly pass --progress
to it?

Does it work if you do

git clone $URL 21

?

What Git and OS versions are on both machines?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git push --all --tags

[Konstantin Khomoutov]

On Sat, 15 Nov 2014 04:44:19 + (UTC)
Ryan Jacobs ryan.mjac...@gmail.com wrote:

 $ git push --all --tags
 error: --all and --tags are incompatible
 
 Why are these flags incompatible? Just wondering 'cause I think that
 it would be a good feature to be able to push all of your branches
 and all of your tags to the server in one quick and simple command.

  git push --mirror

should do this.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git add single file and git add list of files behave differentely for ignored files

[Konstantin Khomoutov]

On Thu, 4 Dec 2014 10:06:23 +0100
Guilherme guibuf...@gmail.com wrote:

 I reported this issue on the git-user mailing list and they
 redirected me here.
 
 The problem I have observed is that with a ignored path `git add
 single file` behaves differently then `git add list of files`.
[...]

To those who's interested the original thread on git-users is
https://groups.google.com/d/topic/git-users/322tole9am8/discussion
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: confusion with some `git reset` commands

[Konstantin Khomoutov]

On Wed, 17 Dec 2014 01:09:08 +0630
Arup Rakshit arupraks...@rocketmail.com wrote:

[...]
 But I am looking for any differences -
 
 a) git reset --soft and git reset --keep
 b) git reset --hard and git reset --merge

Please consider reading
http://git-scm.com/book/en/v2/Git-Tools-Reset-Demystified
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [msysGit] Re: Sneak peek of the upcoming Git for Windows 2.x

[Konstantin Khomoutov]

On Sun, 12 Apr 2015 19:51:29 +0200
Johannes Schindelin johannes.schinde...@gmx.de wrote:

[...]
  * it is talking german to me
  
  would it be sufficient to delete
  c:\Apps\gitwin\mingw64\share\locale\de\LC_MESSAGES\
  resp the whole locale directory to let it speak english?
 
 Probably. But the canonical solution is to set the `LC_ALL` or `LANG`
 environment variables accordingly.

JFTR, that won't probably fix `git gui` and `gitk` as they are started
directly, not via shell scripts, and hence are unaffected by whatever
tweaks are done in ~/.bashrc *unless* they're started from the
interactive Git bash shell and hence see that environment.

I would hence just stick LC_MESSAGES=en (or LC_ALL, or LANG) into the
environment variables (on the user's level) and solve this problem once
and for all future programs making use of Unix-y locale setup
conventions.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [msysGit] Re:

[Konstantin Khomoutov]

On Wed, 08 Apr 2015 23:58:58 +0200
Thomas Braun thomas.br...@virtuell-zuhause.de wrote:

[...]
  I am trying to run the latest git 1.9.5 installer on windows. When I
  run strings on libneon-25.dll it shows this:
  
  ./libneon-25.dll:OpenSSL 1.0.1h 5 Jun 2014
  
  But when I load this dll in dependency walker, it picks up
  msys-openssl 1.0.1m and has no trace of openssl-1.0.1h. My questions
  to you:
  
  1. Is libneon-25.dll statically linked with openssl-1.0.1h?
  2. If not, where is the reference to 1.0.1h coming from?
 
 I would be suprised if we link openssl statically into libneon. I
 guess libneon just reports against which openssl version it was
 *built*.
 
  I am asked to rebuild git with libneon-25.dll linked against
  openssl-1.0.1m. But I am having a feeling that this is not needed,
  since libneon is already picking the latest openssl version. Can you
  please confirm?
 
 You can download the development enviroment for git for windows here
 [1]. After installation, checkout the msys branch and then you can try
 to recomplile libneon using /src/subversion/release.sh.
 
 [1]:
 https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/msysGit-netinstall-1.9.5-preview20150319.exe
[...]

JFTR, the discussion about the same issue has been brought up on
git-users as well [2].

(People should really somehow use the basics of netiquette and mention
in their posts where they cross-post things.)

2. https://groups.google.com/d/topic/git-users/WXyWE5_JfNc/discussion
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: GIT for Microsoft Access projects

[Konstantin Khomoutov]

On Mon, 8 Jun 2015 9:45:17 -0500
hack...@suddenlink.net wrote:

[...]
 My question is, will GIT work with MS access forms, queries, tables,
 modules, etc?
[...]

Git works with files.  So in principle it will work with *files*
containing your MS access stuff.

But Git will consider and treat those files as opaque blobs of data.
That is, you will get no fancy diffing like asking Git to graphically
(or otherwise) show you what exact changes have been made to a
particular form or query between versions X and Y of a given MS access
document -- all it will be able to show you is commit messages
describing those changes.

So... If you're fine with this setting, Git will work for you,
but if not, it won't.

One last note: are you really sure you want an SCM/VCS tool to manage
your files and not a document management system (DMS) instead?
I mean stuff like Alfresco (free software by the way) and the like.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Stash Feature

[Konstantin Khomoutov]

On Wed, 3 Jun 2015 17:22:57 +0200
Fabrizio Mancin fabma...@gmail.com wrote:

 I've a little request for you.
 What about saving date-time on git stash save command and show it on
 git stash show stash@{xxx}?
 I think it is a useful poperty to save.
 
 What do you think about it?

This information is already there as a stash entry is internally
represented as a commit (with one or more parents), and being a commit,
it possess all the standard attributes of a commit, including the
creation timestamp.

To get normal view of this commit just run

  git show stash@{0}
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: git lock files (Was: GIT for Microsoft Access projects)

[Konstantin Khomoutov]

On Tue, 9 Jun 2015 13:21:44 -0500
hack...@suddenlink.net wrote:

 Thanks folks, I am digesting all you have said.
 
 Now the command line I can do (I'm a programmer) but the secretary
 here I doubt.
 
 So is there at GUI interface for this? Does it work on Windows
 systems?

That's why I asked whether the thing you do really want is a document
management system, not a version control system.

Yes, Git works on Windows thanks to folks behind the Git for Windows
project (often and errorneously called msysGit in the internets)
and yes there do exist mature Windows GUI front-ends to it, with
TortoiseGit and Git Extensions being supposedly the most visible picks.

But there's such thing as an irreducible complexity: while these tools
strive to be user-friendly, and TortoiseGit even tries to make you
think you're using Subversion rather than Git, they won't hide all the
underlying complexity of a DVCS tool, which Git is, from the user.

So... I bet for your random user, it would be much easier to switch to
the browser window and upload another version of their document there,
with a short note describing what they do and why.  This is how a
typical DMS works.  You won't get all that awesomness Git gives you to
fiddle with your source code files but in return you'll get a system
which requires next to zero training for any layman to use it.

Please rememeber about [1].  Many of the statements that post does are
outdated but its essense remains to be true when it comes to handing
off Git to users not possessing ninja-level computer skills.
I especially recommend to think through this particular passage:

| They often struggle to use version control at all; are you now going
| to teach them the difference between “pull” and “update”, between
| “commit” and “push”? Look me in the eyes and say that with a straight
| face.

I also wonder how do you intend to explain them why they can't push
because someone else had just did that, and what to do about this, and
why.  (And whose version should win, in the end, as the files you
intend to work with are not subject for merging in the usual sense of
this word -- when it comes to plain text files.)

1. http://blog.red-bean.com/sussman/?p=79
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Repository Code Security (Plan Text)

[Konstantin Khomoutov]

On Wed, 24 Jun 2015 18:18:00 +
BGaudreault Brian bgaudrea...@edrnet.com wrote:

 If someone downloads code to their notebook PC and leaves the
 company, what protection do we have against them not being able to
 access the local code copy anymore?

What do you mean by local code?
That one which is on the notebook?
Then you can do literally nothing except for not allowing cloning your
Git repositories onto random computers in the first place.

If you instead mean the copy of code available in the repositories
hosted in your enterprise then all you need to do is to somehow
terminate the access of that employee who's left to those repositories.
(This assumes they're accessible from the outside; if they aren't, the
problem simply do not exist.)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Repository Code Scope (Plan Text)

[Konstantin Khomoutov]

On Wed, 24 Jun 2015 18:19:42 +
BGaudreault Brian bgaudrea...@edrnet.com wrote:

 What type of code scope should a repository contain?  Can it be one
 large program with many elements or should it just be part of a
 program or can it be a project with multiple programs?  What are the
 recommendations?

There are no recommendations because the structure of a
repositories depends on the use case.

If you're developing a library which might be used by more than a
single other project, host it in a separate repository, and in the
projects which use that library, refer to it using submodules.

If you have a project which contains internal submodules (say,
for .NET projects, it's common to have many so-called assemblies in a
single project to provide modularity), there's little point in messing
with separate repositories and it's simpler to keep everything in one
place.

Note that there are tools which allow you to split from a repository the
history touching only the contents of a particular directory, and then
glue such history back into some other repository.  Using these are not
exactly a walk in the park but at least this sort of things is doable.
This means you might start with a simple solution and then shape it
into a more appropriate form when you'll see the need for this.

I should also warn you that your question appear to be a bit too broad
which, IMO, suggests that you did not do much research on what's
offerred by Git and its ecosystem, what's in a Git repo, how is it
hosted, what are the best practices of managing complicated Git
projects etc.  And all this information is abundant in the internets...
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git-Win: case insensitive names

[Konstantin Khomoutov]

On Mon, 1 Jun 2015 13:30:19 -0400
Vadim Kramer vkokie...@gmail.com wrote:

 Just had to deal with a nasty cross-UNIX/Windows problem.
 
 Two files in the repository were in the same direcory and had the same
 name differing only by the case of some of the letters.  While
 checking them out, git wantonly confused them (conflated them into
 one) and got confused about them.
 
 I know it's an outlandish situation.  Still, when git is in a
 case-insensitive file system, it should at least check for this.

What it does it do if you have core.ignorecase set to on?

(And you did tell nothing about your platform and your Git version.)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Redirect git subcommand to itself?

[Konstantin Khomoutov]

On Wed, 27 May 2015 17:28:34 -0700
Stefan Beller sbel...@google.com wrote:

 so I just run into this problem again (which happens to me maybe
 twice a week): I want to do a git operations, so I type git  into
 my shell,
[...]
 then I copy the whole operation git revert --abort in this case and
 paste it to the shell and let go.
 The result looks like
 $ git git revert --abort
 git: 'git' is not a git command. See 'git --help'.
[...]
 I wonder if we want to make a git subcommand, which behaves exactly
 the same as git itself?
 Then git git git status would just return the same as git status.

In your ~/.whateverrc, put this:

git() {
  while [ $# -gt 0 ]; do
test $1 != git  break;
shift;
  done;
  command git $@;
}

This assumes a POSIX-compatible shell but I think you've got the idea.
(command is a builtin which forces interpreting the following word as
the name of an external program.)
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

[Konstantin Khomoutov]

On Mon, 29 Jun 2015 16:37:54 +0200
Johannes Schindelin johannes.schinde...@gmx.de wrote:

  I just uploaded the 4th release candidate for the upcoming Git for
  Windows 2.x release. Please find the download link here:
 
  https://git-for-windows.github.io/#download
 
  The most important changes are the update to Git 2.4.5 and a fix
  for the crash when running Git Bash with a legacy `TERM` setting
  (this should help 3rd party software to upgrade to Git for Windows
  2.x).
  
  Thanks.
  It seems that this link:
  
 https://github.com/git-for-windows/git/releases/latest
  
  doesn't point to the latest release.
  
  Might be because the tags have the same date ?
 
 Wooops. Sorry for being so slow (been interviewing today). It should
 be correct now, can you verify, please?

Thanks for making all this real, Johannes!

I've finally took time to switch from my old msys1 release to this
RC4, and immediately got hit by the fact Git is now speaking to me in
Russian, which is not what I want (previously this behaviour was only
exhibited by `git gui` and `gitk`).

Should I make Git see LC_MESSAGES=en (or other thing like LANG) in the
environment or is there some Git-local method to affect this behaviour?
I tried to grep the release notes using relevant keywords but was left
empty-handed.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: proxy_windows_386.exe Firewall Notification

[Konstantin Khomoutov]

On Thu, 11 Jun 2015 17:46:58 +
BGaudreault Brian bgaudrea...@edrnet.com wrote:

 Hello, when connecting to a Vagrant Shared VM via SSH, I'm getting a
 Windows Firewall prompt about 'proxy_windows_386.exe' (in C:\Program
 Files\hashicorp\vagrant\embedded\gems\gems\vagrant-share-1.1.0
 \localbin\), which looks like a malware-type name.  Here's the
 message: Windows Security Alert.  Windows Firewall has blocked some
 features of this app.  Windows Firewall has blocked some features of
 proxy_windows_386.exe on all public and private networks..
 
 So I did a quick search for this file name on the Internet as well as
 the Git-SCM.com/community site and haven't found any clear
 explinations about what this file is and if it's safe.  If this is a
 legitimate safe file, I think it's important that this is clearly
 documented in the Git documentation.  Can someone verify the details
 about this file?

I fail to get how did you manage to connect proxy_windows_386.exe
with Git.  Care to elaborate on this?
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [msysGit] 4th release candidate of Git for Windows 2.x, was Re: 3rd release candidate of Git for Windows 2.x

[Konstantin Khomoutov]

On Mon, 29 Jun 2015 18:19:09 +0200
Johannes Schindelin johannes.schinde...@gmx.de wrote:

  I've finally took time to switch from my old msys1 release to this
  RC4, and immediately got hit by the fact Git is now speaking to me
  in Russian, which is not what I want (previously this behaviour was
  only exhibited by `git gui` and `gitk`).
  
  Should I make Git see LC_MESSAGES=en (or other thing like LANG) in
  the environment or is there some Git-local method to affect this
  behaviour? I tried to grep the release notes using relevant
  keywords but was left empty-handed.
 
 Personally, I would use LC_ALL=C. Maybe that's good for you, too?

After reading [1], I've ended up installing LANG=C into my user's
environment variables -- so far so good, thanks for the tip!

 I guess this would also make for a fine opportunity to add an option
 to the installer to switch the localization off?

I dunno.
While this definitely would be useful for some folks (mostly
old-school, like we do) but the problem with this setting is that it's
not specific to Git and can result in unpredictable behaviour in other
parts of the system.  Hence this option, if implemented, should somehow
be clearly marked as system-wide in the installer UI.

1. 
https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Bug report Windows 10

[Konstantin Khomoutov]

On Mon, 10 Aug 2015 14:26:44 +0200
MS-Informatique i...@ms-informatique.be wrote:

 My Windows notebook got updated to Windows 10 and now my Git Bash
 doesn't start and when I open an existing repository from Git Gui, I
 am getting next error: 
 0 [main] us 0 init_cheap: VirtualAlloc pointer is null, Win32 error
 487 AllocationBase 0x0, BaseAddress 0x6857, RegionSize 0x41,
 State 0x1
 C:\Program Files (x86)\Git\bin\sh.exe: *** Couldn't reserve space for
 cygwin's heap, Win32 error 0
 
 I am running GIT version 1.9.5 (latest build for Windows).

This version is essentially abandoned because the development
happens on packaging the 2.x series for Windows, and using the updated
runtime (MSYS2 instead of MSYS).

So please try this:

1) Fetch the latest version of the new Git for Windows available --
   currently its 2.4.6 RC5 [1].
   Supposedly you should try 64-bit version.

2) If the bug still does manifest itself, prease report it to the
   project's tracker [2].

1. https://github.com/git-for-windows/git/releases/tag/v2.4.6.windows.1
2. https://github.com/git-for-windows/git/issues/
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Git doesn't detect change, if file modification time is restored to original one

[Konstantin Khomoutov]

On Thu, 23 Jul 2015 11:14:11 +0200
Konrád Lőrinczi klorin...@gmail.com wrote:

[...]
 I accept these solutions as workarounds, but the real solution would
 be: Dev suggestions:
 1) Add a --force-reread option to git status, so user can force
 reread tree. git status --force-reread
 
 2) Add status.force-reread (true or false) option to .git/config so
 user can set this variable permanently for a repo.
 status.force-reread = false (should be default)
 
 Could be possible to implement 1) and 2) features to next git release?

Could you explain what's your real use case with preserving mtimes
while changing the files?  I mean, implementing mtime-stability
in your tools appears to be a good excersize in programming but what
real-world problem does it solve?

I'm asking because if you are not going to implement the changes to
Git you suggested yourself, then someone else should be *convinced* to
do so.  So far, your trouble appears to be too artifical to bother.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Bug: gitk crashes for single file with German environment

[Konstantin Khomoutov]

On Fri, 23 Oct 2015 15:32:10 +0200
Jörg Bühmann  wrote:

> gitk crashes for single file with German environment
[...]

http://thread.gmane.org/gmane.comp.version-control.git/279910
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: Why are submodules not automatically handled by default or at least configurable to do so?

[Konstantin Khomoutov]

On Tue, 27 Oct 2015 11:40:15 +
Nick  wrote:

> > Why not set alias(es) for that?
[...]
> But oh yes, there is another difficulty with aliases.  Eclipse users
> on Windows:
[...]

Not to counter your actual argument, but AFAIK EGit uses JGit which is
a Java implementation which does not call out to the "real" Git binary.
This basically means that if something gets implemented in the stock
Git, this won't affect JGit and EGit untill their respective
maintainers implement the same feature.

> they don't tend to love it if you tell them to install
> Cygwin, open a shell and type things into it.

On Windows, you typically want them to use Git for Windows, not
Cygwin.  Various GUI front-ends to Git working on Windows (such as Git
Extentions and TortoiseGit) rely on GfW to work as well.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Fw: [git-users] git fsck error - duplicate file entries - different then existing stackoverflow scenarios

[Konstantin Khomoutov]

A user recently asked an interesting question on the git-users list.
I think it warrants attentions of a specialists more hard-core than
we're there over at git-users.

So I'd like to solicit help if those knowledgeable, if possible.

Begin forwarded message:

Date: Wed, 11 Nov 2015 14:30:40 -0800 (PST)
From: Wind Over Water 
To: Git for human beings 
Subject: [git-users] git fsck error - duplicate file entries -
different then existing stackoverflow scenarios


Hi all,

I have a repo that is giving a 'git fsck --full' error that seems to be 
different from the existing questions and answers on stackoverflow on
this topic.  For example, in our fsck error it is not obvious which
file is actually duplicated and how/where.  And there is no commit sha
involved - apparently only blob and tree sha's.  But then finding good
documentation on this is challenging.

Might anyone have a pointer as to what to read to help figure out a 
solution/fix to the below?  Or know of a solution outright?

Thanks much in advance!

-sandy

$ git fsck --full

Checking object directories: 100% (256/256), done.

error in tree df79068051fa8702eae7e91635cca7eee1339002: contains
duplicate file entries

error in tree c2d09540a3c3f44c42be1dc8a2b0afa73a35f861: contains
duplicate file entries

Checking objects: 100% (623704/623704), done.

Checking connectivity: 623532, done.

dangling commit 4d1402c8c74c9f4de6172d7dbd5a14c41683c9e8


$ git ls-tree df79068051fa8702eae7e91635cca7eee1339002

100644 blob 14d6d1a6a2f4a7db4e410583c2893d24cb587766 build.gradle

12 blob cd70e37500a35663957cf60f011f81703be5d032 msrc

04 tree 658c892e15fbe0d3ea6b8490d9d54c5f2e658fc9 msrc

100644 blob f623819c94a08252298220871ac0ba1118372e59 pom.xml

100644 blob 9223cc2fddb138f691312c1ea2656b9dc17612d2 settings.gradle

04 tree c3bac1d92722bdee9588a27747b164baa275201f src


$ git ls-tree c2d09540a3c3f44c42be1dc8a2b0afa73a35f861

100644 blob 14d6d1a6a2f4a7db4e410583c2893d24cb587766 build.gradle

12 blob cd70e37500a35663957cf60f011f81703be5d032 msrc

04 tree 658c892e15fbe0d3ea6b8490d9d54c5f2e658fc9 msrc

100644 blob f623819c94a08252298220871ac0ba1118372e59 pom.xml

100644 blob 9223cc2fddb138f691312c1ea2656b9dc17612d2 settings.gradle

04 tree a5aa6758a25fee779cbb8c9717d744297071ea79 src


$ git show cd70e37500a35663957cf60f011f81703be5d032

src/main/java/com/foo/bar/baz/common/


$ git show 658c892e15fbe0d3ea6b8490d9d54c5f2e658fc9

tree 658c892e15fbe0d3ea6b8490d9d54c5f2e658fc9


BillingAggregator.java

BillingDataThriftAdapter.java

[...]

MetricsProcessor.java
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html