Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

Johannes Schindelin writes: > This is the correct thing to do, really: we already specify LF as > field separator. I'm almost convinced that this is the right thing to do in the long run ("almost" because I'm not sure, not because I have arguments against). I agree

git repack command on larger pack file

Hi, I ran git repack on a single larger repository abc.git where the pack file size 34 GB. Generally it used to take 20-25 minutes in my server to complete the repacking. During repacking I noticed, disk usage was more, So I thought of splitting the pack file into 4 GB chunks. I used the

Re: git repack command on larger pack file

Sivakumar Selvam writes: >I ran git repack on a single larger repository abc.git where the pack > file size 34 GB. Generally it used to take 20-25 minutes in my server to > complete the repacking. During repacking I noticed, disk usage was more, So > I thought of

Re: [PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Hi Junio, On Sun, 25 Oct 2015, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Chad Boles reported that `git rebase -i` recently started producing > > errors when the editor saves files with DOS line endings. The symptom > > is: > > > > Warning: the

Re: [PATCH v4 1/3] Add test to describe expectation of blame --reverse with branched history

Max Kirillov writes: > If history contains merges from feature branches, `blame --reverse` > reports not the commit when the line was actually edited, but head of > the last merged branch which was created before the edit. > > As a workaround, `blame --reverse --first-parent`

Re: git repack command on larger pack file

Junio C Hamano writes: > Sivakumar Selvam writes: > >> ... So >> I thought of splitting the pack file into 4 GB chunks. > ... > Hmmm, what is "this issue"? I do not see anything surprising. While the explanation might have been enlightening, the

[PATCH/RFC] receive-pack: allow for hiding refs outside the namespace

Right now, we always advertise all refs as ".have", even those outside the current namespace. This leads to problems when trying to push to a repository with a huge number of namespaces from a slow connection. Add a configuration option receive.advertiseAllRefs that can be used to determine

Re: [PATCH] blame: fix option name in error message

Max Kirillov writes: > The option name used in blame's UI is `--reverse`. > > Signed-off-by: Max Kirillov > --- ;-) It is surprising that nobody noticed this which was in the very original of --reverse. Thanks. > builtin/blame.c | 2 +- > 1 file changed, 1

Re: [PATCH 1/2] run-command: factor out child_process_clear()

On Mon, Oct 26, 2015 at 11:43 AM, Junio C Hamano wrote: > René Scharfe writes: > >> Avoid duplication by moving the code to release allocated memory for >> arguments and environment to its own function, child_process_clear(). >> Export it to provide a counterpart

Re: [PATCH 6/6] Correct fscanf formatting string for I64u values

Thanks; will queue. -- 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: [PATCH 5/6] Silence GCC's "cast of pointer to integer of a different size" warning

OK. Will queue. 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: [PATCH 3/6] Facilitate debugging Git executables in tests with gdb

Johannes Schindelin wrote: > When prefixing a Git call in the test suite with 'TEST_GDB_GIT=1 ', it > will now be run with GDB, allowing the developer to debug test failures > more conveniently. Neat. [...] > --- a/wrap-for-bin.sh > +++ b/wrap-for-bin.sh > @@ -19,4 +19,11 @@

Re: [PATCH 0/5] Remove unused #include "sigchain.h"

On 10/22/2015 02:43 PM, Tobias Klauser wrote: > This series removes the #include of sigchain.h from several modules > after they were changed to use the tempfile module and they thus no > longer use any declarations from sigchain.h > > Tobias Klauser (5): > gc: remove unused #include

[PATCH 2/3] t6031: generalize for recursive and resolve strategies

This script tests the filemode handling of merge-recursive, but we do not test the same thing for merge-resolve. Let's generalize the script a little: 1. Break out the setup steps for each test into a separate snippet. 2. For each test, run it twice; once with "-s recursive" and

Re: [PATCH 0/3] detecting delete/modechange conflicts

On Mon, Oct 26, 2015 at 02:46:42PM -0700, Junio C Hamano wrote: > > After looking through the history and the list archive, I don't _think_ > > this was intentional, and we simply missed the case in both places. But > > maybe somebody else knows something I don't. It seems like we should be > >

Re: [PATCH] user-manual: fix the description of fast-forward

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: [PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Johannes Schindelin writes: > A simple test with CR/LF line endings in a script reveals that it is > pretty solid: > > x=a > case "$x" in a) echo b;; esac > > prints out 'b', as expected. I do not see what this has to do with anything. The shell language

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

Junio C Hamano writes: > Something along the line of the following would be tolerable, even > though I think in the longer term, not just in Git land but in the > larger ecosystem to use POSIXy tools on Windows, the best solution > is to fix the shell so that it matches the

Re: [PATCH 1/2] http: allow selection of proxy authentication method

Knut Franke writes: > CURLAUTH_ANY does not work with proxies which answer unauthenticated requests > with a 307 redirect to an error page instead of a 407 listing supported > authentication methods. Therefore, allow the authentication method to be set > using the

[PATCH 0/3] detecting delete/modechange conflicts

I was surprised to find that: # base commit echo base >file && git add file && git commit -m base && # one side changes mode chmod +x file && git commit -am executable && # the other deletes the file git checkout -b other HEAD^ && git rm file && git commit -am removed &&

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

On Sun, Oct 25, 2015 at 09:58:56AM -0700, Junio C Hamano wrote: > >>> I cannot speak for the person who was primarily responsible for > >>> designing this behaviour, but I happen to agree with the current > >>> behaviour in the situation where it was designed to be used. Upon > >>> the first use

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

Johannes Schindelin writes: > This patch was required to work behind a faulty AP and scraped from > http://stackoverflow.com/questions/15227130/#15228479 and guarded with > an appropriate cURL version check by Johannes Schindelin. > > Signed-off-by: Johannes

[PATCH 3/3] merge: detect delete/modechange conflict

If one side deletes a file and the other changes its content, we notice and report a conflict. However, if instead of changing the content, we change only the mode, the merge does not notice (and the mode change is silently dropped). The trivial index merge notices the problem and correctly

Re: [PATCH 0/3] detecting delete/modechange conflicts

Jeff King writes: > After looking through the history and the list archive, I don't _think_ > this was intentional, and we simply missed the case in both places. But > maybe somebody else knows something I don't. It seems like we should be > punting to the user under the general

Re: [PATCH v3] Add git-grep threads param

On Mon, Oct 26, 2015 at 03:32:13PM +0300, Victor Leschuk wrote: > Make number of git-grep worker threads a configuration parameter. > According to several tests on systems with different number of CPU cores > the hard-coded number of 8 threads is not optimal for all systems: > tuning this

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

Stefan Beller writes: > IIUC at the time submodules were invented, there was need for lots of > code to be written. > Each command needed new code to deal with submodules. As there was not > enough people/time > to do it properly, the "do nothing" was the safest action which

Re: [PATCH 1/6] Only use CURLOPT_LOGIN_OPTIONS if it is actually available

Thanks. Makes sense. It probably needs to have imap-send early on the title, though (will locally amend, so no need to resend). -- 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

Re: [PATCH] use pop_commit() for consuming the first entry of a struct commit_list

René Scharfe writes: > Instead of open-coding the function pop_commit() just call it. This > makes the intent clearer and reduces code size. > > Signed-off-by: Rene Scharfe > --- > builtin/fmt-merge-msg.c | 9 +++-- > builtin/merge.c | 12 +---

Re: [PATCH 2/2] daemon: plug memory leak

On Sat, Oct 24, 2015 at 02:23:20PM +0200, René Scharfe wrote: > Call child_process_clear() when a child ends to release the memory > allocated for its environment. This is necessary because unlike all > other users of start_command() we don't call finish_command(), which > would have taken care

Re: [PATCH 4/6] Squelch warning about an integer overflow

Johannes Schindelin writes: > We cannot rely on long integers to have more than 32 bits... > > Signed-off-by: Johannes Schindelin > --- Interesting. 8192 * 1024 * 1024 does not fit within 32-bit long, of course. Perhaps we can lose L

Re: [PATCH v1] git-p4: Add option to ignore empty commits

On 24/10/15 19:08, Lars Schneider wrote: On 21 Oct 2015, at 08:32, Luke Diamand wrote: On 19/10/15 19:43, larsxschnei...@gmail.com wrote: From: Lars Schneider This seems to be adding a new function in the middle of an existing function. Is

What's cooking in git.git (Oct 2015, #06; Mon, 26)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. At tinyurl.com/gitCal, I drew a 14-week schedule for this cycle. I plan to be offline during weeks #7-#9 myself; hopefully we'll have capable

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

On Mon, Oct 26, 2015 at 01:15:17PM -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > > This patch was required to work behind a faulty AP and scraped from > > http://stackoverflow.com/questions/15227130/#15228479 and guarded with > > an appropriate cURL

Re: [PATCH/RFC] receive-pack: allow for hiding refs outside the namespace

Is there a reason why transfer.hiderefs is not sufficient? -- 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

[PATCH 1/3] t6031: move triple-rename test to t3030

The t6031 test was introduced to check filemode handling of merge-recursive. Much later, an unrelated test was tacked on to look at renames and d/f conflicts. This test does not depend on anything that happened before (it actually blows away any existing content in the test repo). Let's move it to

[PATCH] Fix missing accelerators causing crashes with old translations

From: mickael9 Signed-off-by: Mickaël Thomas --- gitk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index 2028b55..fcc606e 100755 --- a/gitk +++ b/gitk @@ -12452,8 +12452,8 @@ if {$cmdline_files ne {} || $revtreeargs

[gmane.comp.version-control.git] [PATCH 0/4] gitk crash fix and locale updates

Ping. What do you think of these? It appears that quite a many people are getting bitten by the issues this series addresses. Thanks. From: Takashi Iwai Newsgroups: gmane.comp.version-control.git Subject: [PATCH 0/4] gitk crash fix and locale updates Date: Tue, 20 Oct 2015

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

On Mon, Oct 26, 2015 at 5:50 PM, Jeff King wrote: > But these days, people often have several simultaneous sessions open. > They may have multiple ssh sessions to a single machine, or they may > have a bunch of terminal windows open, each of which has a login shell > and will send HUP to its

[PATCH] Add main menu accelerators to po files

This adds accelerators introduced in previous commit to the po files so that the old translations without accelerators are used instead of the untranslated strings with accelerators. Translations will have to be updated manually to add the new accelerators in the right place. Signed-off-by:

Re: [PATCH 2/6] remote-http(s): Support SOCKS proxies

James McCoy writes: >> The code looks OK but the last paragraph makes _us_ worried. What >> is the licensing status of the original at SO? > > According to Stackoverflow[0], > > As noted in the Stack Exchange Terms of Service[1] and in the footer of > every page, all

Re: [PATCH v4 1/3] Add test to describe expectation of blame --reverse with branched history

On Sun, Oct 25, 2015 at 11:27:32PM -0700, Junio C Hamano wrote: > Max Kirillov writes: > >> If history contains merges from feature branches, `blame --reverse` >> reports not the commit when the line was actually edited, but head of >> the last merged branch which was created

Re: git repack command on larger pack file

Junio C Hamano pobox.com> writes: > > Junio C Hamano pobox.com> writes: > > > Sivakumar Selvam gmail.com> writes: > > > >> ... So > >> I thought of splitting the pack file into 4 GB chunks. > > ... > > Hmmm, what is "this issue"? I do not see anything surprising. > > While the explanation

RE: [PATCH v3] Add git-grep threads param

Hello John, see comments inline. >> @@ -22,6 +22,7 @@ SYNOPSIS >> [--color[=] | --no-color] >> [--break] [--heading] [-p | --show-function] >> [-A ] [-B ] [-C ] >> +[--threads ] > Is this the best place for this option? I know the current list isn't > sorted

[BUG] diff --word-diff inconsistently places removed words

In the output generated by diff --word-diff, if the first word of a line was removed, it may appear at the end of the previous line. For example, compare the following two diffs on the same files, the first diff without --word-diff and the second with it. $ git diff diff --git a/smallest-test

[PATCH] t4034: Test parsing words following newline

Add test that shows diff --word-diff's inconsistent placement of removed words. This occurs when both the removed word is first on its line and the previous line has a removed word. Signed-off-by: Lucian Poston --- t/t4034-diff-words.sh | 30

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

Johannes Schindelin writes: >> > The corresponding times for me were: >> > >> > (master) (with the series) >> >real0m9.760s real 0m5.744s >> >user0m0.531s user 0m0.656s >> >sys 0m5.726s sys 0m3.520s

Re: [PATCH 1/2] run-command: factor out child_process_clear()

René Scharfe writes: > Avoid duplication by moving the code to release allocated memory for > arguments and environment to its own function, child_process_clear(). > Export it to provide a counterpart to child_process_init(). > > Signed-off-by: Rene Scharfe > ---

[PATCH 3/6] Facilitate debugging Git executables in tests with gdb

When prefixing a Git call in the test suite with 'TEST_GDB_GIT=1 ', it will now be run with GDB, allowing the developer to debug test failures more conveniently. Signed-off-by: Johannes Schindelin --- wrap-for-bin.sh | 7 +++ 1 file changed, 7 insertions(+) diff

[PATCH 4/6] Squelch warning about an integer overflow

We cannot rely on long integers to have more than 32 bits... Signed-off-by: Johannes Schindelin --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-compat-util.h b/git-compat-util.h index 805d0e2..610e8a5 100644 ---

[PATCH 5/6] Silence GCC's "cast of pointer to integer of a different size" warning

When calculating hashes from pointers, it actually makes sense to cut off the most significant bits. In that case, said warning does not make a whole lot of sense. So let's just work around it. Signed-off-by: Johannes Schindelin --- compat/regex/regcomp.c | 6 --

[PATCH 6/6] Correct fscanf formatting string for I64u values

From: Waldek Maleska This fix is probably purely cosmetic because PRIuMAX is likely identical to SCNuMAX. Nevertheless, when using a function of the scanf() family, the correct interpolation to use is the latter, not the former. Signed-off-by: Waldek Maleska

[PATCH 2/6] remote-http(s): Support SOCKS proxies

From: Pat Thoyts With this patch we properly support SOCKS proxies, configured e.g. like this: git config http.proxy socks5://192.168.67.1:32767 Without this patch, Git mistakenly tries to use SOCKS proxies as if they were HTTP proxies, resulting in a

Re: [PATCH v3 00/34] libify mailinfo and call it directly from am

Hi, On Wed, 21 Oct 2015, Johannes Sixt wrote: > Am 21.10.2015 um 17:51 schrieb Ramsay Jones: > > On 20/10/15 22:24, Junio C Hamano wrote: > > > Junio C Hamano writes: > > > some numbers on my desktop (Dell T3500 2.66GHz Xeon X5650 with 12GB, > > > running Ubuntu), > > > > I

Filters and diff vs. status

Dear mailing list, I am using, on specific files, a filter which I created.¹ Often, files being tracked are modified in a way not meant to be reflected in the git history to result in changes to be committed. And sometimes, the following happens: pietro@debiousci:~/path/to/repo$ git status

[PATCH 0/6] Miscellaneous platform-independent patches from Git for Windows

While working on Git for Windows 2.x, a couple of fixes were necessary that are not actually specific to Windows. For example, when stuck behind a faulty Access Point that somehow worked with an Android phone, but not with this developer's MacBook, it was necessary to use a SOCKS proxy via the

[PATCH v3] Add git-grep threads param

Make number of git-grep worker threads a configuration parameter. According to several tests on systems with different number of CPU cores the hard-coded number of 8 threads is not optimal for all systems: tuning this parameter can significantly speed up grep performance. Signed-off-by: Victor

[PATCH 1/6] Only use CURLOPT_LOGIN_OPTIONS if it is actually available

This fixes the compilation on an older Linux that was used to debug test failures when upgrading Git for Windows to Git v2.3.0. Signed-off-by: Johannes Schindelin --- imap-send.c | 4 1 file changed, 4 insertions(+) diff --git a/imap-send.c b/imap-send.c index

Re: [RFC] URL rewrite in .gitmodules

On Sun, Oct 25, 2015 at 8:12 AM, Lars Schneider wrote: > > On 20 Oct 2015, at 19:33, Junio C Hamano wrote: > >> Lars Schneider writes: >> >>> If not, what do you think about a patch that adds a "url" section >>> similar to

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

Am 26.10.2015 um 05:48 schrieb Nazri Ramliy: On Mon, Oct 26, 2015 at 7:10 AM, John Smith wrote: When would people routinely check out a branch and want to stay with the submodules as the have been checked out for the old branch? I do this a lot. At my $dayjob we have a

Re: [PATCH v2] ref-filter: fallback on alphabetical comparison

On Mon, Oct 26, 2015 at 6:43 AM, Eric Sunshine wrote: > On Sun, Oct 25, 2015 at 12:29 PM, Karthik Nayak wrote: >> In ref-filter.c the comparison of refs while sorting is handled by >> cmp_ref_sorting() function. When sorting as per numerical values

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

On Sun, Oct 25, 2015 at 5:56 PM, Chris Packham wrote: > On Mon, Oct 26, 2015 at 12:10 PM, John Smith wrote: >> I found that I use submodules much, much more often in my git projects than >> I used externals >> in Subversion and the reason is that

Re: [RFC] URL rewrite in .gitmodules

Am 26.10.2015 um 17:34 schrieb Stefan Beller: On Sun, Oct 25, 2015 at 8:12 AM, Lars Schneider wrote: On 20 Oct 2015, at 19:33, Junio C Hamano wrote: I do not think this topic is specific to use of submodules. If you want to encourage your

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

Matthieu Moy writes: > Johannes Schindelin writes: > >> This is the correct thing to do, really: we already specify LF as >> field separator. > > I'm almost convinced that this is the right thing to do in the long run > ("almost" because

[PATCH 2/2] http: use credential API to handle proxy authentication

Currently, the only way to pass proxy credentials to curl is by including them in the proxy URL. Usually, this means they will end up on disk unencrypted, one way or another (by inclusion in ~/.gitconfig, shell profile or history). Since proxy authentication often uses a domain user, credentials

[PATCH 1/2] http: allow selection of proxy authentication method

CURLAUTH_ANY does not work with proxies which answer unauthenticated requests with a 307 redirect to an error page instead of a 407 listing supported authentication methods. Therefore, allow the authentication method to be set using the environment variable GIT_HTTP_PROXY_AUTHMETHOD or