[PATCH v2 17/17] read-cache: config for waiting for index-helper

When we poke index-helper, and index-helper is using watchman, we want to wait for a response (showing that the watchman extension shm has been prepared). If it's not using watchman, we don't. So add a new config, core.waitforindexhelper, with sensible defaults, to configure this behavior.

[PATCH v2 14/17] 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 ffa3c2a..7362abb 100644 --- a/index-helper.c +++ b/index-helper.c @@ -400,6

[PATCH v2 12/17] 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 v2 15/17] index-helper: autorun mode

Soon, we'll want to automatically start index-helper, so we need a mode that silently exists 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 --- index-helper.c | 29

Re: [PATCH] merge: refuse to create too cool a merge by default

On 18/03/16 20:21, Junio C Hamano wrote: > While it makes sense to allow merging unrelated histories of two > projects that started independently into one, in the way "gitk" was > merged to "git" itself aka "the coolest merge ever", such a merge is > still an unusual event. Worse, if somebody

Re: [PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR"

On 3/17/16 4:49 PM, Junio C Hamano wrote: Thanks for these 5 patches, two of which need to be discarded ;-). I think you can pick either one of 1/2, pick the one that says "non-NULL" (as opposed to "something") in the log message for 2/2. Durham, does it fix your issues if you apply the 1/2 and

Re: Windows download broken?

Hi Stefan, On Wed, 16 Mar 2016, Stefan Beller wrote: > On Wed, Mar 16, 2016 at 7:06 AM, Levente wrote: > > It seems that this link is broken: > > > > https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/Git-2.7.3-64-bit.exe > > I think Git for

Re: [PATCH] rebase -x: do not die without -i

Stefan Beller writes: > In the later steps of preparing a patch series I do not want to edit the > patches any more, but just make sure the test suite passes after each > patch. Currently I would run > > EDITOR=true git rebase -i -x "make test" Hmm, I guess that may

[PATCH 00/10] Adding RFC3161 time-stamps to tags

Hi all, this patch series adds RFC3161 time-stamping functionality to git tags. This enables users to create and verify cryptographic time stamp signatures to prove that a commit existed at a certain point in time. The new RFC3161 time-stamping functionality is independent from GPG signatures.

Re: [PATCH] merge: refuse to create too cool a merge by default

David Turner writes: > Also, I didn't notice a test that shows that "cool" merges without > allow-unrelated-histories are forbidden. Yeah, because I didn't write one in the version that was sent out, which has been corrected in the one that will be on 'pu'. Thanks. --

[PATCH v2 09/17] 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 v2 01/17] 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 --- read-cache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/read-cache.c b/read-cache.c index d9fb78b..16cc487 100644 --- a/read-cache.c +++ b/read-cache.c @@ -1345,7

[PATCH v2 08/17] read-cache: invalidate untracked cache data when reading WAMA

When reading the watchman extension, invalidate the listed untracked-cache entries. We don't clear these entries yet; we can only do that once we know that they came from a live watchman (rather than from disk). Signed-off-by: David Turner --- dir.c| 11

[PATCH v2 02/17] 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 v2 04/17] 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 v2 07/17] 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

Re: bug: sparse config interpretation incorrectness in 2.8.0-rc2

Hi Duy, On Thu, 17 Mar 2016, Duy Nguyen wrote: > On Thu, Mar 17, 2016 at 8:46 PM, Johannes Schindelin > wrote: > > Unfortunately, this does not help me at all. In the use case I am trying > > to get to work fast, we have tons and tons of directories and need *one* >

Re: [GIT PULL] GPIO bulk changes for kernel v4.6

Hi Linus, On Fri, 18 Mar 2016, Linus Torvalds wrote: > I thought git didn't merge two branches that have no common base by > default, but it seems it will happily do so. What happened to "The coolest merge EVER!"? http://thread.gmane.org/gmane.comp.version-control.git/5126/ Ciao,

[PATCH v2 10/17] 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 named pipe and waits for index-helper to prepare shm. index-helper then contacts watchman, updates 'WAMA' extension and put it

[PATCH v2 11/17] update-index: enable/disable watchman support

From: Nguyễn Thái Ngọc Duy Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/update-index.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/builtin/update-index.c b/builtin/update-index.c index 1c94ca5..7c08e1c 100644 ---

[PATCH v2 13/17] 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 --- index-helper.c | 39 +-- t/t7900-index-helper.sh | 9 + 2 files

[PATCH v2 16/17] 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 --- git.c |

Re: [PATCH/RFC] parse-options.c: make OPTION__COUNTUP consider negative values

On Thu, Mar 17, 2016 at 12:58 PM, Eric Sunshine wrote: > On Wed, Mar 16, 2016 at 9:50 PM, Jeff King wrote: >> On Wed, Mar 16, 2016 at 11:16:58PM +, Pranit Bauva wrote: >>> The reason to make it consider negative values or more specifically >>>

Re: [PATCH 18/19] index-helper: autorun

On Thu, Mar 17, 2016 at 9:43 PM, Johannes Schindelin wrote: > Hi Duy, > > On Thu, 17 Mar 2016, Duy Nguyen wrote: > >> On Thu, Mar 17, 2016 at 1:27 AM, Johannes Schindelin >> wrote: >> > I am much more concerned about concurrent accesses and

Re: Tabs in commit messages - de-tabify option in strbuf_stripspace()?

Linus Torvalds writes: > On Wed, Mar 16, 2016 at 7:27 AM, Marc Branchaud wrote: >> >> Could this also help with diff output, where the leading + or - mars the >> indentation in a similar way? > > I don't think that's a good idea at least by

[PATCHv3 1/2] rebase: decouple --exec from --interactive

In the later steps of preparing a patch series I do not want to edit or reorder the patches any more, but just make sure the test suite passes after each patch and also to fix breakage right there if some of the steps fail. I could run EDITOR=true git rebase -i -x "make test" but it would

Re: An idea for the "Leftover Bits": rebase -x to imply -i

Junio C Hamano writes: > The list is my personal collection of "leftover" things, i.e. topics > that were raised on the list, perhaps already discussed or perhaps > nobody thought them interesting, that I found when re-reading the > past list traffic that did not reach a

Re: parse-options does not recognize "unspecified" behavior

On Wed, Mar 16, 2016 at 04:33:03PM -0700, Stefan Beller wrote: > The way I understand verbosity is this: > * You can instruct a command to be more verbose if it is supported by > adding more -v > * --no-verbose tells the command to be not verbose, i.e. no additional output. > > So my question

[PATCH] pretty-print: de-tabify indented logs to make things line up properly

From: Linus Torvalds Date: Wed, 16 Mar 2016 09:15:53 -0700 Subject: [PATCH] pretty-print: de-tabify indented logs to make things line up properly This should all line up: Column 1 Column 2 A B ABCD EFGH

RE: 2.8.0 gitignore enhancement not working as expected

Hi Duy, That seems to have fixed it :-) Thanks for your help! Richard > -Original Message- > From: Duy Nguyen [mailto:pclo...@gmail.com] > Sent: 18 March 2016 14:53 > To: Richard Furness -X (rfurness - ENSOFT LIMITED at Cisco) > > Cc: git@vger.kernel.org > Subject:

[PATCH] merge: refuse to create too cool a merge by default

While it makes sense to allow merging unrelated histories of two projects that started independently into one, in the way "gitk" was merged to "git" itself aka "the coolest merge ever", such a merge is still an unusual event. Worse, if somebody creates an independent history by starting from a

Re: [GIT PULL] GPIO bulk changes for kernel v4.6

On Fri, Mar 18, 2016 at 9:37 AM, Junio C Hamano wrote: > >> I don't think the original "resolve" did it, for example. You can't do >> a three-way merge without a base. > > Yes, and that continues to this day: Yeah, "octopus" also refuses it cleanly: common=$(git

Re: [PATCH v8 1/2] parse-options.c: make OPTION__COUNTUP consider negative values

Pranit Bauva writes: > The reason to make it consider negative values or more specifically > "unspecified" values is to give the ability to differentiate between > once, multiple time or with --no-option. > > Eg. : > initialize verbose = -1 > `git commit` => verbose = -1

Re: [PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR"

On Sat, Mar 19, 2016 at 1:00 AM, Junio C Hamano wrote: > What is the ultimate goal of nd/exclusion-regression-fix topic over > the behaviour before 2.7.0 and after 2.7.1 (there was a regression > in 2.7.0 that was reverted in 2.7.1)? From the cover letter of the > series: > >

Re: [ANNOUNCE] Git v2.7.4 (and updates to older maintenance tracks)

> Git v2.7.4 Release Notes > > > Fixes since v2.7.3 > -- > > * Bugfix patches were backported from the 'master' front to plug heap >corruption holes, to catch integer overflow in the computation of >pathname lengths, and to get rid of the

Re: [RFC] git-log should use the same diff-options as git-show

On Fri, Mar 18, 2016 at 2:47 PM, Henning Moll wrote: > Hi > > Recently i stumbled upon an old stash entry. It was clear to me that the > stash only contained non-indexed worktree changes. So i assumed to get > insight by doing > > $ git log -1 -p stash@{0} > > But

BE PART OF DONALD TRUMP CAMPAIGN TEAM FOR PRESIDENT 2016

Hello how are you doing today ? Are you still looking for job ? You don't need to stress yourself before making money. We have an open opportunity for you to be part of our ongoing campaign for DONALD TRUMP FOR PRESIDENTIAL 2016 ? By simply putting a decal advertising of ( DONALD TRUMP FOR

Re: [PATCH] merge: refuse to create too cool a merge by default

On Fri, 2016-03-18 at 13:21 -0700, Junio C Hamano wrote: > Many tests that are updated by this patch does the > pass-through manually by turning: Nit: Should be many tests ... do Also, I didn't notice a test that shows that "cool" merges without allow-unrelated-histories are forbidden. -- To

[PATCH v2 06/17] index-helper: add --detach

From: Nguyễn Thái Ngọc Duy We detach after creating and opening the named pipe, 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 v2 05/17] 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 --- builtin/gc.c | 2 +- cache.h | 2 +- daemon.c | 2 +- setup.c | 4 +++- 4 files

[PATCH v2 03/17] 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 v2 00/15] index-helper, watchman

In this version: I removed the statistics since they're not really a core part of the series and we can always add them later. I added a little more testing. I merged the untracked cache/watchman mashup into the relevant patches. Hopefully I didn't screw it up -- I got into the rebase weeds

Re: [PATCH 18/19] index-helper: autorun

On Thu, Mar 17, 2016 at 1:27 AM, Johannes Schindelin wrote: > I am much more concerned about concurrent accesses and the communication > between the Git processes and the index-helper. Writing to the .pid file > sounds very fragile to me, in particular when multiple

Re: [RFC PATCH] hashmap API: introduce for_each_hashmap_entry() helper macro

Hello Junio, On Thu, Mar 17, 2016 at 12:09 AM, Junio C Hamano wrote: > Alexander Kuleshov writes: > >> diff --git a/hashmap.h b/hashmap.h >> index ab7958a..b8b158c 100644 >> --- a/hashmap.h >> +++ b/hashmap.h >> @@ -95,4 +95,11 @@ static inline const

Re: Can't git stash after using git add -N

I actually think "silently ignore intent-to-add" was a mistake. We used to error out at write-tree time, which I think is the right behaviour--"I know I want to have this path, but I cannot yet decide with what content" is what the user is telling us when she says "add -N", so until that

Re: [PATCH 2/2] pull --rebase: add --[no-]autostash flag

On Wed, Mar 16, 2016 at 1:00 AM, Mehul Jain wrote: > On Wed, Mar 16, 2016 at 3:13 AM, Eric Sunshine > wrote: >>> +--autostash:: >>> +--no-autostash:: >>> + Before starting rebase, stash local modifications away (see >>> +

Re: [PATCH v9 2/2] pull --rebase: add --[no-]autostash flag

On Thu, Mar 17, 2016 at 12:49 PM, Mehul Jain wrote: > If rebase.autoStash configuration variable is set, there is no way to > override it for "git pull --rebase" from the command line. > > Teach "git pull --rebase" the --[no-]autostash command line flag which > overrides

Windows download broken?

It seems that this link is broken: https://github.com/git-for-windows/git/releases/download/v2.7.3.windows.1/Git-2.7.3-64-bit.exe Regards, Levente -- 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: [PATCHV2 1/2] rebase -x: do not die without -i

Hi Stefan, On Thu, 17 Mar 2016, Stefan Beller wrote: > git rev-list old...new | > while read rev > do > $command || break > done As Junio pointed out, there should be only two, not three dots. Ciao, Dscho -- To unsubscribe from this list: send

[PATCH 4/4] pretty-print: add --pretty=noexpand

It is reasonable for tweak the default output mode for "git log" to untabify the commit log message, it sometimes may be necessary to see the output without tab expansion. Invent a new --pretty option to do this. Use this to unbreak the test breakages, where "git shortlog" and output are tested.

Re: [PATCH/RFC/GSoC 3/3] t0301: test credential-cache support of XDG_RUNTIME_DIR

谭俊浩 writes: > On 17/03/2016 01:24, Junio C Hamano wrote: > >> Using ~/.git-credential-cache/credential-cache.sock would not help >> at all for existing users, but ~/.git-credential-cache/socket would >> interoperate well with users with existing versions of Git, no? >>

[PATCH 3/2] dir.c: fix dir re-inclusion rules with "NODIR" and "MUSTBEDIR"

For NODIR case, the patterns look like this * # exclude dir, dir/file1 and dir/file2.. !dir # ..except that dir and everything inside is re-included.. dir/file2 # ..except (again!) that dir/file2 is excluded # ..which means dir/file1 stays included When

Re: [PATCH 0/1] http: Fix crash when passing malformed URL

On Wed, Mar 16, 2016 at 11:54:06AM +0100, Anton Wuerfel wrote: > When passing a malformed URL to http_init() in http.c, git dies from a null > pointer dereference. An example for a malformed URL is http:/git-scm.com (note > the single slash after the protocol). > > I could not reproduce this

Re: parse-options does not recognize "unspecified" behavior

On Thu, Mar 17, 2016 at 01:21:49AM +0530, Pranit Bauva wrote: > I noticed that parse-options does not recognize the variable which is > set to -1 so as to denote the "unspecified" value. Right. Like all of the stock parse-options handlers, it does not ever read or understand the value passed to

Re: [RFC PATCH] hashmap API: introduce for_each_hashmap_entry() helper macro

Alexander Kuleshov writes: > diff --git a/hashmap.h b/hashmap.h > index ab7958a..b8b158c 100644 > --- a/hashmap.h > +++ b/hashmap.h > @@ -95,4 +95,11 @@ static inline const char *strintern(const char *string) > return memintern(string, strlen(string)); > } > >

Re: [RFC] Code reorgnization

On Fri, Mar 18, 2016 at 4:49 AM, Junio C Hamano wrote: > John Keeping writes: > >> The organisation of the git code shouldn't make a difference since CGit >> just links with libgit.a, even if it does CGit pulls in git.git as a >> submodule so it can just

[PATCHV2 2/2] t3404: cleanup double empty lines between tests

Signed-off-by: Stefan Beller --- t/t3404-rebase-interactive.sh | 6 -- 1 file changed, 6 deletions(-) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index c8cc03d..f932639 100755 --- a/t/t3404-rebase-interactive.sh +++

Re: [RFC] Code reorgnization

Thomas Adam writes: > On 17 March 2016 at 11:11, Duy Nguyen wrote: >> Git's top directory is crowded and I think it's agreed that moving >> test-* to t/helper is a good move. I just wanted to check if we could >> take this opportunity (after v2.8.0) to move

Re: [GIT PULL] GPIO bulk changes for kernel v4.6

On Fri, Mar 18, 2016 at 7:32 AM, Johannes Schindelin wrote: > > On Fri, 18 Mar 2016, Linus Torvalds wrote: > >> I thought git didn't merge two branches that have no common base by >> default, but it seems it will happily do so. > > What happened to "The coolest merge

Re: [PATCH 1/2] dir.c: fix bug in 'nd/exclusion-regression-fix' topic

Nguyễn Thái Ngọc Duy writes: > The topic in question introduces "sticky" path list for this purpose: > given a path 'abc/def', if 'abc' already matches a pattern X, it's added > to X's sticky path list. When we need to check if 'abc/def' matches > pattern X and see that 'abc'

Re: [RFC/PATCH] Makefile: allow po generation through po target

Michael J Gruber writes: > The main Makefile has a "pot" target that recreates the git.pot file of > strings which are marked for translation. > > Add a "po" target that recreates the $(LANGUAGE).po files which contain > the translations (or stubs). > > Signed-off-by:

Michela

Hei, Nimeni on Michael, olen 26 vuotta vanha, olen vapaa minded, avoin sydämestä tyttö, tykkään ottaa elämän yhtä helppoa kuin pystyin, olen yksi niistä harvoista, joka yhä uskoo ystävyydestä, rakkaudesta, luottamus ja merkkejä, olen hyvin paljon yhden ja valmis mingle.was selaat sivun ja minä

Re: bug: sparse config interpretation incorrectness in 2.8.0-rc2

On Thu, Mar 17, 2016 at 8:46 PM, Johannes Schindelin wrote: > Unfortunately, this does not help me at all. In the use case I am trying > to get to work fast, we have tons and tons of directories and need *one* > file in pretty much *all* of those directories, and

Re: [PATCH 18/19] index-helper: autorun

Hi Duy, On Fri, 18 Mar 2016, Duy Nguyen wrote: > > Well, the way I read the code it is possible that: > > > > 1. Git process 1 starts, reading the index > > 2. Git process 2 starts, poking the index-helper > > 3. The index-helper updates the .pid file (why not set a bit in the shared > >

Re: [PATCH] pretty-print: de-tabify indented logs to make things line up properly

On Wed, Mar 16, 2016 at 2:37 PM, Junio C Hamano wrote: > > What surprised me was that this new expand logic triggered for > shortlog, actually. I somehow assumed the caller that called > de-tabify helper was only called for --pretty=medium. I guess that would be ok, since

斯游傥为胜

你的老朋友邀你来Q群:343257759

[ANNOUNCE] Git v2.8.0-rc3

A release candidate Git v2.8.0-rc3 is now available for testing at the usual places. It is comprised of 498 non-merge commits since v2.7.0, contributed by 69 people, 21 of which are new faces. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/testing/ The following