Re: Git for Windows Portable

Hi Lukáš, On Mon, 18 Apr 2016, Lukáš Rumpala wrote: > I have question regarding Git for Windows Portable in version 2.8.1 > 32bit that can be downloaded from https://git-scm.com/download/win . > What is the minimum version of .NET and OS that is necessary to > successfully run it? .NET is not

[PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c

Add the debug callback and helper routine prototype used by curl_easy_setopt CURLOPT_DEBUGFUNCTION in http.c for implementing the GIT_TRACE_CURL environment variable Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano

[PATCH 3/4] git.txt: document the new GIT_TRACE_CURL environment variable

Describe the purpose of the GIT_TRACE_CURL environment variable Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine Helped-by: Jeff King

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

Jeff King writes: > I guess this will invalidate old patch-ids, but there's not much to be > done about that. If we really cared, we could disable this (and any future) change to the compaction logic to "patch-id --[un]stable" option. I am not sure if it is worth the effort,

Re: [PATCH 0/2] WAS: [PATCH] mv: allow moving nested submodules

On Mon, Apr 18, 2016 at 5:01 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> A single patch evolves into a series. > > Power of code inspection to see bugs that are not reported, perhaps > ;-)? > > I wonder if we can come up with test cases to cover

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Hi, given the fact that the rest of the code just follows existing source code style, i.e. * using %s not %d to add number to string (see git-p4.py:2301) * no space between function name and parentheses (see all functions in t/lib-git-p4.sh) * no tab when specifying in-line expected output

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Tue, Apr 19, 2016 at 08:17:38AM -0700, Stefan Beller wrote: > On Mon, Apr 18, 2016 at 10:03 PM, Jeff King wrote: > > > I guess this will invalidate old patch-ids, but there's not much to be > > done about that. > > What do you mean by that? (What consequences do you imagine?)

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Luke Diamand writes: >> I am not familiar with "Perforce jobs", but I assume that they are >> always named as "job" + small non-negative integer in a dense way >> and it is OK for this loop to always begin at 0 and immediately stop >> when job + num does not exist (i.e. if job7

[PATCH v5 1/4] t0027: Make more reliable

From: Torsten Bögershausen Make the commit_chk_wrnNNO test in t0027 more reliable: When the attributes of a commited file are changed and the file is otherwise unchanged, Git may not detect that the next commit may need to treat the file as changed. This happens when lstat()

[PATCH v5 3/4] t0027: test cases for combined attributes

From: Torsten Bögershausen Add more test cases for the not normalized files ("NNO"). The "text" attribute is most important, use it as the first parameter. "ident", if set, is the second paramater followed by the eol attribute. The eol attribute overrides core.autocrlf, which

[PATCH v5 2/4] convert: allow core.autocrlf=input and core.eol=crlf

From: Torsten Bögershausen Even though the configuration parser errors out when core.autocrlf is set to 'input' when core.eol is set to 'crlf', there is no need to do so, because the core.autocrlf setting trumps core.eol. Allow all combinations of core.crlf and core.eol and

[PATCH v5 4/4] convert.c: ident + core.autocrlf didn't work

From: Torsten Bögershausen When the ident attributes is set, get_stream_filter() did not obey core.autocrlf=true, and the file was checked out with LF. Change the rule when a streaming filter can be used: - if an external filter is specified, don't use a stream filter. - if the

[PATCH v3 4/7] i18n: builtin/pull.c: mark placeholders for translation

Some translations might also translate "" and "". Signed-off-by: Vasco Almeida --- I opted to mark also the brackets of placeholders, which I think is a good compromise between consistency and letting the translators know what they're translating. builtin/pull.c | 6

[PATCH v3 2/7] i18n: unpack-trees: mark strings for translation

Mark strings seen by the user inside setup_unpack_trees_porcelain() and display_error_msgs() functions for translation. Signed-off-by: Vasco Almeida --- unpack-trees.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git

[PATCH v3 6/7] i18n: builtin/rm.c: remove a comma ',' from string

Remove a comma from string marked for translation. Make the string match the one in builtin/mv.c. Now translators have do handle this string only once. Signed-off-by: Vasco Almeida --- builtin/rm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one

Git could output "completed with 1 local objects", but in this case using "object" instead of "objects" is the correct form. Use Q_() instead of _(). Signed-off-by: Vasco Almeida --- builtin/index-pack.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git

[PATCH v3 7/7] i18n: builtin/branch.c: mark option for translation

Mark description and parameter for option "set-upstream-to" for translation. Signed-off-by: Vasco Almeida --- builtin/branch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/branch.c b/builtin/branch.c index 0adba62..b7d906d 100644 ---

[PATCH v3 5/7] i18n: builtin/pull.c: split strings marked for translation

Split string "If you wish to set tracking information for this branch you can do so with:\n" to match occurring string in git-parse-remote.sh. In this case, the translator handles it only once. On the other hand, the translations of the string that were already made are mark as fuzzy and the

[PATCH] replace --edit: respect core.editor

We simply need to read the config, is all. This fixes https://github.com/git-for-windows/git/issues/733 Signed-off-by: Johannes Schindelin --- builtin/replace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/replace.c b/builtin/replace.c index

[PATCH v3 3/7] i18n: git-parse-remote.sh: mark strings for translation

Change Makefile to include git-parse-remote.sh in LOCALIZED_SH. TODO: remove 3rd argument of error_on_missing_default_upstream function that is no longer required. Signed-off-by: Vasco Almeida --- Makefile| 2 +- git-parse-remote.sh | 46

Ms Faith Titi Attah

Dearest one I wish you and your family happy moments of life now and forever more amen.Please, I do not have formal relationship with you but because of my present predicament and circumstances I am made to contact you.I have been suffering from cancer of the Lungs and has a short life to leave.I

[PATCH] mv: allow moving nested submodules

When directories are moved using `git mv` all files in the directory have been just moved, but no further action was taken on them. This was done by assigning the mode = WORKING_DIRECTORY to the files inside a moved directory. submodules however need to update their link to the git directory as

Re: [PATCH 2/4] http.c: implements the GIT_TRACE_CURL environment variable

Elia Pinto writes: > Implements the GIT_TRACE_CURL environment variable to allow a > greater degree of detail of GIT_CURL_VERBOSE, in particular > the complete transport header and all the data payload exchanged. > It might be useful if a particular situation could

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Would it be acceptable the other way around? I.e. this patch followed by the one that fixes code style (once this gets merged)? Reason being that I don't know how to use submitGit to generate a patch against a state that is not already in git repo (ie. based on another patch). In the following

Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Tue, Apr 19, 2016 at 12:14 AM, Jeff King wrote: > On Mon, Apr 18, 2016 at 11:45:54AM -0700, Junio C Hamano wrote: > >> David Turner writes: >> >> > Add parameters for a list of refspecs to transport_get_remote_refs and >> > get_refs_list. These

[PATCH v7 6/6] tag -v: verfy directly rather than exec-ing verify-tag

From: Santiago Torres Instead of having tag -v fork to run verify-tag, use the gpg_verify_tag() function directly. Helped-by: Eric Sunshine Signed-off-by: Santiago Torres --- builtin/tag.c | 8 +--- 1 file changed, 1

[PATCH v7 3/6] verify-tag: update variable name and type

From: Santiago Torres The run_gpg_verify() function has two variables, size and len. This may come off as confusing when reading the code. Clarify which one pertains to the length of the tag headers by renaming len to payload_size. Additionally, change the type of payload_size

Re: [PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c

Elia Pinto writes: > Add the debug callback and helper routine prototype used by > curl_easy_setopt CURLOPT_DEBUGFUNCTION in http.c > for implementing the GIT_TRACE_CURL environment variable > > > Helped-by: Torsten Bögershausen > Helped-by: Ramsay Jones

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

> Any submitGit users? I think it lets you throw multiple-patch > series just fine. In this case, you'd prepare a two patch series on > a branch, 1/2 being the clean-up and 2/2 being the new feature, and > if you give that branch to submitGit as a whole it should do the > right thing, I'd

[PATCH v7 0/6] Move PGP verification out of verify-tag

From: Santiago Torres This is a follow up of [1], [2], [3], [4], [5], [6]. patches 1/6, 2/6, are the same as the corresponding commits in pu. v7: Mostly style/clarity changes mostly. Thanks Peff, Eric and Junio for the feedback! In summary: * Eric pointed out issues with

[PATCH v7 2/6] t7030: test verifying multiple tags

From: Santiago Torres The verify-tag command supports multiple tag names to verify, but existing tests only test for invocation with a single tag. Add a test invoking it with multiple tags. Helped-by: Jeff King Signed-off-by: Santiago Torres

[PATCH v7 1/6] builtin/verify-tag.c: ignore SIGPIPE in gpg-interface

From: Santiago Torres The verify_signed_buffer() function may trigger a SIGPIPE when the GPG child process terminates early (due to a bad keyid, for example) and Git tries to write to it afterwards. Previously, ignoring SIGPIPE was done in builtin/verify-tag.c to avoid this

[PATCH v7 4/6] verify-tag: prepare verify_tag for libification

From: Santiago Torres The current interface of verify_tag() resolves reference names to SHA1, however, the plan is to make this functionality public and the current interface is cumbersome for callers: they are expected to supply the textual representation of a sha1/refname. In

[PATCH v7 5/6] verify-tag: move tag verification code to tag.c

From: Santiago Torres The PGP verification routine for tags could be accessed by other modules that require to do so. Publish the verify_tag function in tag.c and rename it to gpg_verify_tag so it does not conflict with builtin/mktag's static function. Helped-by: Junio C

Re: [PATCH 0/2] WAS: [PATCH] mv: allow moving nested submodules

Stefan Beller writes: > ..., but I am unsure > if patch 1 is a good idea. Then let's postpone it for now. I too would like to hear opinion from other submodule folks, especially Jens, for what 1/2 does before committing us to the course. Can you do only the 2/2 on top of

Hi

Dear Beloved I am Mrs. Lily KIm from Syria who is dying for a gaseous poisoning exposition in Syria who has decided to donate her funds to you for charity project, For More details contact me. Via e-mail: mrslilyki...@gmail.com Thank you and God bless you. Mrs. Lily Kim -- To unsubscribe from

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Jan Durovec writes: > On Tue, Apr 19, 2016 at 7:47 PM, Junio C Hamano wrote: >> >> If you really want to know the preference, we prefer a preliminary >> clean-up patch to correct existing style issues, followed by a new >> feature patch that builds on

Re: [PATCH v4 09/16] index-helper: use watchman to avoid refreshing index with lstat()

On Fri, 2016-04-15 at 17:07 -0700, Stefan Beller wrote: > > +static void refresh_by_watchman(struct index_state *istate) > > +{ > > + void *shm = NULL; > > + int length; > > + int i; > > + struct stat st; > > + int fd = -1; > > + const char *path =

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Jan Durovec writes: > given the fact that the rest of the code just follows existing > source code style, i.e. > > * using %s not %d to add number to string (see git-p4.py:2301) This one I do not care too deeply about, as formatting anything that can be formatted via '%s'

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Junio C Hamano writes: > Not a new problem in this script, but we'd prefer to spell this as > > p4_add_job () { > > i.e. a space on both sides of (). > >> +name=$1 && >> +p4 job -f -i <<-EOF >> +Job: $name >> +Status: open >> +User: dummy >> +

Re: [PATCH 4/4] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

Elia Pinto writes: > Permit the use of the GIT_TRACE_CURL environment variable calling > the curl_trace and curl_dump http.c helper routine s/$/./; the patch itself is very concise and the "dump" thing in 3/4 looked sensible. > > Helped-by: Torsten Bögershausen

[PATCH 4/4] imap-send.c: introduce the GIT_TRACE_CURL enviroment variable

Permit the use of the GIT_TRACE_CURL environment variable calling the curl_trace and curl_dump http.c helper routine Helped-by: Torsten Bögershausen Helped-by: Ramsay Jones Helped-by: Junio C Hamano Helped-by: Eric Sunshine

Re: [PATCHv5 0/2] xdiff: implement empty line chunk heuristic

Stefan Beller writes: > Thanks Jeff for pointing out issues in the comment! > > Thanks, > Stefan > > diff to origin/jk/diff-compact-heuristic: > diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c > index 5a02b15..b3c6848 100644 > --- a/xdiff/xdiffi.c > +++ b/xdiff/xdiffi.c > @@

[PATCH 2/4] http.c: implements the GIT_TRACE_CURL environment variable

Implements the GIT_TRACE_CURL environment variable to allow a greater degree of detail of GIT_CURL_VERBOSE, in particular the complete transport header and all the data payload exchanged. It might be useful if a particular situation could require a more thorough debugging analysis Helped-by:

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Mon, Apr 18, 2016 at 10:03 PM, Jeff King wrote: > I guess this will invalidate old patch-ids, but there's not much to be > done about that. What do you mean by that? (What consequences do you imagine?) I think diffs with any kind of heuristic can still be applied, no? Thanks,

[PATCHv5 0/2] xdiff: implement empty line chunk heuristic

Thanks Jeff for pointing out issues in the comment! Thanks, Stefan diff to origin/jk/diff-compact-heuristic: diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c index 5a02b15..b3c6848 100644 --- a/xdiff/xdiffi.c +++ b/xdiff/xdiffi.c @@ -515,12 +515,12 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t

[PATCH 2/2] xdiff: implement empty line chunk heuristic

In order to produce the smallest possible diff and combine several diff hunks together, we implement a heuristic from GNU Diff which moves diff hunks forward as far as possible when we find common context above and below a diff hunk. This sometimes produces less readable diffs when writing C,

[PATCH 1/2] xdiff: add recs_match helper function

From: Jacob Keller It is a common pattern in xdl_change_compact to check that hashes and strings match. The resulting code to perform this change causes very long lines and makes it hard to follow the intention. Introduce a helper function recs_match which performs both

[PATCHv2 0/4] Implements the GIT_TRACE_CURL environment variable

This is the second version but in reality is the complete rewriting of the patches discussed here $gmane/290520 $gmane/290521 Changes from V1 - introduced GIT_TRACE_CURL variable with its documentation - changed the name of the temporary variable "i" in "w" in the helper routine - used the c

Re: [PATCH] replace --edit: respect core.editor

"git blame -L475,6 builtin/replace.c" points at b892bb45 (replace: add --edit option, 2014-04-26) and the commit log message names two people who can review this change, so that is what I am doing here. Johannes Schindelin writes: > We simply need to read the config,

Re: [PATCH v7 0/6] Move PGP verification out of verify-tag

On Tue, Apr 19, 2016 at 1:47 PM, wrote: > This is a follow up of [1], [2], [3], [4], [5], [6]. patches 1/6, 2/6, are the > same as the corresponding commits in pu. > > v7: > Mostly style/clarity changes mostly. Thanks Peff, Eric and Junio for the > feedback! In summary: > > *

Re: [PATCH v7 6/6] tag -v: verfy directly rather than exec-ing verify-tag

On Tue, Apr 19, 2016 at 1:47 PM, wrote: > tag -v: verfy directly rather than exec-ing verify-tag s/verfy/verify: > Instead of having tag -v fork to run verify-tag, use the > gpg_verify_tag() function directly. This description is easy enough to understand. Thanks. >

Re: [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one

Hmph, two patches in the previous series seem to be missing. On purpose, or by mistake? Their net-effect is shown at the end of this message, and I thought they made sense. Puzzled... diff --git a/builtin/branch.c b/builtin/branch.c index 5ab106b..32be954 100644 --- a/builtin/branch.c +++

Re: [PATCH v7 4/6] verify-tag: prepare verify_tag for libification

Eric Sunshine writes: > I'd have probably called this "display_name", but then I suppose it > suffers the same issue Junio mentioned previously about it sounding > like a boolean. Anyhow, as long as Junio is happy with it, that's what > matters. No ;-) I am just trying

Re: [PATCH v3 1/7] i18n: index-pack: use plural string instead of normal one

Junio C Hamano writes: > Hmph, two patches in the previous series seem to be missing. On > purpose, or by mistake? Their net-effect is shown at the end of > this message, and I thought they made sense. > > Puzzled... Ah, I see. These two were sent outside the series, but

Re: [PATCH/RFC 3/6] http-backend: handle refspec argument

On Sat, 2016-04-16 at 21:51 -0400, Eric Sunshine wrote: > On Fri, Apr 15, 2016 at 3:19 PM, David Turner < > dtur...@twopensource.com> wrote: > > + if (refspec) { > > + struct strbuf interesting_refs = > > STRBUF_INIT; > > +

Re: [PATCH/RFC 1/6] http-backend: use argv_array functions

On Mon, 2016-04-18 at 11:34 -0700, Junio C Hamano wrote: > David Turner writes: > > > Signed-off-by: David Turner > > --- > > OK (it might be easier to read if you used the pushl form for the > "fixed initial segment" like these calls,

Re: [PATCH v7 4/6] verify-tag: prepare verify_tag for libification

On Tue, Apr 19, 2016 at 1:47 PM, wrote: > The current interface of verify_tag() resolves reference names to SHA1, > however, the plan is to make this functionality public and the current > interface is cumbersome for callers: they are expected to supply the > textual

[PATCH v3 2/2] git-p4: add P4 jobs to git commit message

When migrating from Perforce to git the information about P4 jobs associated with P4 changelists is lost. Having these jobs listed on messages of related git commits enables smooth migration for projects that take advantage of e.g. JIRA integration (which uses jobs on Perforce side and parses

[PATCH v3 1/2] git-p4: clean-up code style in tests

Preliminary clean-up of testing libraries for git-p4. * spaces added to both sides of () in function definitions in lib-git-p4 * tab indentation added to git-p4 tests when <<- redirection is used Signed-off-by: Jan Durovec --- t/lib-git-p4.sh | 24

Re: Binary grep t7008 known breakage vanished on Cygwin

On 19/04/16 09:42, Adam Dinwoodie wrote: > On Mon, Apr 18, 2016 at 06:08:15PM +0100, Ramsay Jones wrote: >> On 18/04/16 16:21, Adam Dinwoodie wrote: >>> t7008.12 is marked as an expected failure, but building Git on Cygwin >>> including a `make configure && ./configure` step has the test >>>

Re: [PATCH/RFC 2/6] remote-curl.c: fix variable shadowing

On Mon, 2016-04-18 at 11:35 -0700, Junio C Hamano wrote: > David Turner writes: > > > The local variable 'options' was shadowing a global of the same > > name. > > > > Signed-off-by: David Turner > > --- > > OK. In general, giving a longer

Re: [PATCH/RFC 4/6] transport: add refspec list parameters to functions

On Mon, 2016-04-18 at 11:45 -0700, Junio C Hamano wrote: > David Turner writes: > > > Add parameters for a list of refspecs to transport_get_remote_refs > > and > > get_refs_list. These parameters are presently unused -- soon, we > > will > > use them to implement

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

> On 19 Apr 2016, at 22:30, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> Git LFS 1.2.0 removed a line from the output of the 'git lfs pointer' >> command [1] which broke the parsing of this output.

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

Lars Schneider writes: >> On 19 Apr 2016, at 22:30, Junio C Hamano wrote: >> >> larsxschnei...@gmail.com writes: >> >>> From: Lars Schneider >>> >>> Git LFS 1.2.0 removed a line from the output of the 'git lfs pointer'

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Jan Durovec writes: > On Tue, Apr 19, 2016 at 8:50 PM, Jan Durovec wrote: >>> Any submitGit users? I think it lets you throw multiple-patch >>> series just fine. In this case, you'd prepare a two patch series on >>> a branch, 1/2 being the

Re: [PATCH 2/4] http.c: implements the GIT_TRACE_CURL environment variable

Elia Pinto writes: > Implements the GIT_TRACE_CURL environment variable to allow a > greater degree of detail of GIT_CURL_VERBOSE, in particular > the complete transport header and all the data payload exchanged. > It might be useful if a particular situation could

Re: [PATCH 0/7] fix checking out a being-rebased branch

Duy Nguyen writes: > On Tue, Apr 19, 2016 at 12:42 AM, Junio C Hamano wrote: >>> Another option is leave wt_status_get_state() alone, factor out the >>> rebase-detection code and use that for worktree/checkout. We save a >>> few syscalls this way too. >>>

[PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

From: Lars Schneider Git LFS 1.2.0 removed a line from the output of the 'git lfs pointer' command [1] which broke the parsing of this output. Adjust the parser to the new output and add minimum Git LFS version to the docs. [1]

[PATCH v1 0/2] git-p4: fix Git LFS pointer parsing

From: Lars Schneider Travis-CI uses 'brew' to always install the latest available version of Git LFS on the OS X build machines (on Linux the version is sticky). A change in Git LFS 1.2.0 [1] breaks the git-p4 LFS integration [2]. This mini series updates Travis-CI to

[PATCH v1 1/2] travis-ci: update Git-LFS and P4 to the latest version

From: Lars Schneider Signed-off-by: Lars Schneider --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78e433b..4acf617 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8

Re: [PATCH v2] git-p4: add P4 jobs to git commit message

Huh... seems that it works :) v3 sent in 2 parts On Tue, Apr 19, 2016 at 8:50 PM, Jan Durovec wrote: >> Any submitGit users? I think it lets you throw multiple-patch >> series just fine. In this case, you'd prepare a two patch series on >> a branch, 1/2 being the

Re: [PATCH v1 2/2] git-p4: fix Git LFS pointer parsing

larsxschnei...@gmail.com writes: > From: Lars Schneider > > Git LFS 1.2.0 removed a line from the output of the 'git lfs pointer' > command [1] which broke the parsing of this output. Adjust the parser > to the new output and add minimum Git LFS version to the docs.

Re: [PATCH 4/6] Convert struct name_entry to use struct object_id.

On Tue, Apr 19, 2016 at 04:02:22PM -0700, Junio C Hamano wrote: > "brian m. carlson" writes: > > > @@ -314,7 +314,7 @@ static int threeway_callback(int n, unsigned long mask, > > unsigned long dirmask, s > > } > > > > if (same_entry(entry+0, entry+1)) { >

[PATCH v5 04/15] index-helper: add --strict

From: Nguyễn Thái Ngọc Duy There are "holes" in the index-helper approach because the shared memory is not verified again by git. If $USER is compromised, shared memory could be modified. But anyone who could do this could already modify $GIT_DIR/index. A more realistic risk

[PATCH v5 10/15] update-index: enable/disable watchman support

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ Documentation/git-update-index.txt | 6 ++ builtin/update-index.c | 11

[PATCH v5 03/15] index-helper: new daemon for caching index and related stuff

From: Nguyễn Thái Ngọc Duy Instead of reading the index from disk and worrying about disk corruption, the index is cached in memory (memory bit-flips happen too, but hopefully less often). The result is faster read. Read time is reduced by 70%. The biggest gain is not having

[PATCH v5 07/15] read-cache: add watchman 'WAMA' extension

From: Nguyễn Thái Ngọc Duy The extension contains a bitmap, one bit for each entry in the index. If the n-th bit is zero, the n-th entry is considered unchanged, we can ce_mark_uptodate() it without refreshing. If the bit is non-zero and we found out the corresponding file is

[PATCH v5 02/15] read-cache: allow to keep mmap'd memory after reading

From: Nguyễn Thái Ngọc Duy Later, we will introduce git index-helper to share this memory with other git processes. Since the memory will be shared, it will never be unmapped (although the kernel may of course choose to page it out). Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v5 08/15] Add watchman support to reduce index refresh cost

From: Nguyễn Thái Ngọc Duy The previous patch has the logic to clear bits in 'WAMA' bitmap. This patch has logic to set bits as told by watchman. The missing bit, _using_ these bits, are not here yet. A lot of this code is written by David Turner originally, mostly from [1].

[PATCH v5 05/15] daemonize(): set a flag before exiting the main process

From: Nguyễn Thái Ngọc Duy This allows signal handlers and atexit functions to realize this situation and not clean up. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- builtin/gc.c | 2 +- cache.h | 2 +-

[PATCH v5 12/15] index-helper: kill mode

Add a new command (and command-line arg) to allow index-helpers to exit cleanly. This is mainly useful for tests. Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 3 +++ index-helper.c | 31 ++-

[PATCH v5 09/15] index-helper: use watchman to avoid refreshing index with lstat()

From: Nguyễn Thái Ngọc Duy Watchman is hidden behind index-helper. Before git tries to read the index from shm, it notifies index-helper through the socket and waits for index-helper to prepare a file for sharing memory (with MAP_SHARED). index-helper then contacts watchman,

[PATCH v5 13/15] index-helper: don't run if already running

Signed-off-by: David Turner --- index-helper.c | 7 +++ t/t7900-index-helper.sh | 9 + 2 files changed, 16 insertions(+) diff --git a/index-helper.c b/index-helper.c index 6af01c9..8fcb76e 100644 --- a/index-helper.c +++ b/index-helper.c @@ -412,6

[PATCH v5 15/15] index-helper: optionally automatically run

Introduce a new config option, indexhelper.autorun, to automatically run git index-helper before starting up a builtin git command. This enables users to keep index-helper running without manual intervention. Signed-off-by: David Turner --- Documentation/config.txt |

[PATCH v5 11/15] unpack-trees: preserve index extensions

Make git checkout (and other unpack_tree operations) preserve the untracked cache and watchman status. This is valuable for two reasons: 1. Often, an unpack_tree operation will not touch large parts of the working tree, and thus most of the untracked cache will continue to be valid. 2. Even if

[PATCH v5 14/15] index-helper: autorun mode

Soon, we'll want to automatically start index-helper, so we need a mode that silently exits if it can't start up (either because it's not in a git dir, or because another one is already running). Signed-off-by: David Turner --- Documentation/git-index-helper.txt | 4

[PATCH v5 06/15] index-helper: add --detach

From: Nguyễn Thái Ngọc Duy We detach after creating and opening the socket, because otherwise we might return control to the shell before index-helper is ready to accept commands. This might lead to flaky tests. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v5 00/15] index-helper/watchman

This version includes the following changes since v4: 1. The last patch has been removed; it's pretty much always a good idea to wait for the index-helper 2. Documentation for index-helper --kill and --autorun. Documentation for update-index --watchman. Documentation for index-format for WAMA.

[PATCH v5 01/15] read-cache.c: fix constness of verify_hdr()

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: David Turner --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487

Re: [PATCH v5 06/15] index-helper: add --detach

On Wed, Apr 20, 2016 at 6:28 AM, David Turner wrote: > @@ -317,6 +320,8 @@ int main(int argc, char **argv) > if (fd < 0) > die_errno(_("could not set up index-helper socket")); > > + if (detach && daemonize()) > +

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Tue, Apr 19, 2016 at 9:18 PM, Jeff King wrote: > [your original probably didn't make it to the list because of its 5MB > attachment; the list has a 100K limit; I'll try to quote liberally] > > On Tue, Apr 19, 2016 at 04:17:50PM -0700, Jacob Keller wrote: > >> I ran this version

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Wed, Apr 20, 2016 at 12:18:27AM -0400, Jeff King wrote: > My earlier tests with the perl script were all done with "git log -p", > which will not show anything at all for merges (and my script wouldn't > know how to deal with combined diffs anyway). But I think this new patch > _will_ kick in

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

[your original probably didn't make it to the list because of its 5MB attachment; the list has a 100K limit; I'll try to quote liberally] On Tue, Apr 19, 2016 at 04:17:50PM -0700, Jacob Keller wrote: > I ran this version of the patch against the entire Linux kernel > history, as I figured this

Re: [PATCH] replace --edit: respect core.editor

On Wed, Apr 20, 2016 at 5:53 AM, Jeff King wrote: > On Tue, Apr 19, 2016 at 09:22:37AM -0700, Junio C Hamano wrote: > >> I can understand "we only know edit mode needs config, and we know >> it will never affect other modes to have the new call here", and it >> would be good for an

Re: [PATCH] replace --edit: respect core.editor

On Tue, Apr 19, 2016 at 09:22:37AM -0700, Junio C Hamano wrote: > Johannes Schindelin writes: > > > We simply need to read the config, is all. > > > > This fixes https://github.com/git-for-windows/git/issues/733 > > > > Signed-off-by: Johannes Schindelin

Re: [PATCH 1/4] http.h: Add debug callback and helper routine for implementing the GIT_TRACE_CURL environment variable in http.c

On 19/04/16 22:48, Ramsay Jones wrote: > [snip] > I think the minimal fixup (including Junio's comment on patch #2, which also > triggered for me) is given in the patch below. BTW, if you want to have a single static instance of the 'struct trace_key', then the following patch on top should

Re: [PATCH v5 10/15] update-index: enable/disable watchman support

On Wed, Apr 20, 2016 at 6:28 AM, David Turner wrote: > + if (use_watchman > 0) { > + the_index.last_update= xstrdup(""); > + the_index.cache_changed |= WATCHMAN_CHANGED; > + } else if (!use_watchman) { > +

[PATCH 1/5] send-pack: close demux pipe before finishing async process

This fixes a deadlock on the client side when pushing a large number of refs from a corrupted repo. There's a reproduction script below, but let's start with a human-readable explanation. The client side of a push goes something like this: 1. Start an async process to demux sideband coming

[PATCH 5/5] t5504: drop sigpipe=ok from push tests

These were added by 8bf4bec (add "ok=sigpipe" to test_must_fail and use it to fix flaky tests, 2015-11-27) because we would racily die via SIGPIPE when the pack was rejected by the other side. But since we have recently de-flaked send-pack, we should be able to tighten up these tests (including

  1   2   >