On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote:
> On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote:
> > -BEGIN PGP SIGNED MESSAGE-
> > Hash: SHA256
> >
> > Hi there,
> >
> > While bumping Git's version for our Linux distribution to 2.14.1, I've
> > run in to a new te
On 15 Sep 2017, at 07:58, Junio C Hamano wrote:
> Here are the topics that have been cooking. Commits prefixed with
> '-' are only in 'pu' (proposed updates) while commits prefixed with
> '+' are in 'next'. The ones marked with '.' do not appear in any of
> the integration branches, but I am s
On 15/09/17 03:48, Junio C Hamano wrote:
>
> Michael J Gruber writes:
>
>> In fact, per documentation "--fork-point" looks at the reflog in
>> addition to doing the usual walk from the tip. The original design
>> description in d96855ff51 ("merge-base: teach "--fork-point" mode",
>> 2013-10-23)
Kaartic Sivaraam venit, vidit, dixit 15.09.2017 06:50:
> It's not good to use the phrase 'do not touch' to convey the information
> that the cut-line should not be modified or removed as it could possibly
> be mis-interpreted by a person who doesn't know that the word 'touch' has
> the meaning of '
Jeff King venit, vidit, dixit 14.09.2017 16:34:
> On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote:
>
>> 4f21454b55 ("merge-base: handle --fork-point without reflog",
>> 2016-10-12) introduced a fix for merge-base --fork-point without reflog
>> and a test. While that test is fine,
Junio C Hamano venit, vidit, dixit 15.09.2017 04:48:
> Michael J Gruber writes:
>
>> In fact, per documentation "--fork-point" looks at the reflog in
>> addition to doing the usual walk from the tip. The original design
>> description in d96855ff51 ("merge-base: teach "--fork-point" mode",
>> 201
Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21:
> Hi Michael,
>
> On Thu, 14 Sep 2017, Michael J Gruber wrote:
>
>> test-lib determines whether a file-system supports FIFOs and needs to do
>> special casing for CYGWIN and MINGW. This separates those system
>> specific settings from thos
On Thu, 14 Sep 2017, Jeff King wrote:
> On Thu, Sep 14, 2017 at 07:32:11AM -0400, Robert P. J. Day wrote:
>
> > [is this the right place to ask questions about git usage? or is
> > there a different forum where one can submit possibly
> > embarrassingly silly questions?]
>
> No, this is the righ
On Fri, Sep 15, 2017 at 12:01:27PM +0200, Michael J Gruber wrote:
> Jeff King venit, vidit, dixit 14.09.2017 16:34:
> > On Thu, Sep 14, 2017 at 03:15:18PM +0200, Michael J Gruber wrote:
> >
> >> 4f21454b55 ("merge-base: handle --fork-point without reflog",
> >> 2016-10-12) introduced a fix for me
On Thu, Sep 14, 2017 at 8:19 PM, Jonathan Tan wrote:
> On Thu, 14 Sep 2017 10:39:35 +0200
> Christian Couder wrote:
>
>> From the following email:
>>
>> https://public-inbox.org/git/20170804145113.5ceaf...@twelve2.svl.corp.google.com/
>>
>> it looks like his work is fundamentally about changing t
On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote:
> On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote:
> > -BEGIN PGP SIGNED MESSAGE-
> > Hash: SHA256
> >
> > Hi there,
> >
> > While bumping Git's version for our Linux distribution to 2.14.1, I've
> > run in to a new t
On Fri, Sep 15, 2017 at 07:06:43AM -0400, Robert P. J. Day wrote:
> > I think you want to stick with a --tree-filter (or an
> > --index-filter), but just selectively decide when to do the
> > deletion. For example, if you can tell the difference between the
> > two states based on the presence of
When using git-mv with a submodule it will detect that and update the
paths for its configurations (.gitmodules, worktree and gitfile). This
does not work for recursive submodules where a user renames the root
submodule.
We discovered this fact when working on on-demand fetch for renamed
submodule
On Fri, 2017-09-15 at 12:00 +0200, Michael J Gruber wrote:
> Kaartic Sivaraam venit, vidit, dixit 15.09.2017 06:50:
> >
> > I didn't expect the least that this would go upto v3. In case anyboy finds
That's should have been 'anybody'.
> > something wrong with this change too, it's a lot better
(It looks like I did not reply to this email yet, sorry about this late reply.)
On Thu, Jul 6, 2017 at 7:36 PM, Ben Peart wrote:
>
> On 7/1/2017 3:41 PM, Christian Couder wrote:
>>
>> On Fri, Jun 23, 2017 at 8:24 PM, Ben Peart wrote:
>>>
>>> Great to see this making progress!
>>>
>>> My thoughts
(It looks like I did not reply to this other email yet, sorry about
this late reply.)
On Wed, Jul 12, 2017 at 9:06 PM, Jonathan Tan wrote:
> On Tue, 20 Jun 2017 09:54:34 +0200
> Christian Couder wrote:
>
>> Git can store its objects only in the form of loose objects in
>> separate files or packe
We store the changed submodules paths to calculate which submodule needs
fetching. This does not work for moved submodules since their paths do
not stay the same in case of a moved submodules. In case of new
submodules we do not have a path in the current checkout, since they
just appeared in this
Valid point. The way my project is set up I always get a conflict on
merge operations, so technically all my merges (except fast forward
merges) end with a git-commit, which of course runs the commit-msg
hook. It seems everything is working as designed. Shame there isn't
a merge-msg hook.
It se
To make extending this logic later easier.
Signed-off-by: Heiko Voigt
---
submodule.c | 74 ++---
1 file changed, 37 insertions(+), 37 deletions(-)
diff --git a/submodule.c b/submodule.c
index 38b9905e43..fa44fc59f2 100644
--- a/submodule.
On 15/09/17 01:37, Jeff King wrote:
> On Thu, Sep 14, 2017 at 12:31:38AM +0100, Ramsay Jones wrote:
>
>> I just tried it again tonight; the current master branch has 3532
>> warnings when compiled with -Wextra, 1409 of which are -Wsign-compare
>> warnings. After applying the patch below, those n
If you pass a newly-initialized or newly-cleared `string_list` to
`for_each_string_list_item()`, then the latter does
for (
item = (list)->items; /* note, this is NULL */
item < (list)->items + (list)->nr; /* note: NULL + 0 */
++item)
Even though this proba
Hi Junio,
On Thu, 24 Aug 2017, Junio C Hamano wrote:
> Lars Schneider writes:
>
> > On 22 Aug 2017, at 21:56, Junio C Hamano wrote:
> >
> >> Here are the topics that have been cooking. Commits prefixed with
> >> '-' are only in 'pu' (proposed updates) while commits prefixed with
> >> '+' are
On 15/09/17 11:31, Michael J Gruber wrote:
> Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21:
>> Hi Michael,
>>
>> On Thu, 14 Sep 2017, Michael J Gruber wrote:
>>
>>> test-lib determines whether a file-system supports FIFOs and needs to do
>>> special casing for CYGWIN and MINGW. This se
Hello,
My name is Derrick Stolee and I just switched teams at Microsoft from
the VSTS Git Server to work on performance improvements in core Git.
This is my first patch submission, and I look forward to your feedback.
Thanks,
Stolee
When displaying object ids, we frequently want to see an abb
Unroll the while loop inside find_unique_abbrev_r to avoid iterating
through all loose objects and packfiles multiple times when the short
name is longer than the predicted length.
Instead, inspect each object that collides with the estimated
abbreviation to find the longest common prefix.
Signed
Create get_hex_char_from_oid() to parse oids one hex character at a
time. This prevents unnecessary copying of hex characters in
extend_abbrev_len() when finding the length of a common prefix.
This change decreases the time to run test-abbrev by up to 40% on
large repos.
Signed-off-by: Derrick St
Create helper program test-abbrev to compute the minimum length of a
disambiguating short-sha for 100,000 object ids. The ids are created
by iterating an unsigned int hash_base by a constant hash_delta and
copying hash_base five times across the sha1. Iterating by hash_delta
does not create a dupli
Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would
get error messages like "merge parent for is on branch
svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root
svn+ssh://ja...@gcc.gnu.org/svn/gcc!"
* git-svn.perl: Remove username from rooturl before comp
Hi,
Derrick Stolee wrote:
> This is my first patch submission, and I look forward to your feedback.
Thanks for writing this. Looks exciting.
[...]
> When displaying object ids, we frequently want to see an abbreviation
[etc]
> Note that performance improves in all cases, but the performance ga
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Thursday, September 14, 2017 11:00 PM
>
> Kevin Willford writes:
>
> > 1. Does this statement, "I only care about the files in this
> > sparse checkout, and do not concern me with anything else", mean
> > that git should not change files outs
Hi,
Jason Merrill wrote:
> Subject: Fix merge parent checking with svn.pushmergeinfo.
>
> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would
> get error messages like "merge parent for is on branch
> svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root
Junio,
Thanks for your response. I'm glad to see that you've been able to understand
the problem. I'm working with the Windows git team to properly return EACCESS
when "rename" fails due to access permissions, but it also sounds like there
will need to be a fix to finalize_object_file to bett
Michael J Gruber writes:
> I did not look up the discussion preceeding 4f21454b55 ("merge-base:
> handle --fork-point without reflog", 2016-10-12), but if "merge-base
> --fork-point" were about a "strict reflog" notion then there was nothing
> to fix back then - no reflog, no merge-base candidate
Johannes Schindelin writes:
> If you want *contributors* to ping the thread themselves, how about
> *posting your updates there, too*?
I do not understand this comment at all. That is what I and others
already and always do by responding to the patches, and when trying
to see if a topic is stil
Hi,
Michael Haggerty wrote:
> If you pass a newly-initialized or newly-cleared `string_list` to
> `for_each_string_list_item()`, then the latter does
>
> for (
> item = (list)->items; /* note, this is NULL */
> item < (list)->items + (list)->nr; /* note: NULL + 0 */
>
Hi Junio,
On Fri, 15 Sep 2017, Junio C Hamano wrote:
> * js/rebase-i-final (2017-07-27) 10 commits
> - rebase -i: rearrange fixup/squash lines using the rebase--helper
> - t3415: test fixup with wrapped oneline
> - rebase -i: skip unnecessary picks using the rebase--helper
> - rebase -i: chec
When the index is read from disk, the fsmonitor index extension is used
to flag the last known potentially dirty index entries. The registered
core.fsmonitor command is called with the time the index was last
updated and returns the list of files changed since that time. This list
is used to flag a
This is a fairly significant rewrite since V5. The big changes include:
Multiple functions including preload-index(), ie_match_stat(), and
refresh_cache_ent() have been updated to honor the CE_FSMONITOR_VALID bit
following the same pattern as skip_worktree and CE_VALID. As a result,
performance i
This includes the core.fsmonitor setting, the query-fsmonitor hook,
and the fsmonitor index extension.
Signed-off-by: Ben Peart
---
Documentation/config.txt | 6 ++
Documentation/githooks.txt | 23 +++
Documentation/technical/index-format.tx
Add a new command line option (-f) to ls-files to have it use lowercase
letters for 'fsmonitor valid' files
Signed-off-by: Ben Peart
---
builtin/ls-files.c | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index e1339e6d17..313962
Add support in update-index to manually add/remove the fsmonitor
extension via --fsmonitor/--no-fsmonitor flags
Signed-off-by: Ben Peart
---
builtin/update-index.c | 19 +++
1 file changed, 19 insertions(+)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 6f39e
Test the ability to add/remove the fsmonitor index extension via
update-index.
Test that dirty files returned from the integration script are properly
represented in the index extension and verify that ls-files correctly
reports their state.
Test that ensure status results are correct when using
Add a new get_be64 macro to enable 64 bit endian conversions on memory
that may or may not be aligned.
Signed-off-by: Ben Peart
---
compat/bswap.h | 22 ++
1 file changed, 22 insertions(+)
diff --git a/compat/bswap.h b/compat/bswap.h
index 7d063e9e40..6b22c46214 100644
--- a
Add a test utility (test-drop-caches) that flushes all changes to disk
then drops file system cache on Windows, Linux, and OSX.
Add a perf test (p7519-fsmonitor.sh) for fsmonitor.
By default, the performance test will utilize the Watchman file system
monitor if it is installed. If Watchman is no
This script integrates the new fsmonitor capabilities of git with the
cross platform Watchman file watching service. To use the script:
Download and install Watchman from https://facebook.github.io/watchman/.
Rename the sample integration hook from fsmonitor-watchman.sample to
fsmonitor-watchman.
Add a test utility (test-dump-fsmonitor) that will dump the fsmonitor
index extension.
Signed-off-by: Ben Peart
---
Makefile | 1 +
t/helper/test-dump-fsmonitor.c | 21 +
2 files changed, 22 insertions(+)
create mode 100644 t/helper/test-dump-fsmonitor
The split index test t1700-split-index.sh has hard coded SHA values for
the index. Currently it supports index V4 and V3 but assumes there are
no index extensions loaded.
When manually forcing the fsmonitor extension to be turned on when
running the test suite, the SHA values no longer match whic
Preload index doesn't run unless it has a minimum number of 1000 files.
To enable running tests with fewer files, add an environment variable
(GIT_FORCE_PRELOAD_TEST) which will override that minimum and set it to 2.
Signed-off-by: Ben Peart
---
preload-index.c | 2 ++
1 file changed, 2 insertio
At times, it makes sense to avoid the cost of writing out the index
when the only changes can easily be recomputed on demand. This causes
problems when trying to write test cases to verify that state as they
can't guarantee the state has been persisted to disk.
Add a new option (--force-write-inde
Hi Junio,
On Fri, 15 Sep 2017, Junio C Hamano wrote:
> --
> [Cooking]
>
> [...]
>
> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
> . diff-delta: fix encoding size that would not fit in "unsigned int"
>
> The machinery to
Buen día,
Me gustaría pertenecer a su comunidad y conocer mas sobre los temas de git
Muchas Gracias,
Saludos Cordiales.
Administrador de la configuracion del software
Eduardo Alfonso León Benítez Lebx
Ext- 2366
Hi Michael,
On Fri, 15 Sep 2017, Michael J Gruber wrote:
> Johannes Schindelin venit, vidit, dixit 15.09.2017 00:21:
> >
> > On Thu, 14 Sep 2017, Michael J Gruber wrote:
> >
> >> test-lib determines whether a file-system supports FIFOs and needs to do
> >> special casing for CYGWIN and MINGW. T
> -Original Message-
> From: Ben Peart [mailto:benpe...@microsoft.com]
> Sent: Friday, September 15, 2017 3:21 PM
> To: benpe...@microsoft.com
> Cc: David Turner ; ava...@gmail.com;
> christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com;
> johannes.schinde...@gmx.de; pclo...
Hi Junio,
On Sat, 16 Sep 2017, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > If you want *contributors* to ping the thread themselves, how about
> > *posting your updates there, too*?
>
> I do not understand this comment at all. That is what I and others
> already and always do by
Johannes Schindelin writes:
> Please stop stating that you expect a reroll for rebase-i-extra when you
> explicitly stated months ago that you would not take my v6. It gets a bit
> annoying.
I already explained to you why I skipped v6, which turned to be
identical to v5 when the unnecessary reba
> -Original Message-
> From: Ben Peart [mailto:benpe...@microsoft.com]
> Sent: Friday, September 15, 2017 3:21 PM
> To: benpe...@microsoft.com
> Cc: David Turner ; ava...@gmail.com;
> christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com;
> johannes.schinde...@gmx.de; pclo...@g
Hi Jonathan,
"Jonathan Nieder" wrote;
Johannes Schindelin wrote:
On Wed, 13 Sep 2017, Jonathan Nieder wrote:
As a side note, I am probably misreading, but I found this set of
paragraphs a bit condescending. It sounds to me like you are saying
"You are making the wrong choice of hash functi
For those interested in partial clones and/or missing objects in repos,
I've updated my original partialclone patches to not require an explicit
list of promises. Fetch/clone still only permits exclusion of blobs, but
the infrastructure is there for a local repo to support missing trees
and commits
Johannes Schindelin writes:
> Hi Junio,
>
> On Fri, 15 Sep 2017, Junio C Hamano wrote:
>
>> --
>> [Cooking]
>>
>> [...]
>>
>> * mk/diff-delta-uint-may-be-shorter-than-ulong (2017-08-10) 1 commit
>> ...
>> Dropped, as it was rerolled for review a
Sebastian Schuberth writes:
> On 2017-09-02 02:04, Jonathan Nieder wrote:
>
>>> Anyway, this should really more explicitly say *what* you need to know
>>> about, that is, reordering commits does not work.
>>
>> It tries to explain that, even with an example. If you have ideas for
>> improving t
Joseph Dunne writes:
> Valid point. The way my project is set up I always get a conflict on
> merge operations, so technically all my merges (except fast forward
> merges) end with a git-commit, which of course runs the commit-msg
> hook. It seems everything is working as designed. Shame there
On Fri, 15 Sep 2017 13:24:50 +0200
Christian Couder wrote:
> > There are still some nuances. For example, if an external ODB provides
> > both a tree and a blob that the tree references, do we fetch the tree in
> > order to call "have" on all its blobs, or do we trust the ODB that if it
> > has t
Johannes Schindelin writes:
> On Sat, 16 Sep 2017, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>> > If you want *contributors* to ping the thread themselves, how about
>> > *posting your updates there, too*?
>>
>> I do not understand this comment at all. That is what I and other
On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote:
> Hi,
>
> Jason Merrill wrote:
>
>> Subject: Fix merge parent checking with svn.pushmergeinfo.
>>
>> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would
>> get error messages like "merge parent for is on branch
>> svn+
On Fri, Sep 15, 2017 at 10:21 AM, Kevin Willford wrote:
> From: Junio C Hamano [mailto:gits...@pobox.com]
> Sent: Thursday, September 14, 2017 11:00 PM
>>
>> Kevin Willford writes:
>>
>> > 1. Does this statement, "I only care about the files in this
>> > sparse checkout, and do not concern me wit
> -Original Message-
> From: Ben Peart [mailto:benpe...@microsoft.com]
> Sent: Friday, September 15, 2017 3:21 PM
> To: benpe...@microsoft.com
> Cc: David Turner ; ava...@gmail.com;
> christian.cou...@gmail.com; git@vger.kernel.org; gits...@pobox.com;
> johannes.schinde...@gmx.de; pclo...@g
Previously, svn dcommit of a merge with svn.pushmergeinfo set would
get error messages like "merge parent for is on branch
svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root
svn+ssh://ja...@gcc.gnu.org/svn/gcc!"
So, let's call remove_username (as we do for svn info) before
Jason Merrill wrote:
> On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote:
> > Jason Merrill wrote:
>>> Subject: Fix merge parent checking with svn.pushmergeinfo.
>>>
>>> Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would
>>> get error messages like "merge parent for
Jason Merrill wrote:
> Previously, svn dcommit of a merge with svn.pushmergeinfo set would
> get error messages like "merge parent for is on branch
> svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root
> svn+ssh://ja...@gcc.gnu.org/svn/gcc!"
>
> So, let's call remove_usernam
> -Original Message-
> + # Choose integration script based on existance of Watchman.
Spelling: existence
> -Original Message-
> +dirty_repo () {
> + : >untracked &&
> + : >dir1/untracked &&
> + : >dir2/untracked &&
> + echo 1 >modified &&
> + echo 2 >dir1/modified &&
> + echo 3 >dir2/modified &&
> + echo 4 >new &&
> + echo 5 >dir1/new &&
> + echo 6 >dir2/new
On Fri, Sep 15, 2017 at 5:53 PM, Jonathan Nieder wrote:
> Jason Merrill wrote:
>> On Fri, Sep 15, 2017 at 1:52 PM, Jonathan Nieder wrote:
>> > Jason Merrill wrote:
>
Subject: Fix merge parent checking with svn.pushmergeinfo.
Without this fix, svn dcommit of a merge with svn.pushmer
On 09/15/2017 08:43 PM, Jonathan Nieder wrote:
> Michael Haggerty wrote:
>
>> If you pass a newly-initialized or newly-cleared `string_list` to
>> `for_each_string_list_item()`, then the latter does
>>
>> for (
>> item = (list)->items; /* note, this is NULL */
>> item <
On 15/09/17 06:30, Jeff King wrote:
> On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote:
>
>> On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote:
>>> -BEGIN PGP SIGNED MESSAGE-
>>> Hash: SHA256
>>>
>>> Hi there,
>>>
>>> While bumping Git's version for our Linux distributio
I was reading the 'git revert' documentation and found the following
line in it,
-m parent-number
--mainline parent-number
...
See the revert-a-faulty-merge How-To[1] for more details.
It says that the 'How-To' is present in the first section of the man
page. I tried t
`git describe --match` with multiple patterns matches only first pattern.
If it fails, next patterns are not tried.
Fix it, add test cases and update existing test which has wrong
expectation.
Signed-off-by: Max Kirillov
---
builtin/describe.c | 9 ++---
t/t6120-describe.sh | 6 +-
2 f
Seems 'Documentation/githooks.txt' needs an update related to this
change. Previously it said(note the **s) that 'commit-msg' is invoked
only by 'git commit',
commit-msg
This hook is invoked by git commit**, and can be bypassed with the
--no-verify option. It takes a sing
77 matches
Mail list logo