In 9ac3f0e (pack-objects: fix performance issues on packing large deltas,
2018-07-22), a mutex was introduced that is used to guard the call to set
the delta size. This commit added code to initialize it, but at an incorrect
spot: in init_threaded_search(), while the call to oe_set_delta_size()
> >
> > Teach make_cache_entry function to take object_id instead of a SHA-1.
>
> This repeats the subject line?
>
> Sign off missing.
Thank you Stefan for pointing this out. This does not add much information to
the subject line. I could clean it up if I re-roll to fix up the missing sign
it will
never be able to fulfill a future request.
Signed-off-by: Jameson Miller
---
mem-pool.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index 389d7af447..c80124f1fe 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -21,16 +21,16 @@ static struct
mem_pool.
3) When discarding mem_pools, invalidate mem_pool memory.
This should provide extra checks that mem_pools and their allocated
cache_entries are being used as expected.
Signed-off-by: Jameson Miller
---
cache.h | 6 ++
git.c| 3 +++
mem-pool.c | 6 +-
mem
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function apply to a specific index.
Signed-off-by: Jameson Miller
---
cache.h | 2 +-
merge-recursive.c | 2 +-
read-cache.c
(path);
ce = make_empty_transient_cache_entry(len);
- hashcpy(ce->oid.hash, oid->hash);
+ oidcpy(>oid, oid);
memcpy(ce->name, path, len);
ce->ce_flags = create_ce_flags(stage);
ce->ce_namelen = len;
### Patches
Jameson Miller (8):
read-cache: teach refre
ache entry with
empty fields.
discard_cache_entry: A single function that knows how to discard a cache
entry regardless of how it was allocated.
Signed-off-by: Jameson Miller
---
apply.c| 24 +--
blame.c| 5 +--
builtin/checkout.
Add functions for:
- combining two memory pools
- determining if a memory address is within the range managed by a
memory pool
These functions will be used by future commits.
Signed-off-by: Jameson Miller
---
mem-pool.c | 42 ++
mem
he entries
We decided tracking and iterating over known memory pool regions was
less desirable than adding an extra field to track this stae.
Signed-off-by: Jameson Miller
---
cache.h| 21 +
mem-pool.c | 3 +-
read-cache
and discarding memory pool.
Signed-off-by: Jameson Miller
---
mem-pool.c | 59 ++
mem-pool.h | 10 +
2 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index c80124f1fe..1769400d2d 100644
--- a/mem-pool.c
Teach make_cache_entry function to take object_id instead of a SHA-1.
---
apply.c| 2 +-
builtin/checkout.c | 2 +-
builtin/difftool.c | 4 ++--
builtin/reset.c| 2 +-
cache.h| 7 ++-
merge-recursive.c | 2 +-
read-cache.c | 8 +---
resolve-undo.c |
> > +void mem_pool_combine(struct mem_pool *dst, struct mem_pool *src) {
> > + struct mp_block *p;
> > +
> > + /* Append the blocks from src to dst */
> > + if (dst->mp_block && src->mp_block) {
> > + /*
> > +* src and dst have blocks, append
> > +* blocks
> Do we have any numbers on performance or memory pressure here?
> (I would think benchmarking fast-import would suffice as that is where the mem
> pool originated)
I ran fast-import on the git.git and linux.git repositories - this action
reports the
overall memory allocated to pools. The
> How much work is it to convert these to object_id while at it instead of char
> *sha1?
> (I think we really dislike introducing new sha1 based code; If it doesn't
> sound
> easy maybe we can have a static inline wrapper here that just converts oid to
> sha1 and then calls this function?)
I
Add functions for:
- combining two memory pools
- determining if a memory address is within the range managed by a
memory pool
These functions will be used by future commits.
Signed-off-by: Jameson Miller
---
mem-pool.c | 42 ++
mem
mem_pool.
3) When discarding mem_pools, invalidate mem_pool memory.
This should provide extra checks that mem_pools and their allocated
cache_entries are being used as expected.
Signed-off-by: Jameson Miller
---
cache.h | 6 ++
git.c| 3 +++
mem-pool.c | 6 +-
mem
he entries
We decided tracking and iterating over known memory pool regions was
less desirable than adding an extra field to track this stae.
Signed-off-by: Jameson Miller
---
cache.h| 21 +
mem-pool.c | 3 +-
read-cache
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function apply to a specific index.
Signed-off-by: Jameson Miller
---
cache.h | 2 +-
merge-recursive.c | 2 +-
read-cache.c
to searching all nodes in the
linked list.
Signed-off-by: Jameson Miller
---
mem-pool.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index 389d7af447..c80124f1fe 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -21,16 +21,16 @@ static struct mp_block
dd details to commit message for "mem-pool: only search head block for
available space"
The largest change is the new commit "read-cache: make_cache_entry should take
object_id struct"
Base Ref: master
Web-Diff: https://github.com/jamill/git/compare/ed843436dd...55c9b900
and discarding memory pool.
Signed-off-by: Jameson Miller
---
mem-pool.c | 59 ++
mem-pool.h | 10 +
2 files changed, 61 insertions(+), 8 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index c80124f1fe..1769400d2d 100644
--- a/mem-pool.c
The make_cache_entry function should take an object_id struct instead
of sha.
Signed-off-by: Jameson Miller
---
apply.c| 2 +-
builtin/checkout.c | 2 +-
builtin/difftool.c | 4 ++--
builtin/reset.c| 2 +-
cache.h| 7 ++-
merge-recursive.c | 2 +-
read-cache.c
the corresponding
memory.
Signed-off-by: Jameson Miller
---
apply.c| 24 +--
blame.c| 5 +--
builtin/checkout.c | 8 ++--
builtin/difftool.c | 6 +--
builtin/reset.c| 2 +-
builtin/update-index.c | 26 +---
cache.h| 40
>
> > We debated several approaches for what to do here
>
> it would be awesome if the list could participate in the discussion even if
> only
> read-only.
A bit of delay in my response here, but I like the suggestion. here is a
summary of
some approaches I considered:
1) Do not include any
the corresponding
memory.
Signed-off-by: Jameson Miller
---
apply.c| 24 ++---
blame.c| 5 ++-
builtin/checkout.c | 8 ++---
builtin/difftool.c | 6 ++--
builtin/reset.c| 2 +-
builtin/update-index.c | 26 ++
cache.h| 24
The amount of memory to allocate for mp_blocks was off by a
sizeof(uintmax_t) on platforms that do not support flexible arrays. To
account for this, use the offset of the space field when calculating
the total amount of memory to allocate for a mp_block.
Signed-off-by: Jameson Miller
---
mem
Add functions for:
- combining two memory pools
- determining if a memory address is within the range managed by a
memory pool
These functions will be used by future commits.
Signed-off-by: Jameson Miller
---
mem-pool.c | 42 ++
mem
t be freed while
they are still being referenced.
Signed-off-by: Jameson Miller
---
cache.h| 21 ++
mem-pool.c | 3 +-
read-cache.c | 119 -
split-index.c | 50
unpack-trees.c | 13 +-
mem_pool.
3) When discarding mem_pools, invalidate mem_pool memory.
This should provide extra checks that mem_pools and their allocated
cache_entries are being used as expected.
Signed-off-by: Jameson Miller
---
cache.h | 6 ++
git.c| 3 +++
mem-pool.c | 6 +-
mem
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function apply to a specific index.
Signed-off-by: Jameson Miller
---
cache.h | 2 +-
merge-recursive.c | 2 +-
read-cache.c
b.com/jamill/git/compare/242ba98e44...667b8de06c
Jameson Miller (8):
read-cache: teach refresh_cache_entry() to take istate
block alloc: add lifecycle APIs for cache_entry structs
mem-pool: only search head block for available space
mem-pool: tweak math on mp_block allocation size
mem-poo
that will utilize
creating and discarding memory pool.
Signed-off-by: Jameson Miller
---
mem-pool.c | 63 ++
mem-pool.h | 10 ++
2 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index
it will
never be able to fulfill a future request.
Signed-off-by: Jameson Miller
---
mem-pool.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index 389d7af447..c80124f1fe 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -21,16 +21,16 @@ static struct
> -Original Message-
> From: Junio C Hamano <jch2...@gmail.com> On Behalf Of Junio C Hamano
> Sent: Thursday, May 24, 2018 12:52 AM
> To: Jameson Miller <jam...@microsoft.com>
> Cc: git@vger.kernel.org; pclo...@gmail.com; jonathanta...@google.com;
> sbel...@
> -Original Message-
> From: Junio C Hamano <jch2...@gmail.com> On Behalf Of Junio C Hamano
> Sent: Thursday, May 24, 2018 12:55 AM
> To: Jameson Miller <jam...@microsoft.com>
> Cc: git@vger.kernel.org; pclo...@gmail.com; jonathanta...@google.com;
> sbel...@
mem_pool.
3) When discarding mem_pools, invalidate mem_pool memory.
This should provide extra checks that mem_pools and their allocated
cache_entries are being used as expected.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h | 6 ++
git.c| 3 +++
mem-
ing memory pool.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 2 +-
mem-pool.c| 63 +++
mem-pool.h| 12 +++-
3 files changed, 71 insertions(+), 6 deletions(-)
diff --git a/fast-import.c b/fas
Add functions for:
- combining two memory pools
- determining if a memory address is within the range managed by a
memory pool
These functions will be used by future commits.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
mem-pool.
it will
never be able to fulfill a future request.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
mem-pool.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/mem-pool.c b/mem-pool.c
index 389d7af447..c80124f1fe 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -21,16
t be freed while
they are still being referenced.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h| 21 ++
read-cache.c | 119 -
split-index.c | 50
unpack-trees.c | 13 +--
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function work on a specific index.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h | 2 +-
merge-recursive
nto single
function. This should make code easier to maintain
- Small tweaks based on V1 feedback
Base Ref: master
Web-Diff: g...@github.com:jamill/git.git/commit/d608515f9e
Checkout: git fetch g...@github.com:jamill/git.git
users/jamill/block_allocation-v3 && git checkout d608515f9e
memory.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
apply.c| 26 ++---
blame.c| 5 +--
builtin/checkout.c | 8 ++--
builtin/difftool.c | 8 ++--
builtin/reset.c| 6 +--
builtin/update-index.c | 26 ++---
c
> -Original Message-
> From: git-ow...@vger.kernel.org <git-ow...@vger.kernel.org> On Behalf Of
> Stefan Beller
> Sent: Thursday, May 3, 2018 4:59 PM
> To: Duy Nguyen <pclo...@gmail.com>
> Cc: Jameson Miller <jam...@microsoft.com>; git@vger.kernel.
> -Original Message-
> From: Duy Nguyen <pclo...@gmail.com>
> Sent: Wednesday, May 2, 2018 2:23 PM
> To: Jameson Miller <jam...@microsoft.com>
> Cc: Stefan Beller <sbel...@google.com>; Git Mailing List <git@vger.kernel.org>
> Subject: Re: [PA
> -Original Message-
> From: Duy Nguyen <pclo...@gmail.com>
> Sent: Wednesday, May 2, 2018 1:02 PM
> To: Stefan Beller <sbel...@google.com>
> Cc: Git Mailing List <git@vger.kernel.org>; Jameson Miller
> <jam...@microsoft.com>
> Subject: Re:
Thank you for taking a look - I think these are good questions. Please let me
know if you have further questions.
> -Original Message-
> From: Stefan Beller <sbel...@google.com>
> Sent: Monday, April 30, 2018 5:42 PM
> To: Jameson Miller <jam...@microsoft.com>
&
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function work on a specific index.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h | 2 +-
merge-recursive
will be used in a future commit in this commit series.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
mem-pool.c | 114 ++---
mem-pool.h | 32 +
2 files changed, 142 insertions(+), 4 deletions(-)
diff --git a/mem-po
mem_pool.
3) When discarding mem_pools, invalidate mem_pool memory.
This should provide extra checks that mem_pools and their allocated
cache_entries are being used as expected.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h | 7 +++
git.c| 3 ++
e downside of this approach
is that the cache_entry type would need to grow to incorporate this
information.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
cache.h | 2 ++
read-cache.c | 95 +--
split-index.c | 23 +--
memory.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
apply.c| 26 ++--
blame.c| 5 +--
builtin/checkout.c | 8 ++--
builtin/difftool.c | 8 ++--
builtin/reset.c| 6 +--
builtin/update-index.c | 26 ++--
c
ers/jamill/block_allocation-v2 && git checkout 2152d28016
Jameson Miller (5):
read-cache: teach refresh_cache_entry() to take istate
block alloc: add lifecycle APIs for cache_entry structs
mem-pool: fill out functionality
block alloc: allocate cache entries from mem_pool
block
On 04/23/2018 01:49 PM, Jonathan Tan wrote:
On Mon, 23 Apr 2018 13:27:09 -0400
Jameson Miller <jameson.mille...@gmail.com> wrote:
This seems overly complicated - the struct mem_pool already has a linked
list of pages, so couldn't you create a custom page and insert it behind
the c
On 04/20/2018 07:21 PM, Jonathan Tan wrote:
On Tue, 17 Apr 2018 16:34:42 +
Jameson Miller <jam...@microsoft.com> wrote:
@@ -19,8 +19,27 @@ struct mem_pool {
/* The total amount of memory allocated by the pool. */
size_t pool_alloc;
+
+ /*
+* Array of po
On 04/20/2018 07:34 PM, Jonathan Tan wrote:
On Tue, 17 Apr 2018 16:34:39 +
Jameson Miller <jam...@microsoft.com> wrote:
Jameson Miller (5):
read-cache: teach refresh_cache_entry to take istate
Add an API creating / discarding cache_entry structs
mem-pool: fill out functio
On 04/20/2018 01:49 PM, Stefan Beller wrote:
base-commit: cafaccae98f749ebf33495aec42ea25060de8682
I couldn't quite figure out what these five patches were based on,
even with this line. Basing on and referring to a commit that is
not part of our published history with "base-commit" is not
On 04/18/2018 12:49 AM, Junio C Hamano wrote:
Jameson Miller <jam...@microsoft.com> writes:
This patch series improves the performance of loading indexes by
reducing the number of malloc() calls. ...
Jameson Miller (5):
read-cache: teach refresh_cache_entry to take istate
Add
On 04/17/2018 02:39 PM, Ben Peart wrote:
On 4/17/2018 12:34 PM, Jameson Miller wrote:
100K
Test baseline [4] block_allocation
0002.1: read_cache/discard_cache 1 times
/20180417163400.3875-2-jam...@microsoft.com/
-Original Message-
From: Jameson Miller
Sent: Wednesday, April 11, 2018 2:38 PM
To: git@vger.kernel.org
Cc: gits...@pobox.com; p...@peff.net; sunsh...@sunshineco.com;
ram...@ramsayjones.plus.com; Jameson Miller <jam...@microsoft.com>
Subject:
Improve performance of reading a large index by reducing the number of
malloc() calls. When reading an index with a large number of entries,
a portion of the time is dominated in malloc() calls. This can be
mitigated by allocating a single large block of memory up front into a
memory pool and have
Add an option (controlled by an environment variable) perform extra
validations on mem_pool allocated cache entries. When set:
1) Invalidate cache_entry memory when discarding cache_entry.
2) When discarding index_state struct, verify that all cache_entries
were allocated from expected
will be used in a future commit in this commit series.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
mem-pool.c | 103 ++---
mem-pool.h | 32 +++
2 files changed, 131 insertions(+), 4 deletions(-)
diff --git a/mem-
Add an API around managing the lifetime of cache_entry structs. Abstracting
memory management details behind an API will allow for alternative memory
management strategies without affecting all the call sites. This commit does
not change how memory is allocated / freed. A later commit in this
Refactoring dependencies of make_cache_entry to work on a specific
index, instead of implicitly using the_index. This is in preparation
for making the make_cache_entry function work on a specific index.
---
cache.h | 2 +-
merge-recursive.c | 2 +-
read-cache.c | 7 ---
3 files
ine commit: 8b026eda Revert "Merge branch
'en/rename-directory-detection'"
Jameson Miller (5):
read-cache: teach refresh_cache_entry to take istate
Add an API creating / discarding cache_entry structs
mem-pool: fill out functionality
Allocate cache entries from memory pools
Add op
ine commit: 8b026eda Revert "Merge branch
'en/rename-directory-detection'"
Jameson Miller (5):
read-cache: teach refresh_cache_entry to take istate
Add an API creating / discarding cache_entry structs
mem-pool: fill out functionality
Allocate cache entries from memory pools
Add op
in future patches.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 99f8f56e8c..38af0a294b 100644
--- a/fast-import.c
+++ b/fast-import.c
to reflect their
more scoped usage.
These changes allow for the multiple instances of a memory pool to
exist and be reused outside of fast-import. In a future commit the
mem_pool type will be moved to its own file.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.
This moves the reusable parts of the memory pool logic used by
fast-import.c into its own file for use by other components.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Makefile | 1 +
fast-import.c | 70 +--
mem-
.
- Updated variable names in 2/3 to reflect updated usage of
variable.
Jameson Miller (3):
fast-import: rename mem_pool type to mp_block
fast-import: introduce mem_pool type
Move reusable parts of memory pool into its own file
Makefile | 1 +
fast-import.c | 77
f this week and next week, but will update this patch
series when I get back (Week of April 9th).
Thank you
Jameson
From: Junio C Hamano <jch2...@gmail.com> on behalf of Junio C Hamano
<gits...@pobox.com>
Sent: Tuesday, March 27, 201
in future patches.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 58ef360da4..6c3215d7c3 100644
--- a/fast-import.c
+++ b/fast-import.c
and be reused outside of fast-import. In a future commit the
mem_pool type will be moved to its own file.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 80 +--
1 file changed, 51 insertions(+), 29 deletions(-)
]
https://github.com/jamill/git/compare/block_allocation_base...jamill:block_allocation
Jameson Miller (3):
fast-import: rename mem_pool type to mp_block
fast-import: introduce mem_pool type
Move reusable parts of memory pool into its own file
Makefile | 1 +
fast-import.c | 74
This moves the reusable parts of the memory pool logic used by
fast-import.c into its own file for use by other components.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Makefile | 1 +
fast-import.c | 70 +--
mem-
in future patches.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 58ef360da4..6c3215d7c3 100644
--- a/fast-import.c
+++ b/fast-import.c
This moves the reusable parts of the memory pool logic used by
fast-import.c into its own file for use by other components.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Makefile | 1 +
fast-import.c | 118 +-
mem-
Introduce the mem_pool type and wrap the existing mp_block in this new
type. The new mem_pool type will allow for the memory pool logic to be
reused outside of fast-import. This type will be moved into its own file
in a future commit.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
This commit adds functionality to the mem-pool type that can be
generally useful. This functionality will be used in a future commit.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
mem-pool.c | 58 ++
mem-pool.
Update memory pool functions to work on a passed in mem_pool instead of
the global mem_pool type. This is in preparation for making the memory
pool logic reusable.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
fast-import.c | 52 ++---
out the
mem_pool type into a more complete implementation. These functions are
not used in this change, but we will be used in an upcoming patch
series. I can remove this commit if it is desired.
[1]
https://github.com/jamill/git/compare/block_allocation_base...jamill:block_allocation
Jameson
Add tests around status reporting ignord files that match an exclude
pattern for both --untracked-files=normal and --untracked-files=all.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
t/t7521-ignored-mode.sh | 233
1 file change
Teach status command to handle `--ignored=matching` with
`--untracked-files=normal`
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
dir.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/dir.c b/dir.c
index b9af87eca9..20457724c0
ed directory matches
an exclude pattern, then the path of the directory is returned. If a
directory does not match an exclude pattern, but all of its contents
are ignored, then the contained files are reported instead of the
directory.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Documentation/git-status.txt | 21 +-
Documentation/technical/api-directory-listing.txt | 27 +++
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/Documentati
est to a name not taken in by topics in flight
Jameson Miller (4):
status: add option to show ignored files differently
status: report matching ignored and normal untracked
status: document options to show matching ignored files
status: test ignored modes
Documentation/git-status.txt
Add tests around status reporting ignord files that match an exclude
pattern for both --untracked-files=normal and --untracked-files=all.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
t/t7519-ignored-mode.sh | 183
1 file change
Teach status command to handle `--ignored=matching` with
`--untracked-files=normal`
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
dir.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/dir.c b/dir.c
index b9af87eca9..20457724c0
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Documentation/git-status.txt | 21 +-
Documentation/technical/api-directory-listing.txt | 27 +++
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/Documentati
ed directory matches
an exclude pattern, then the path of the directory is returned. If a
directory does not match an exclude pattern, but all of its contents
are ignored, then the contained files are reported instead of the
directory.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
The previous iteration can be found here:
https://public-inbox.org/git/20171011133504.15049-1-jam...@microsoft.com/
The main difference is to address feedback around commit organization
and wording.
Jameson Miller (4):
status: add option to show ignored files differently
status: report
On 10/11/2017 10:55 PM, Junio C Hamano wrote:
Jameson Miller <jameson.mille...@gmail.com> writes:
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Documentation/git-status.txt | 21 +-
Documentation/technical/api-directory-list
On 10/11/2017 10:33 PM, Junio C Hamano wrote:
Jameson Miller <jameson.mille...@gmail.com> writes:
Changes in v2:
Addressed review comments from the original series:
* Made fixes / simplifications suggested for documentation
* Removed test_tick from test scripts
* Merged 2 c
On 10/12/2017 12:06 AM, Junio C Hamano wrote:
Jameson Miller <jameson.mille...@gmail.com> writes:
Add tests for status handling of '--ignored=matching` and
`--untracked-files=normal`.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Hmph, having some tests in 3/5, ch
On 10/11/2017 10:49 PM, Junio C Hamano wrote:
Jameson Miller <jameson.mille...@gmail.com> writes:
This change teaches the status command more options to control which
ignored files are reported independently of the which untracked files
are reported by allowing the `--ignored` option t
Add tests for status handling of '--ignored=matching` and
`--untracked-files=normal`.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
t/t7519-ignored-mode.sh | 60 -
1 file changed, 59 insertions(+), 1 deletion(-)
diff --git a/t
Add tests for new ignored mode (matching) when showing all untracked
files.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
t/t7519-ignored-mode.sh | 125
1 file changed, 125 insertions(+)
create mode 100755 t/t7519-ignored-mode.sh
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
Documentation/git-status.txt | 21 +-
Documentation/technical/api-directory-listing.txt | 27 +++
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/Documentati
Teach status command to handle matching ignored mode when showing
untracked files with the normal option.
Signed-off-by: Jameson Miller <jam...@microsoft.com>
---
dir.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/dir.c b/dir.c
index b9af
1 - 100 of 109 matches
Mail list logo