[PATCH] MSVC: allow using ExtUtils::MakeMaker

2014-04-03 Thread Marat Radchenko
Drop NO_PERL_MAKEMAKER from config.mak.uname for the MSVC platform. MakeMaker is available on Windows Perl implementations and installs modules to correct location, unlike NO_PERL_MAKEMAKER Makefile. Signed-off-by: Marat Radchenko ma...@slonopotamus.org --- config.mak.uname | 1 - 1 file

Antw: Re: Q: .git/HEAD and .git/refs/heads

2014-04-03 Thread Ulrich Windl
Matthieu Moy matthieu@grenoble-inp.fr schrieb am 02.04.2014 um 19:54 in Nachricht vpqob0jwrbb@anie.imag.fr: Ulrich Windl ulrich.wi...@rz.uni-regensburg.de writes: Hi! I have a small question: After a git gc with last commit being [shared 2679648] I found this: cat .git/HEAD

Re: [PATCH] gitweb: Improve diffs when filenames contain problem characters

2014-04-03 Thread Jakub Narębski
[Forgot to hit Reply-to-all instead of Reply. Andrew, I'm sorry for duplicate email] On Sat, Mar 29, 2014 at 2:53 PM, Andrew Keller and...@kellerfarm.com wrote: When formatting a diff header line, be sure to escape the raw output from git for use as HTML. This ensures that when problem

Re: [PATCH 00/22] Lockfile refactoring and pre-activation

2014-04-03 Thread Michael Haggerty
On 04/01/2014 10:44 PM, Jeff King wrote: [...] I think all of the patches look good. I'd prefer to hold back the final one (and probably 19/22, which has no purpose except to prepare for 22/22) until seeing its application in practice. OK, I shuffled 19/22 to the end of the patch series, just

Re: [PATCH] ls-files: do not trust stat info if lstat() fails

2014-04-03 Thread Duy Nguyen
On Thu, Apr 3, 2014 at 1:15 AM, Junio C Hamano gits...@pobox.com wrote: I am guessing that, even though this was discovered during the development of list-files, is a fix applicable outside the context of that series. I do think the patched result is an improvement than the status quo, but

Re: [PATCH 02/22] try_merge_strategy(): remove redundant lock_file allocation

2014-04-03 Thread Michael Haggerty
On 04/02/2014 06:53 PM, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Tue, Apr 01, 2014 at 05:58:10PM +0200, Michael Haggerty wrote: By the time the if block is entered, the lock_file instance from the main function block is no longer in use, so re-use that one instead of

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

2014-04-03 Thread marat
I'm proud to announce WinGit: an attempt to bring Git powers to 64-bit Windows. WinGit is currently used only by my coworkers and isn't considered production-ready-rock-solid. Use at your own risk. Homepage build instructions - https://github.com/slonopotamus/wingit

Re: [PATCH] update-ref: fail create operation over stdin if ref already exists

2014-04-03 Thread Michael Haggerty
On 04/02/2014 02:57 PM, Brad King wrote: On 04/02/2014 04:09 AM, Michael Haggerty wrote: From: Aman Gupta a...@tmm1.net [snip] @@ -147,6 +147,7 @@ static void parse_cmd_create(const char *next) struct ref_update *update; update = update_alloc(); +update-have_old = 1;

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

2014-04-03 Thread 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

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

2014-04-03 Thread Marat Radchenko
On Thursday 03 April 2014 at 17:48:08 Konstantin Khomoutov wrote: What is the state of Unicode support in WinGit? I haven't seen any Unicode-related issues when using through TortoiseGit. Command-line usage is currently broken: no UTF-8 -cmd.exe encoding conversion is performed. Fixing this

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

2014-04-03 Thread Vincent van Ravesteijn
I know that build.sh is UGLY, especially openssl part. 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.

Re: [PATCH v3 2/3] patch-id: document new behaviour

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: So I think I prefer using an option and not a heuristic if you are fine with that. Sure. Changing behaviour only by explicit user request (command line or configuration) is much safer than heuristics that does not work reliably. -- To unsubscribe from

Re: [PATCH v2 20/27] update-ref --stdin: Reimplement using reference transactions

2014-04-03 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I assumed that rolling back a non-consummated transaction in the case of early program death should be the responsibility of the library, not of the caller. If I'm correct, the caller(s) won't have to be modified when the atexit facility is

Re: [PATCH] ls-files: do not trust stat info if lstat() fails

2014-04-03 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Apr 3, 2014 at 1:15 AM, Junio C Hamano gits...@pobox.com wrote: I am guessing that, even though this was discovered during the development of list-files, is a fix applicable outside the context of that series. I do think the patched result is an

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-03 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: On Mon, Mar 31, 2014 at 05:29:03PM -0700, Junio C Hamano wrote: * hv/submodule-ignore-fix (2013-12-06) 4 commits - disable complete ignorance of submodules for index - HEAD diff - always show committed submodules in summary after commit - teach add -f

Re: Bug in git-diff output

2014-04-03 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: rocketscienc01100101 . rocketscienc01100...@gmail.com writes: http://i.imgur.com/BoJSjm9.png Here's a screenshot that shows the problem. (better cut-and-paste the text than sending a PNG image) There's always a misplaced line in the

[PATCH v2 2/2] test/send-email: add to-cover test

2014-04-03 Thread Michael S. Tsirkin
Does it work? I am not sure. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 16 1 file changed, 16 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 3119c8c..3b17884 100755 --- a/t/t9001-send-email.sh +++

[PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

2014-04-03 Thread Michael S. Tsirkin
Allow extracting To/Cc addresses from cover letter. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16 2 files changed, 28 insertions(+) diff --git a/Documentation/git-send-email.txt

Re: [PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Allow extracting To/Cc addresses from cover letter. Please say what you are doing with what you extract, which is the more important part of the objective. Extracting is merely a step to achieve that. s/.$/, to be used as To/Cc addresses of the

RE: Git feature request: Option to force Git to abort a checkout if working directory is dirty (i.e. disregarding the check for conflicts)

2014-04-03 Thread Jonas Bang
Jonas Bang em...@jonasbang.dk writes: ... The default behaviour would cover their use case so your proposal would not hurt them, but I wonder if there are things you could do to help them as well, perhaps by allowing this new configuration to express something like local changes in

Re: [PATCH v2 2/2] test/send-email: add to-cover test

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Does it work? I am not sure. Then why was it sent here? diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 3119c8c..3b17884 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1334,6 +1334,22 @@ test_expect_success

Re: socket_perror() bug?

2014-04-03 Thread Junio C Hamano
Thiago Farina tfrans...@gmail.com writes: On Mon, Mar 31, 2014 at 5:50 PM, Junio C Hamano gits...@pobox.com wrote: Thiago Farina tfrans...@gmail.com writes: In imap-send.c:socket_perror() we pass |func| as a parameter, which I think it is the name of the function that called socket_perror,

[PATCH] gitweb.conf.txt: fix typo

2014-04-03 Thread git-patch
From: Jérôme Zago git-pa...@agt-the-walker.net build-time is used everywhere else. Signed-off-by: Jérôme Zago git-pa...@agt-the-walker.net --- Documentation/gitweb.conf.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitweb.conf.txt

Re: [PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

2014-04-03 Thread Eric Sunshine
On Thu, Apr 3, 2014 at 2:14 PM, Michael S. Tsirkin m...@redhat.com wrote: Allow extracting To/Cc addresses from cover letter. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16 2

Re: [PATCH 06/10] log: --function-name pickaxe

2014-04-03 Thread René Scharfe
Am 27.03.2014 19:50, schrieb David A. Dalrymple (and Bhushan G. Lodha): From: Bhushan G. Lodha David A. Dalrymple dad-...@mit.edu This is similar to the pickaxe grep option (-G), but applies the provided regex only to diff hunk headers, thereby showing only those commits which affect a

Re: [PATCH 06/10] log: --function-name pickaxe

2014-04-03 Thread Junio C Hamano
René Scharfe l@web.de writes: With that approach you depend on the hunk header and apparently need to add XDL_EMIT_MOREFUNCNAMES and XDL_EMIT_MOREHUNKHEADS to improve the results. This approach feels fragile. Would it perhaps be more robust to not base the implementation on diff and

Re: [PATCH V2 0/7] fix hunk editing with 'commit -p -m'

2014-04-03 Thread Jonathan Nieder
Hi, A quick note for the future: Benoit Pierre wrote: This patch fixes the fact that hunk editing with 'commit -p -m' does not work: GIT_EDITOR is set to ':' to indicate to hooks that no editor will be launched, which result in the 'hunk edit' option not launching the editor (and selecting

very important message.

2014-04-03 Thread Philippe Price
I apologize for sending you this sensitive information via E-mail. In my banking department we discovered an abandoned sum of 10,000,000.00$ [Ten Million Dollars Only) in an account that belongs to one of our Foreign customers who unfortunately lost his life with his entire family on his way to

Re: [PATCH v2 20/27] update-ref --stdin: Reimplement using reference transactions

2014-04-03 Thread Michael Haggerty
On 04/03/2014 05:57 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: I assumed that rolling back a non-consummated transaction in the case of early program death should be the responsibility of the library, not of the caller. If I'm correct, the caller(s) won't have