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

2014-04-19 Thread Heiko Voigt
Hi Marat, On Thu, Apr 03, 2014 at 05:18:50PM +0400, ma...@slonopotamus.org wrote: I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit Windows. So the reason for this new package is that you need 64bit binaries? Relationship with msysgit = Unlike

[PATCH 0/5] fc/transport-helper-sync-error-fix rebased

2014-04-19 Thread Junio C Hamano
As I have said in the recent What's cooking reports, the original posted here were based on older codebase and needed to be rebased, but it had some conflicts and I wanted to see the result double checked by the original author before we can merge it to 'next', cooked there and hopefully merged to

[PATCH 5/5] transport-helper: fix sync issue on crashes

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com When a remote helper crashes while pushing we should revert back to the state before the push, however, it's possible that `git fast-export` already finished its job, and therefore has exported the marks already. This creates a synchronization

[PATCH 3/5] transport-helper: propagate recvline() error pushing

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's cleaner, and will allow us to do something sensible on errors later. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 18 +++--- 1 file changed,

[PATCH 4/5] transport-helper: trivial cleanup

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's simpler to store the file names directly, and form the fast-export arguments only when needed, and re-use the same strbuf with a format. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano

[PATCH 1/5] transport-helper: remove barely used xchgline()

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's only used once, we can just call the two functions inside directly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 9 ++--- 1 file changed, 2

[PATCH 2/5] remote-helpers: make recvline return an error

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com Instead of exiting directly, make it the duty of the caller to do so. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 21 ++--- 1 file changed,

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-19 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: On Fri, Apr 18, 2014 at 9:37 PM, Junio C Hamano gits...@pobox.com wrote: An early preview release Git v2.0.0-rc0 is now available for testing at the usual places. This is supposed to have _all_ the v2.0 topics, correct? I'm unable to find the commit

[L10N] Startup of Git 2.0.0 l10n round 1

2014-04-19 Thread Jiang Xin
Hi, Since Git v2.0.0-rc0 had already been released, it's time to start new round of git l10n. This time there are 45 new messages need to be translated since last update for v1.9.0: l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) Generate po/git.pot from v2.0.0-rc0 for git v2.0.0

Re: [RFC/PATCHv3 3/3] Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given

2014-04-19 Thread Eric Wong
Johan Herland jo...@herland.net wrote: --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -86,14 +86,7 @@ COMMANDS (refs/remotes/$remote/*). Setting a prefix is also useful if you wish to track multiple projects that share a common repository. -+ -NOTE: In

How to recursively clean only those untracked files that are not ignored?

2014-04-19 Thread Ilya Basin
According to the help, without -x option git clean should let alone the ignored files, but it doesn't. [il@reallin test]$ cat .gitignore *.sar [il@reallin test]$ mkdir -p conf/sar touch conf/sar/aaa.sar [il@reallin test]$ git status # On branch master nothing to commit,

[PATCH] git-svn.txt: Retain a description og pre-v2.0 default prefix

2014-04-19 Thread Johan Herland
Add a description of =1.9 behavior in the manpage. Users on long-term-support systems are likely to continue using ancient git installations for some time (5-10 years, even?), but may come across the current documentation online. Suggested-by: Eric Wong normalper...@yhbt.net Signed-off-by: Johan

Git: Please allow to use gpgsm to support X.509 certificates

2014-04-19 Thread Schittli Thomas
Dear Git community last night, brian m. Carlson explained, that Git wants a key that can be used by GnuPG and therefore X.509 certificates are not supported. As you probably know, since 3 years gpg supports X.509 - unfortunately, gpg does not automatically detect X.509 certificates and we have

Re: [PATCH] git-svn.txt: Retain a description og pre-v2.0 default prefix

2014-04-19 Thread Eric Wong
Johan Herland jo...@herland.net wrote: Feel free to add/squash this on top. Thanks! Squashed and pushed. The following changes since commit cc291953df19aa4a97bee3590e708dc1fc557500: Git 2.0-rc0 (2014-04-18 11:21:43 -0700) are available in the git repository at:

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

2014-04-19 Thread Marat Radchenko
So the reason for this new package is that you need 64bit binaries? That's the most important bit. Plus, weird ssh transfer speeds [1] caused by ansient openssh bundled in msysgit. I can see the need for a pure Windows solution (no msys tools at least for runtime). Several Git scripts are

[no subject]

2014-04-19 Thread Siegel, Suzan
T0 get your entitlement, write me via; siedm...@outlook.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: Please allow to use gpgsm to support X.509 certificates

2014-04-19 Thread John Keeping
On Sat, Apr 19, 2014 at 11:03:07AM +, Schittli Thomas wrote: last night, brian m. Carlson explained, that Git wants a key that can be used by GnuPG and therefore X.509 certificates are not supported. As you probably know, since 3 years gpg supports X.509 - unfortunately, gpg does not

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

2014-04-19 Thread Johannes Schindelin
Hi, On Sat, 19 Apr 2014, Heiko Voigt wrote: On Thu, Apr 03, 2014 at 05:18:50PM +0400, ma...@slonopotamus.org wrote: I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit Windows. So the reason for this new package is that you need 64bit binaries? Relationship with

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

2014-04-19 Thread Marat Radchenko
On Sat, Apr 19, 2014 at 05:24:33PM +0200, Johannes Schindelin wrote: Marat, please do not add to the confusion. msysGit is the name of the *development environment* for developing Git for Windows. This confusion comes from the fact that major part of msysGit is packaged with Git for Windows to

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

2014-04-19 Thread Thomas Braun
Am 19.04.2014 15:35, schrieb Marat Radchenko: So the reason for this new package is that you need 64bit binaries? That's the most important bit. Plus, weird ssh transfer speeds [1] caused by ansient openssh bundled in msysgit. Yes the msysgit openssh is ancient and slow. Openssh in

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

2014-04-19 Thread Johannes Schindelin
Hi Marat, On Sat, 19 Apr 2014, Marat Radchenko wrote: But in practice, msysgit is: 1) outdated msys that was patched in multiple ways without sending patches upstream 2) heavily patched git, again not upstreamed Again, this time explicitly: I wish you had done a little more research on

[PATCH] l10n: de.po: translate 45 new messages

2014-04-19 Thread Ralf Thielow
Translate 45 new messages came from git.pot update in 5e078fc (l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)). Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 123 +-- 1 file changed, 49 insertions(+), 74

AW: Git: Please allow to use gpgsm to support X.509 certificates

2014-04-19 Thread Schittli Thomas
Hi John, Have you tried `git config gpg.program gpgsm`? wau, thanks a lot for this hint!, it works :-) I think a seamless integration for all certificate-types would be better, but I try to motivate GnuPG to merge the function of gpgsm.exe into gpg.exe. This would give a great benefit for all

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

2014-04-19 Thread Heiko Voigt
On Sat, Apr 19, 2014 at 05:35:07PM +0400, Marat Radchenko wrote: there are no 64 bit binaries shipped with msysgit is that nobody needed them That's wrong. Google for 'windows x64 git' or 'msysgit x64'. People need it. There's even an issue [3] (stalled several years ago) in msysgit

Re: [PATCH 01/11] refs.c: constify the sha arguments for ref_transaction_create|delete|update

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: ref_transaction_create|delete|update has no need to modify the sha1 arguments passed to it so it should use const unsigned char* instead of unsigned char*. Some functions, such as fast_forward_to(), already have its old/new sha1 arguments as

Re: [PATCH 02/11] refs.c: change ref_transaction_update() to do error checking and return status

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Update ref_transaction_update() do some basic error checking and return true on error. Update all callers to check ref_transaction_update() for error. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/update-ref.c | 11 +++

Re: [PATCH 03/11] refs.c: change ref_transaction_create to do error checking and return status

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Do basic error checking in ref_transaction_create() and make it return status. Update all callers to check the result of ref_transaction_create() Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/update-ref.c | 4 +++- refs.c

Re: [PATCH 04/11] refs.c: ref_transaction_delete to check for error and return status

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Change ref_transaction_delete() to do basic error checking and return status. Update all callers to check the return for ref_transaction_delete() Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/update-ref.c | 5 +++-- refs.c

[PATCH 0/6] run_external_diff cleanups

2014-04-19 Thread Jeff King
It's possible to overflow an array in run_external_diff and write a single NULL onto the stack. The first patch below fixes that. The rest are cleanups and modernizations I noticed while in the area. It's possible that patch 3 is also a bug fix, depending on your interpretation. [1/6]:

Re: [PATCH 05/11] tag.c: use ref transactions when doing updates

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Change tag.c to use ref transactions for all ref updates. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/tag.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/tag.c b/builtin/tag.c

Re: [PATCH 06/11] replace.c: use the ref transaction functions for updates

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Update replace.c to use ref transactions for updates. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/replace.c | 15 +-- 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/builtin/replace.c

[PATCH 1/6] run_external_diff: use an argv_array for the command line

2014-04-19 Thread Jeff King
We currently generate the command-line for the external command using a fixed-length array of size 10. But if there is a rename, we actually need 11 elements (10 items, plus a NULL), and end up writing a random NULL onto the stack. Rather than bump the limit, let's just an argv_array, which makes

[PATCH 2/6] run_external_diff: use an argv_array for the environment

2014-04-19 Thread Jeff King
We currently use static buffers and a static array for formatting the environment passed to the external diff. There's nothing wrong in the code, but it is much easier to verify that it is correct if we use a dynamic argv_array. Signed-off-by: Jeff King p...@peff.net --- diff.c | 14

[PATCH 3/6] run_external_diff: clean up error handling

2014-04-19 Thread Jeff King
When the external diff reports an error, we try to clean up and die. However, we can make this process a bit simpler: 1. We do not need to bother freeing memory, since we are about to exit. Nor do we need to clean up our tempfiles, since the atexit() handler will do it for us.

[PATCH 4/6] run_external_diff: drop fflush(NULL)

2014-04-19 Thread Jeff King
This fflush was added in d5535ec (Use run_command() to spawn external diff programs instead of fork/exec., 2007-10-19), because flushing buffers before forking is a good habit. But later, 7d0b18a (Add output flushing before fork(), 2008-08-04) added it to the generic run-command interface,

[PATCH 5/6] run_external_diff: hoist common bits out of conditional

2014-04-19 Thread Jeff King
Whether we have diff_filespecs to give to the diff command or not, we always are going to run the program and pass it the pathname. Let's pull that duplicated part out of the conditional to make it more obvious. Signed-off-by: Jeff King p...@peff.net --- diff.c | 8 +++- 1 file changed, 3

Re: [PATCH 07/11] commit.c: use ref transactions for updates

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Change commit.c to use ref transactions for all ref updates. Signed-off-by: Ronnie Sahlberg sahlb...@google.com --- builtin/commit.c | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git

[PATCH 6/6] run_external_diff: refactor cmdline setup logic

2014-04-19 Thread Jeff King
The current logic makes it hard to see what gets put onto the command line in which cases. Pulling out a helper function lets us see that we have two sets of file data, and the second set either uses the original name, or the other renamed/copy name. Signed-off-by: Jeff King p...@peff.net --- The

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

2014-04-19 Thread Heiko Voigt
On Sat, Apr 19, 2014 at 08:58:32PM +0400, Marat Radchenko wrote: On Sat, Apr 19, 2014 at 05:24:33PM +0200, Johannes Schindelin wrote: Marat, please do not add to the confusion. msysGit is the name of the *development environment* for developing Git for Windows. This confusion comes from

Re: [PATCH 11/11] walker.c: use ref transaction for ref updates

2014-04-19 Thread Michael Haggerty
On 04/17/2014 09:46 PM, Ronnie Sahlberg wrote: Switch to using ref transactions in walker_fetch(). As part of the refactoring to use ref transactions we also fix a potential memory leak where in the original code if write_ref_sha1() would fail we would end up returning from the function

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

2014-04-19 Thread Sebastian Schuberth
On 19.04.2014 15:35, Marat Radchenko wrote: But in practice, msysgit is: 1) outdated msys that was patched in multiple ways without sending patches upstream It's not true that we are not sending patches upstream to MSYS, see [1]. It's just that most of them don't get included due to a

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

2014-04-19 Thread Sebastian Schuberth
On Sat, Apr 19, 2014 at 8:42 PM, Heiko Voigt hvo...@hvoigt.net wrote: But AFAIK its not ready for production use yet. I guess Sebastian would not mind contributions. Not at all! -- Sebastian Schuberth -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[PATCH] Documentation: git-gui: describe gui.displayuntracked

2014-04-19 Thread Max Kirillov
Signed-off-by: Max Kirillov m...@max630.net --- Documentation for the option introduced in e632b3c0d3 Documentation/config.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index bbba728..41e31ce 100644 --- a/Documentation/config.txt

Re: [PATCH 1/6] run_external_diff: use an argv_array for the command line

2014-04-19 Thread Max L
One more note: at this moment the problem is slightly deeper. This array is next passed to the execvp function, which now falls with EFAULT on two my machines (both faced this problem after upgrading to ubuntu 14.04, everything 'worked' fine before, looks like now execvp checks input more

Re: [PATCH 1/6] run_external_diff: use an argv_array for the command line

2014-04-19 Thread Eric Sunshine
On Sat, Apr 19, 2014 at 3:17 PM, Jeff King p...@peff.net wrote: We currently generate the command-line for the external command using a fixed-length array of size 10. But if there is a rename, we actually need 11 elements (10 items, plus a NULL), and end up writing a random NULL onto the

Re: [PATCH 1/6] run_external_diff: use an argv_array for the command line

2014-04-19 Thread Jeff King
On Sun, Apr 20, 2014 at 02:09:49AM +0400, Max L wrote: One more note: at this moment the problem is slightly deeper. This array is next passed to the execvp function, which now falls with EFAULT on two my machines (both faced this problem after upgrading to ubuntu 14.04, everything 'worked'