Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-24 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 5:52 AM, Matthieu Moy wrote: > Paul Tan writes: > >> Matthieu and Eric: I know I said I will try to re-order the patches to >> put the tests before the implementation, but after thinking and trying >> to rewrite the commit messages I realised it seems really weird to me. >

Re: [msysGit] Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-24 Thread Duy Nguyen
On Wed, Mar 25, 2015 at 1:39 PM, Johannes Schindelin wrote: > Hi Duy, > > On 2015-03-25 01:46, Duy Nguyen wrote: >> On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley wrote: >> >>> That said, the final error (which I'd missed in the earlier post) is: >>> fatal: make_cache_entry failed for path 'ifcfg

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-24 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 1:20 AM, Paul Tan wrote: > t0302 now tests git-credential-store's support for the XDG user-specific > configuration file $XDG_CONFIG_HOME/git/credentials. Specifically: > > * Ensure that the XDG file is strictly opt-in. It should not be created > by git at all times if it

Re: [msysGit] Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-24 Thread Johannes Schindelin
Hi Duy, On 2015-03-25 01:46, Duy Nguyen wrote: > On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley wrote: > >> That said, the final error (which I'd missed in the earlier post) is: >> fatal: make_cache_entry failed for path 'ifcfg-eth0:0' >> >> This is on the Windows (pre-compiled msysgit at v1.9.5)

Re: macblame - al alterntive to 'git blame'

2015-03-24 Thread Shenbaga Prasanna
sample output.. for file Gemfile.. Contributor: Prasanna with 93.75 % contribution with 30 lines of code Contributor: h4r1sh with 6.25 % contribution with 2 lines of code * * * * * * * * * * * * * * * * * * * * * * * * * and I built this tool by pipelining the output produced by 'git blame' and

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-24 Thread Paul Tan
Hi, On Wed, Mar 25, 2015 at 2:37 AM, Junio C Hamano wrote: > Paul Tan writes: > >> ..., I propose the following requirements for the rewritten code: >> >> 1. No spawning of external git processes. This is to support systems with >> high >>``fork()`` or process creation overhead, and to redu

[PATCH 8/8] t9001: drop save_confirm helper

2015-03-24 Thread Jeff King
The idea of this helper is that we want to save the current value of a config variable and then restore it again after the test completes. However, there's no point in actually saving the value; it should always be restored to the string "never" (which you can confirm by instrumenting save_confirm

[PATCH 7/8] t0020: use test_* helpers instead of hand-rolled messages

2015-03-24 Thread Jeff King
These tests are not wrong, but it is much shorter and more idiomatic to say "verbose" or "test_must_fail" rather than printing our own messages on failure. Likewise, there is no need to say "happy" at the end of a test; the test suite takes care of that. Signed-off-by: Jeff King --- I somehow mis

[PATCH 6/8] t: simplify loop exit-code status variables

2015-03-24 Thread Jeff King
Since shell loops may drop the exit code of failed commands inside the loop, some tests try to keep track of the status by setting a variable. This can end up cumbersome and hard to read; it is much simpler to just exit directly from the loop using "return 1" (since each case is either in a helper

[PATCH 5/8] t: fix some trivial cases of ignored exit codes in loops

2015-03-24 Thread Jeff King
These are all cases where we do a setup step of the form: for i in $foo; do set_up $i || break done && more_setup would not notice a failure in set_up (because break always returns a 0 exit code). These are just setup steps that we do not expect to fail, but it does not hurt to be

[PATCH 4/8] t7701: fix ignored exit code inside loop

2015-03-24 Thread Jeff King
When checking a list of file mtimes, we use a loop and break out early from the loop if any entry does not match. However, the exit code of a loop exited via break is always 0, meaning that the test will fail to notice we had a mismatch. Since the loop is inside a function, we can fix this by doing

[PATCH 2/8] t0020: fix ignored exit code inside loops

2015-03-24 Thread Jeff King
A loop like: for f in one two; do something $f || break done will correctly break out of the loop when we see a failure of one item, but the resulting exit code will always be zero. We can fix that by putting the loop into a function or subshell, but in this case it is sim

[PATCH 3/8] t3305: fix ignored exit code inside loop

2015-03-24 Thread Jeff King
When we test deleting notes, we run "git notes remove" in a loop. However, the exit value of the loop will only reflect the final note we process. We should break out of the loop with a failing exit code as soon as we see a problem. Note that we can call "exit 1" here without explicitly creating a

[PATCH 1/8] perf-lib: fix ignored exit code inside loop

2015-03-24 Thread Jeff King
When copying the test repository, we try to detect whether the copy succeeded. However, most of the heavy lifting is done inside a for loop, where our "break" will lose the exit code of the failing "cp". We can take advantage of the fact that we are in a subshell, and just "exit 1" to break out wit

[PATCH 0/8] more &&-chaining test fixups

2015-03-24 Thread Jeff King
Here's what I found looking for loops like: for i in a b c; do something_important $i || break done && something_else which presumably expect the chain to stop when something_important fails for any loop element. The solutions are one of (depending on the surrounding code): 1. Switc

Re: [PATCH 01/25] t/test-lib: introduce --chain-lint option

2015-03-24 Thread Jeff King
On Wed, Mar 25, 2015 at 03:53:52AM +0100, SZEDER Gábor wrote: > > cmd1 && > > for i in a b c; do > > cmd2 $i > > done && > > cmd3 > > > > which will not notice failures of "cmd2 a" or "cmd b" > > s/cmd b/cmd2 b/ ? Yes, but the patches are already in next, so it is sadl

Re: [PATCH 17/25] t0020: use modern test_* helpers

2015-03-24 Thread Jeff King
On Wed, Mar 25, 2015 at 01:23:23AM +0100, SZEDER Gábor wrote: > > for f in one dir/two > > do > > append_cr <$f >tmp && mv -f tmp $f && > >-git update-index -- $f || { > >-echo Oops > >-false > >-break > >-

Re: [PATCH 01/25] t/test-lib: introduce --chain-lint option

2015-03-24 Thread SZEDER Gábor
Quoting Jeff King : However, there are a number of places it cannot reach: - it cannot find a failure to break out of loops on error, like: cmd1 && for i in a b c; do cmd2 $i done && cmd3 which will not notice failures of "cmd2 a" or "cmd b" s/cmd b/

Re: [PATCH 21/25] t9001: use test_when_finished

2015-03-24 Thread Jeff King
On Wed, Mar 25, 2015 at 03:00:22AM +0100, SZEDER Gábor wrote: > >Instead, they can all use test_when_finished, and we can > >even make the code simpler by factoring out the shared > >lines. > > I think that saving the value of 'sendemail.confirm' is not necessary. > > There are two blocks of con

Re: [PATCH 18/25] t1301: use modern test_* helpers

2015-03-24 Thread Jeff King
On Wed, Mar 25, 2015 at 12:51:20AM +0100, SZEDER Gábor wrote: > >@@ -33,7 +32,7 @@ do > > git init --shared=1 && > > test 1 = "$(git config core.sharedrepository)" > > ) && > >-actual=$(ls -l sub/.git/HEAD) > >+actual=$(ls

Re: [PATCH 21/25] t9001: use test_when_finished

2015-03-24 Thread SZEDER Gábor
Quoting Jeff King : The confirmation tests in t9001 all save the value of sendemail.confirm, do something to it, then restore it at the end, in a way that breaks the &&-chain (they are not wrong, because they save the $? value, but it fools --chain-lint). Instead, they can all use test_when_fi

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

2015-03-24 Thread Junio C Hamano
Jakub Narębski writes: > On Tue, Mar 24, 2015 at 11:26 PM, Junio C Hamano wrote: >> >> Junio C Hamano writes: >> >> > * jn/gitweb-utf8-in-links (2014-05-27) 1 commit >> > - gitweb: Harden UTF-8 handling in generated links >> >> This has been lingering in my 'pu' branch without seeing any updat

Re: [PATCH] gc: save log from daemonized gc --auto and print it next time

2015-03-24 Thread Duy Nguyen
On Wed, Mar 25, 2015 at 5:07 AM, Junio C Hamano wrote: >> + LANG=C git gc --auto && >> + sleep 1 && # give it time to daemonize >> + while test -f .git/gc.pid; do sleep 1; done && > > Yuck... Yeah.. it's hard to test daemon things. I'm not even sure if we shoul

Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-24 Thread Duy Nguyen
On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley wrote: > I've corrected the sparse-checkout, but won't the command line 'git > update-index --skip-worktree' will still need it? (demo commands below) A "git checkout" (without arguments) or "read-trree -mu" should attach skip-worktree properly. You

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

2015-03-24 Thread Jakub Narębski
On Tue, Mar 24, 2015 at 11:26 PM, Junio C Hamano wrote: > > Junio C Hamano writes: > > > * jn/gitweb-utf8-in-links (2014-05-27) 1 commit > > - gitweb: Harden UTF-8 handling in generated links > > This has been lingering in my 'pu' branch without seeing any updates > since $gmane/250758; is anybo

Re: [PATCH 17/25] t0020: use modern test_* helpers

2015-03-24 Thread SZEDER Gábor
Quoting Jeff King : This test contains a lot of hand-rolled messages to show when the test fails. We can omit most of these by using "verbose" and "test_must_fail". A few of them are for update-index, but we can assume it produces reasonable error messages when it fails. Signed-off-by: Jeff Ki

Re: [PATCH 18/25] t1301: use modern test_* helpers

2015-03-24 Thread SZEDER Gábor
Quoting Jeff King : This shortens the code and fixes some &&-chaining. Signed-off-by: Jeff King --- t/t1301-shared-repo.sh | 20 +++- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh index 7eecfb8..ac10875 100755

Re: Sparse checkout not working as expected (colons in filenames on Windows)

2015-03-24 Thread Philip Oakley
From: "Duy Nguyen" On Fri, Mar 20, 2015 at 6:07 AM, Philip Oakley wrote: Hi, I was expecting that sparse checkout could be used to avoid the checking out, by git, of files which have colons in their name into the worktree when on Windows. Yue Lin Ho reported on the Msygit list [1] that he h

Re: [PATCH 19/25] t6034: use modern test_* helpers

2015-03-24 Thread SZEDER Gábor
Quoting Jeff King : These say roughly the same thing as the hand-rolled messages. We do lose the "merge did not complete" debug message, but merge and write-tree are prefectly capable of s/prefectly/perfectly/ writing useful error messages when they fail. Signed-off-by: Jeff King --- --

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

2015-03-24 Thread Junio C Hamano
Junio C Hamano writes: > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. > > This cycle is turning out to be a "shoot for product excellence" > release. About half of the commits that ha

Re: [PATCH] Documentation: Add target to build PDF manpages

2015-03-24 Thread Philip Oakley
From: "Michael J Gruber" Junio C Hamano venit, vidit, dixit 20.03.2015 23:38: Stefan Beller writes: Thomas referencing reading the man page offline, made me wonder why you wouldn't read the man pages itself as they can also be carried around offline. But the striking point is "on an iPad",

Re: A good time to pull from your gitk tree?

2015-03-24 Thread Paul Mackerras
On Mon, Mar 23, 2015 at 12:03:37PM -0700, Junio C Hamano wrote: > > Is it a good time for me to pull from you, or do you recommend me to > wait for a bit, expecting more? We'll go in the pre-release freeze > soon-ish, so I thought I should ping. Now is a good time to pull from the usual place, t

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

2015-03-24 Thread Junio C Hamano
Junio C Hamano writes: > * jn/gitweb-utf8-in-links (2014-05-27) 1 commit > - gitweb: Harden UTF-8 handling in generated links This has been lingering in my 'pu' branch without seeing any updates since $gmane/250758; is anybody still interested in resurrecting it and moving it forward? Thanks.

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

2015-03-24 Thread Junio C Hamano
> * pw/remote-set-url-fetch (2014-11-26) 1 commit > - remote: add --fetch and --both options to set-url This has not seen any activity for a few months since $gmane/261483; is anybody still interested in resurrecting it? -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [PATCH] gc: save log from daemonized gc --auto and print it next time

2015-03-24 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 8:17 AM, Nguyễn Thái Ngọc Duy wrote: > While commit 9f673f9 (gc: config option for running --auto in > background - 2014-02-08) helps reduce some complaints about 'gc > --auto' hogging the terminal, it creates another set of problems. > > The latest in this set is, as the r

Re: [PATCH] gc: save log from daemonized gc --auto and print it next time

2015-03-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > While commit 9f673f9 (gc: config option for running --auto in > background - 2014-02-08) helps reduce some complaints about 'gc > --auto' hogging the terminal, it creates another set of problems. > > The latest in this set is, as the result of daemonizing, stderr i

Re: [PATCH] read-cache: tighten checks for do_read_index

2015-03-24 Thread Thomas Gummerer
On 03/24, Junio C Hamano wrote: > Thomas Gummerer writes: > > > 03f15a7 read-cache: fix reading of split index moved the checks for the > > correct order of index entries out of do_read_index. This loosens the > > checks more than necessary. Re-introduce the checks for the order, but > > don't e

Re: [PATCH] read-cache: tighten checks for do_read_index

2015-03-24 Thread Junio C Hamano
Thomas Gummerer writes: > 03f15a7 read-cache: fix reading of split index moved the checks for the > correct order of index entries out of do_read_index. This loosens the > checks more than necessary. Re-introduce the checks for the order, but > don't error out when we have multiple stage-0 entr

Re: Re* [PATCH 10/15] commit.c: fix a memory leak

2015-03-24 Thread Stefan Beller
On Tue, Mar 24, 2015 at 2:17 PM, Junio C Hamano wrote: > > Move it to dir.c where match_pathspec() is defined. > > Signed-off-by: Junio C Hamano Reviewed-by: Stefan Beller -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org Mor

Re* [PATCH 10/15] commit.c: fix a memory leak

2015-03-24 Thread Junio C Hamano
Duy Nguyen writes: > On Sat, Mar 21, 2015 at 10:59 AM, Junio C Hamano wrote: >> A further tangent (Duy Cc'ed for this point). We might want to >> rethink the interface to ce_path_match() and report_path_error() >> so that we do not have to do a separate allocation of "has this >> pathspec been

Re: Git ignore help

2015-03-24 Thread Junio C Hamano
Eric Sunshine writes: > On Tue, Mar 24, 2015 at 5:39 AM, Duy Nguyen wrote: >> On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine >> wrote: e.g. "db", "reports" or "scripts", we could keep going for a while. I think I attempted to do this in the past and failed (don't remember exactl

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 Thread phillip
Thanks a lot for fixing! Phillip > >Let's apply this instead. > >-- >8 -- >From: Phillip Sz >Date: Sat, 21 Mar 2015 13:52:37 +0100 >Subject: [PATCH] l10n: de.po: add space before ellipsis > >Signed-off-by: Phillip Sz >Signed-off-by: Ralf Thielow >--- > po/de.po | 32 -

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

2015-03-24 Thread Junio C Hamano
Junio C Hamano writes: > [Stalled] > > * mh/fdopen-with-retry (2015-03-06) 6 commits > - buffer_fdinit(): use fdopen_with_retry() > - update_info_file(): use fdopen_with_retry() > - copy_to_log(): use fdopen_with_retry() > - fdopen_lock_file(): use fdopen_with_retry() > - SQUASH??? $gmane/26

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

2015-03-24 Thread Jeff King
On Tue, Mar 24, 2015 at 01:02:35PM -0700, Junio C Hamano wrote: > > * jk/test-chain-lint (2015-03-22) 28 commits > [...] > > What I queued here has fix to the issue J6t found in 15/25 squashed > > in, and also has 26/25 and 27/25 follow-up fixes from Michael, plus > > 28/25 follow-up from Torst

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

2015-03-24 Thread Junio C Hamano
Junio C Hamano writes: > * jk/test-chain-lint (2015-03-22) 28 commits > - t6039: fix broken && chain > - t9158, t9161: fix broken &&-chain in git-svn tests > - t9104: fix test for following larger parents > - t4104: drop hand-rolled error reporting > - t0005: fix broken &&-chains > - t7004:

[PATCH v2] t1501: fix test with split index

2015-03-24 Thread Thomas Gummerer
t1501-worktree.sh does not copy the shared index in the "relative $GIT_WORK_TREE and git subprocesses" test, which makes the test fail when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in order to fix this. Helped-by: Junio C Hamano Signed-off-by: Thomas Gummerer --- > Is this a

[PATCH 1/2] l10n: de.po: add space before ellipsis

2015-03-24 Thread Ralf Thielow
From: Phillip Sz Signed-off-by: Phillip Sz Signed-off-by: Ralf Thielow --- po/de.po | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/po/de.po b/po/de.po index 11fbd0f..7b30f62 100644 --- a/po/de.po +++ b/po/de.po @@ -616,7 +616,7 @@ msgstr "" #: hel

[PATCH 2/2] l10n: de.po: fix messages with abbreviated hashs

2015-03-24 Thread Ralf Thielow
The three dots in messages where the hash is abbreviated were misinterpreted and are fixed with this commit. Noticed-by: Junio C Hamano Signed-off-by: Ralf Thielow --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 7b30f62..f818350 100

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-24 Thread Junio C Hamano
Paul Tan writes: > ..., I propose the following requirements for the rewritten code: > > 1. No spawning of external git processes. This is to support systems with high >``fork()`` or process creation overhead, and to reduce redundant IO by >taking advantage of the internal object, index a

Re: [PATCH, RFC] checkout: Attempt to checkout submodules

2015-03-24 Thread Trevor Saunders
On Mon, Mar 23, 2015 at 09:01:48PM +0100, Jens Lehmann wrote: > Am 20.03.2015 um 01:13 schrieb Trevor Saunders: > >On Thu, Mar 19, 2015 at 02:15:19PM -0700, Junio C Hamano wrote: > >>Trevor Saunders writes: > >>I have a feeling that an optional feature that allows "git submodule > >>update" to hap

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Junio C Hamano
Michael Haggerty writes: > Regarding specifically allowing/disallowing a leading '+': I saw a > couple of callsites that explicitly check that the first character is a > digit before calling strtol(). I assumed that is to disallow sign > characters [1]. For example, > > diff.c: optarg() This

Re: [RFC/PATCH 0/3] protocol v2

2015-03-24 Thread Junio C Hamano
Stefan Beller writes: > So I started looking into extending the buffer size as another 'first step' > towards the protocol version 2 again. But now I think the packed length > limit of 64k is actually a good and useful thing to have and should be > extended/fixed if and only if we run into seriou

Re: [PATCH] t1501: fix test with split index

2015-03-24 Thread Junio C Hamano
Thomas Gummerer writes: > t1501-worktree.sh does not copy the shared index in the "relative > $GIT_WORK_TREE and git subprocesses" test, which makes the test fail > when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in > order to fix this. > > Signed-off-by: Thomas Gummerer > --- >

[PATCH] read-cache: tighten checks for do_read_index

2015-03-24 Thread Thomas Gummerer
03f15a7 read-cache: fix reading of split index moved the checks for the correct order of index entries out of do_read_index. This loosens the checks more than necessary. Re-introduce the checks for the order, but don't error out when we have multiple stage-0 entries in the index. Return a flag fo

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 Thread Ralf Thielow
2015-03-24 18:32 GMT+01:00 Junio C Hamano : > Ralf Thielow writes: > >> diff --git a/po/de.po b/po/de.po >> index 11fbd0f..9fa3f4c 100644 >> --- a/po/de.po >> +++ b/po/de.po >> @@ -616,7 +616,7 @@ msgstr "" >> #: help.c:373 >> #, c-format >> msgid "in %0.1f seconds automatically..." >> -msgstr

Re: [PATCH 09/15] http: release the memory of a http pack request as well

2015-03-24 Thread Junio C Hamano
Stefan Beller writes: > Well there is hope, as `release_request` only touches > free(request->url); > free(request); > > and not the userData pointer. OK. > I am a bit puzzled what you're trying to hint at. The caller does this: static void start_fetch_packed(struct transfer_r

Re: [PATCH v2] diff-lib.c: adjust position of i-t-a entries in diff

2015-03-24 Thread Junio C Hamano
Duy Nguyen writes: > "read-tree -m" does not invoke diff, does it? If I went with my > previous approach (modifying unpack-trees to ignore i-t-a entries) > then this could be a problem, but because unpack-trees is untouched, > merge operations should not be impacted by this patch. Theoretically

Re: [RFC/PATCH 0/3] protocol v2

2015-03-24 Thread Stefan Beller
On Tue, Mar 3, 2015 at 9:13 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Junio pointed out in private that I didn't address the packet length >> limit (64k). I thought I could get away with a new capability >> (i.e. not worry about it now) but I finally admit that was a bad >> hack. So per

Re: Git ignore help

2015-03-24 Thread Eric Sunshine
On Tue, Mar 24, 2015 at 5:39 AM, Duy Nguyen wrote: > On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine > wrote: >>> e.g. "db", "reports" or "scripts", we could keep going for a while. I >>> think I attempted to do this in the past and failed (don't remember >>> exactly why). Maybe I'll try again so

[PATCH] t1501: fix test with split index

2015-03-24 Thread Thomas Gummerer
t1501-worktree.sh does not copy the shared index in the "relative $GIT_WORK_TREE and git subprocesses" test, which makes the test fail when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in order to fix this. Signed-off-by: Thomas Gummerer --- This applies on top of nd/multiple-work

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Michael Haggerty
On 03/24/2015 04:58 PM, Junio C Hamano wrote: > Michael Haggerty writes: > >> It is easy to allow "--abbrev=+7"; I would just need to add NUM_PLUS to >> those call sites. Should I do so? > > The more relevant question to ask from my point of view is why you > need to "add" NUM_PLUS to "enable" i

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 Thread Ralf Thielow
2015-03-24 18:10 GMT+01:00 Ralf Thielow : > Let's apply this instead. > > -- >8 -- > #: builtin/notes.c:51 > msgid "git notes copy --stdin [ ]..." > -msgstr "git notes copy --stdin [ ]..." > +msgstr "git notes copy --stdin [ ] ..." > > #: builtin/remote.c:64 > msgid "git remote update [] [ | ]

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-24 Thread Matthieu Moy
Paul Tan writes: > On Tue, Mar 24, 2015 at 6:19 PM, Matthieu Moy > wrote: > >> About the timeline: I'd avoid too much parallelism. Usually, it's best >> to try to send a first patch to the mailing list as soon as possible, >> hence focus on one point first (I'd do that with pull, since that's th

Re: [RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-24 Thread Paul Tan
On Tue, Mar 24, 2015 at 6:19 PM, Matthieu Moy wrote: > A few minor details: > > "on operating systems with poor file system performance (i.e. Windows)" > => that's not only windows, I also commonly use a slow filesystem on > Linux, just because it's NFS. Mentionning other cases of poor filesystem

Re: [PATCH 2/2] read-cache: fix reading of split index

2015-03-24 Thread Junio C Hamano
Duy Nguyen writes: > Thank you for catching this. I was about to write "would be nice to > point out what tests fail so the reviewer has easier time trying > themselves", but whoa.. quite a few of them! > > May I suggest a slight modification. Even though stage info is messed > up before the inde

Re: [PATCH 2/2] read-cache: fix reading of split index

2015-03-24 Thread Thomas Gummerer
On 03/24, Duy Nguyen wrote: > On Sat, Mar 21, 2015 at 4:43 AM, Thomas Gummerer wrote: > > The split index extension uses ewah bitmaps to mark index entries as > > deleted, instead of removing them from the index directly. This can > > result in an on-disk index, in which entries of stage #0 and h

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 Thread Ralf Thielow
Michael J Gruber wrote: > Ralf Thielow venit, vidit, dixit 21.03.2015 22:21: > > Am 21. März 2015 um 13:52 schrieb Phillip Sz : > >> > >> I think we should use it like this, as most open-source projects do. > >> Also we should use a space before the three dots as per > >> http://www.duden.de/spra

Re: [PATCH 09/15] http: release the memory of a http pack request as well

2015-03-24 Thread Stefan Beller
On Sun, Mar 22, 2015 at 12:36 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> The cleanup function is used in 4 places now and it's always safe to >> free up the memory as well. >> >> Signed-off-by: Stefan Beller >> --- >> http.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread René Scharfe
Am 24.03.2015 um 17:06 schrieb Michael Haggerty: Parsing numbers is not rocket science, but there are a lot of pitfalls, especially around overflow. It's even harder to write such code via macros and the result is less readable. This patch series is mostly about finding a reasonable API and whip

[RFC/GSoC] Proposal: Make git-pull and git-am builtins

2015-03-24 Thread Paul Tan
Hi all, I'm applying for git in the Google Summer of Code this year. For my project, I propose to rewrite git-pull.sh and git-am.sh into fast optimized C builtins. I've already hacked up a prototype of a builtin git-pull in [1], and it showed a promising 8x improvement in execution time on Windows

Re: [PATCH 1/1] l10n: de.po: use "bla …" instead of "bla..."

2015-03-24 Thread Michael J Gruber
Ralf Thielow venit, vidit, dixit 21.03.2015 22:21: > Am 21. März 2015 um 13:52 schrieb Phillip Sz : >> >> I think we should use it like this, as most open-source projects do. >> Also we should use a space before the three dots as per >> http://www.duden.de/sprachwissen/rechtschreibregeln/auslassun

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Michael Haggerty
On 03/19/2015 07:22 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> * It allows leading whitespace. > > This might be blessing in disguise. Our friends on MacOS may be > relying on that > > git cmd --abbrev="$(wc -c > to work "as expected", even though their "wc" gives leading

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Junio C Hamano
Junio C Hamano writes: > Michael Haggerty writes: > >> It is easy to allow "--abbrev=+7"; I would just need to add NUM_PLUS to >> those call sites. Should I do so? > > The more relevant question to ask from my point of view is why you > need to "add" NUM_PLUS to "enable" it. What valid reason d

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Michael Haggerty
On 03/19/2015 08:32 AM, Junio C Hamano wrote: > Jeff King writes: > >> I wonder how much of the boilerplate in the parse_* functions could be >> factored out to use a uintmax_t, with the caller just providing the >> range. That would make it easier to add new types like off_t, and >> possibly eve

Re: [PATCH/RFC/GSOC] make git-pull a builtin

2015-03-24 Thread Paul Tan
On Mon, Mar 23, 2015 at 6:18 PM, Duy Nguyen wrote: > Could you share these changes? I'm just wondering if we can add kcov > support to the test suite. In this case it's more of an embarrassing hack, as I just needed a way to make git run "kcov outdir git-pull.sh" whenever git pull is called since

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Junio C Hamano
Michael Haggerty writes: > It is easy to allow "--abbrev=+7"; I would just need to add NUM_PLUS to > those call sites. Should I do so? The more relevant question to ask from my point of view is why you need to "add" NUM_PLUS to "enable" it. What valid reason do you have to forbid it anywhere?

[RFH/PATCH] git-svn: adjust info to svn 1.7 and 1.8

2015-03-24 Thread Michael J Gruber
t9119 refuses to run with svn versions greater than 1.6 since "git svn info" does not even try to match the output of "svn info" for later versions. Adjust "git svn info" to match these versions and make t9119 run with them. This requires the following changes: * compute checksums with SHA1 inste

Re: [PATCH 00/14] numparse module: systematically tighten up integer parsing

2015-03-24 Thread Michael Haggerty
On 03/19/2015 06:26 AM, Jeff King wrote: > On Tue, Mar 17, 2015 at 05:00:02PM +0100, Michael Haggerty wrote: > >> My main questions: >> >> * Do people like the API? My main goal was to make these functions as >> painless as possible to use correctly, because there are so many >> call sites. >>

Re: [PATCH] git.txt: list index versions in plain English

2015-03-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > At the first look, a user may think the default version is "23". Even > with UNIX background, there's no reference anywhere close that may > indicate this is glob or regex. > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- Thanks. > Documentation/git.txt | 3 ++- >

Re: per-repository and per-worktree config variables

2015-03-24 Thread Duy Nguyen
On Thu, Mar 19, 2015 at 4:33 AM, Max Kirillov wrote: > On Sun, Feb 08, 2015 at 09:36:43AM -0800, Jens Lehmann wrote: >> I wonder if it's worth all the hassle to invent new names. Wouldn't >> it be much better to just keep a list of per-worktree configuration >> value names and use that inside the

Re: [PATCH 10/15] commit.c: fix a memory leak

2015-03-24 Thread Duy Nguyen
On Sat, Mar 21, 2015 at 10:59 AM, Junio C Hamano wrote: > A further tangent (Duy Cc'ed for this point). We might want to > rethink the interface to ce_path_match() and report_path_error() > so that we do not have to do a separate allocation of "has this > pathspec been used?" array. This was a r

Re: Git ignore help

2015-03-24 Thread Duy Nguyen
On Tue, Mar 24, 2015 at 7:46 PM, wrote: > Duy, you wrote: > > "This is true. To elaborate, if we have to recurse in excluded directories so > that we can include some back, then the reason for excluding is already > defeated as we may need to traverse the entire directory structure. However >

Re: [PATCH 2/2] read-cache: fix reading of split index

2015-03-24 Thread Duy Nguyen
On Sat, Mar 21, 2015 at 4:43 AM, Thomas Gummerer wrote: > The split index extension uses ewah bitmaps to mark index entries as > deleted, instead of removing them from the index directly. This can > result in an on-disk index, in which entries of stage #0 and higher > stages appear, which are rem

Bug? git push --recurse-submodules=on-demand is not truly recursive

2015-03-24 Thread Uwe Sommerlatt
I have the following project structure: root-project | |-- A | | | |-- C | |-- B A and B are submodules of the root-project. C is in turn a submodule of project A. Suppose I have made changes to projects A,B and C and commited these changes to the respectiv

Re: Git ignore help

2015-03-24 Thread mdconf
Hi Duy, Eric, thx a lot. So net net - I can't really achieve this. It feels like something very basic and simple so pretty surprising but guess that's what it is :) Normally, I'd expect that the functionality will behave like with similar other blacklist/whitelist functionalities in Linux - tha

[PATCH] gc: save log from daemonized gc --auto and print it next time

2015-03-24 Thread Nguyễn Thái Ngọc Duy
While commit 9f673f9 (gc: config option for running --auto in background - 2014-02-08) helps reduce some complaints about 'gc --auto' hogging the terminal, it creates another set of problems. The latest in this set is, as the result of daemonizing, stderr is closed and all warnings are lost. This

Re: [PATCH v5 3/3] t0302: test credential-store support for XDG_CONFIG_HOME

2015-03-24 Thread Matthieu Moy
Paul Tan writes: > Matthieu and Eric: I know I said I will try to re-order the patches to > put the tests before the implementation, but after thinking and trying > to rewrite the commit messages I realised it seems really weird to me. > In this patch series, the implementation is split across th

Re: Git ignore help

2015-03-24 Thread Duy Nguyen
On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine wrote: >> e.g. "db", "reports" or "scripts", we could keep going for a while. I >> think I attempted to do this in the past and failed (don't remember >> exactly why). Maybe I'll try again some time in future. > > I also was pretty sure that you had a

Re: macblame - al alterntive to 'git blame'

2015-03-24 Thread Duy Nguyen
On Tue, Mar 24, 2015 at 2:07 PM, Shenbaga Prasanna S wrote: > https://rubygems.org/gems/macblame/ > > check this out.. and you can also contribute to the developement at, > > https://github.com/praserocking/macblame-gem > or > https://github.com/praserocking/macblame > .. > hope this tool will be

macblame - al alterntive to 'git blame'

2015-03-24 Thread Shenbaga Prasanna S
https://rubygems.org/gems/macblame/ check this out.. and you can also contribute to the developement at, https://github.com/praserocking/macblame-gem or https://github.com/praserocking/macblame .. hope this tool will be helpful to you all! Thanks, Prasanna -- To unsubscribe from this list: send