The option of --color-moved has proven to be useful as observed on the
mailing list. However when refactoring sometimes the indentation changes,
for example when partitioning a functions into smaller helper functions
the code usually mostly moved around except for a decrease in indentation.
To
These flags were there since the beginning (3443546f6e (Use a *real*
built-in diff generator, 2006-03-24), but were never used. Remove them.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
xdiff/xdiff.h | 8
1 file changed, 8 deletions(-)
diff --git a/xdiff/xdiff.h
This moves the part of code that checks if we're still in a block
into its own function. We'll need a different approach on advancing
the blocks in a later patch, so having it as a separate function will
prove useful.
While at it rename the variable `p` to `prev` to indicate that it refers
to
On 28/06/18 23:03, Jeff King wrote:
> On Thu, Jun 28, 2018 at 07:53:27PM +0100, Ramsay Jones wrote:
[snip]
> Yes, it can go in quickly. But I'd prefer not to keep it in the long
> term if it's literally doing nothing.
Hmm, I don't think you can say its doing nothing!
"Yeah, this solution
On 28/06/18 23:12, Jeff King wrote:
> On Thu, Jun 28, 2018 at 06:06:03PM -0400, Jeff King wrote:
>
>> Note that we didn't test this case at all, so I've added
>> coverage in t7415. We may end up toning down or removing
>> this fsck check in the future. So take this test as checking
>> what
> This seems like a pretty difficult to use feature, requiring that I
> provide the actual OIDs. I think a much better UI would probably be to
> accept a number of different things ranging from exact OIDs to actual
> ref names or even better, allowing for ref-patterns which include globs.
> That
Hello,
On 27.06.2018 21:39, Junio C Hamano wrote:
This is primarily because cmd_$foo() is designed to be replacement
of "main()" in usual programs---it is allowed to assume the global
variables it uses have their initial values and nobody cares the
state it leaves behind when it returns.
Jeff King writes:
> Yeah, this solution seems sensible. Given that we would never report any
> error for that blob, there is no point in even looking at it. I wonder
> if we ought to do the same for other types, too. Is there any point in
> opening a tree that is in the skiplist?
Suppose the
Thanks.
On 28/06/18 12:49, Jeff King wrote:
> On Wed, Jun 27, 2018 at 07:39:53PM +0100, Ramsay Jones wrote:
>
>> Since commit ed8b10f631 ("fsck: check .gitmodules content", 2018-05-02),
>> fsck will issue an error message for '.gitmodules' content that cannot
>> be parsed correctly. This is the case,
Jameson Miller writes:
> The make_cache_entry function should take an object_id struct instead
> of sha.
The name of the hash is SHA-1, not sha ;-)
It is not worth a reroll, but I do not think "should" is a
particularly good thing to say in the title or justification in the
log message in this
On Thu, Jun 28, 2018 at 07:21:18PM +0200, Lars Schneider wrote:
> How about this:
>
> 1) We allow users to set the encoding "auto". Example:
>
> *.txt working-tree-encoding=auto
>
> 2) We define a new variable `core.autoencoding`. By default the value is
> UTF-8 (== no re-encoding) but
Johannes Schindelin writes:
> On Wed, 27 Jun 2018, Junio C Hamano wrote:
>
>> Johannes Schindelin writes:
>>
>> >git rev-list --bisect-all --first-parent F..E >revs &&
>> ># only E, e1..e8 should be listed, nothing else
>> >test_line_count = 9 revs &&
>> >for rev in E e1 e2 e3
On 06/28, Jonathan Tan wrote:
> > This seems like a pretty difficult to use feature, requiring that I
> > provide the actual OIDs. I think a much better UI would probably be to
> > accept a number of different things ranging from exact OIDs to actual
> > ref names or even better, allowing for
Hi Peff,
On Thu, 28 Jun 2018, Jeff King wrote:
> On Wed, Jun 27, 2018 at 09:35:23PM +0200, Johannes Schindelin via
> GitGitGadget wrote:
>
> > To prevent erroneous commits from being reported (e.g. when unpacking
> > Git's source code from a .tar.gz file into a subdirectory of a different
> >
Jeff King wrote:
> We could get rid around that by using $(DOC_ETC_GITCONFIG) or something,
> with:
>
> DOC_ETC_GITCONFIG ?= $(ETC_GITCONFIG)
>
> in the Makefile. But that still leaves the choice of which generic text
> to use up to the caller. Maybe we should provide more guidance.
>
> I.e.,
Thanks for the quick response and for the patch.
I started writing such a long process document because I _thought_
that I found a major issue with the Large Edge List. But, in the end,
it was user error. It turned out that I was looking at index '11' when
I should have been looking at index
On 28.06.18 13:21, Marc Strapetz wrote:
> The current description of "core.ignoreCase" reads like an option which
> is intended to be changed by the user while it's actually expected to
> be set by Git on initialization only. Subsequently, Git relies on the
> proper configuration of this variable,
Johannes Schindelin writes:
>> I.e.:
>>
>> FOO='with spaces'
>> BAR=$FOO sh -c 'echo $BAR'
>>
>> works just fine.
>
> $ x="two spaces"
>
> $ echo $x
> two spaces
>
> Maybe we should quote a little bit more religiously.
Both of you are wrong ;-)
Of course, the lack of
On 06/27, Jonathan Tan wrote:
> During negotiation, fetch-pack eventually reports as "have" lines all
> commits reachable from all refs. Allow the user to restrict the commits
> sent in this way by providing a whitelist of tips; only the tips
> themselves and their ancestors will be sent.
>
>
Jameson Miller writes:
> Add initialization and discard functions to mem_pool type. As the
> memory allocated by mem_pool can now be freed, we also track the large
> allocations.
>
> If the there are existing mp_blocks in the mem_poo's linked list of
mem_poo?
> mp_blocksl, then the mp_block
> On Jun 28, 2018, at 4:34 PM, Jeff King wrote:
>
> On Thu, Jun 28, 2018 at 02:44:47AM +, brian m. carlson wrote:
>
>> On Wed, Jun 27, 2018 at 07:54:52AM +, Steve Groeger wrote:
>>> We have common code that is supposed to be usable across different
>>> platforms and hence different
On Thu, Jun 28, 2018 at 09:39:39AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Yeah, this solution seems sensible. Given that we would never report any
> > error for that blob, there is no point in even looking at it. I wonder
> > if we ought to do the same for other types, too. Is
Ramsay Jones writes:
> Junio, do you want me to address the above 'rejected push'
> issue in this patch, or with a follow-up patch? (It should
> be a pretty rare problem - famous last words!)
If you feel the need to say "famous last words", it is an indication
that it is better done as a
This continues the elimination of global variables in the object store and
teaches lookup_commit[_reference] and alike to handle a_repository.
This is also available as
https://github.com/stefanbeller/git/tree/object-store-lookup-commit
or applies on top of 02f70d63027 (Merge branch
Add a repository argument to allow callers of get_cached_commit_buffer to
be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to
Add a repository argument to allow callers of set_commit_buffer to
be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Signed-off-by: Jonathan Nieder
Signed-off-by: Stefan Beller
---
object.c | 15 +++
object.h | 3 +--
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/object.c b/object.c
index f41f82c6725..9d74de95f5b 100644
--- a/object.c
+++ b/object.c
@@ -84,21 +84,20 @@ static
Add a repository argument to allow callers of lookup_commit_reference
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to
Signed-off-by: Stefan Beller
---
object.c | 4 ++--
object.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/object.c b/object.c
index e095d49b379..f41f82c6725 100644
--- a/object.c
+++ b/object.c
@@ -158,13 +158,13 @@ void *create_object(struct repository *r, const
Signed-off-by: Stefan Beller
---
tree.c | 10 +-
tree.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tree.c b/tree.c
index 45e89ff08eb..78d440a9c8f 100644
--- a/tree.c
+++ b/tree.c
@@ -195,13 +195,13 @@ int read_tree(struct tree *tree, int stage, struct
Add a repository argument to allow the callers of deref_tag
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Add a repository argument to allow the callers of parse_tag_buffer
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Add a repository argument to allow the callers of lookup_tree
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Add a repository argument to allow the callers of parse_object
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Add a repository argument to allow the callers of parse_commit_buffer
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to
Signed-off-by: Stefan Beller
---
blob.c | 10 +-
blob.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/blob.c b/blob.c
index 17b9314f0a0..342bdbb1bbe 100644
--- a/blob.c
+++ b/blob.c
@@ -5,13 +5,13 @@
const char *blob_type = "blob";
-struct blob
Signed-off-by: Stefan Beller
---
commit.c | 10 +-
commit.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/commit.c b/commit.c
index aa5557dee84..8749e151451 100644
--- a/commit.c
+++ b/commit.c
@@ -53,13 +53,13 @@ struct commit *lookup_commit_or_die(const
Add a repository argument to allow callers of lookup_object to be more
specific about which repository to handle. This is a small mechanical
change; it doesn't change the implementation to handle repositories
other than the_repository yet.
As with the previous commits, use a macro to catch
Signed-off-by: Stefan Beller
---
commit.c | 10 +-
commit.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/commit.c b/commit.c
index 8749e151451..41d23352098 100644
--- a/commit.c
+++ b/commit.c
@@ -364,7 +364,7 @@ const void *detach_commit_buffer(struct commit
The realloc counter is declared outside the struct for the given slabname,
which makes it harder for a follow up patch to move the declaration of the
struct around as then the counter variable would need special treatment.
As the reallocation counter is currently unused we can just remove it.
If
Signed-off-by: Stefan Beller
---
tag.c | 10 +-
tag.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tag.c b/tag.c
index fbb4659325b..46b5882ee12 100644
--- a/tag.c
+++ b/tag.c
@@ -92,13 +92,13 @@ struct object *deref_tag_noverify(struct object *o)
Signed-off-by: Stefan Beller
---
blob.c | 2 +-
builtin/fsck.c | 2 +-
commit.c | 4 ++--
object.c | 2 +-
object.h | 3 ++-
refs.c | 2 +-
tag.c | 2 +-
tree.c | 2 +-
8 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/blob.c
Add a repository argument to allow the callers of lookup_blob
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Signed-off-by: Stefan Beller
---
object.c | 14 +++---
object.h | 3 +--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/object.c b/object.c
index cd870fee22b..b0faab85d40 100644
--- a/object.c
+++ b/object.c
@@ -245,28 +245,28 @@ struct object *parse_object_or_die(const
Signed-off-by: Stefan Beller
---
commit.c | 4 ++--
commit.h | 5 ++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/commit.c b/commit.c
index 08b4602f43f..b88ced5b026 100644
--- a/commit.c
+++ b/commit.c
@@ -36,9 +36,9 @@ struct commit *lookup_commit_reference_gently(struct
Signed-off-by: Stefan Beller
---
tag.c | 5 ++---
tag.h | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/tag.c b/tag.c
index 682e7793059..94a89b21cb5 100644
--- a/tag.c
+++ b/tag.c
@@ -64,12 +64,11 @@ int gpg_verify_tag(const struct object_id *oid, const char
Signed-off-by: Stefan Beller
---
object.c | 18 +-
object.h | 3 +--
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/object.c b/object.c
index 9d588448192..cd870fee22b 100644
--- a/object.c
+++ b/object.c
@@ -185,21 +185,21 @@ struct object
Signed-off-by: Stefan Beller
---
commit.c | 4 ++--
commit.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/commit.c b/commit.c
index 1baac77861f..dd8c9c15b14 100644
--- a/commit.c
+++ b/commit.c
@@ -275,10 +275,10 @@ void free_commit_buffer_slab(struct buffer_slab *bs)
Signed-off-by: Stefan Beller
---
commit.c | 8
commit.h | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/commit.c b/commit.c
index 15b044331a1..08b4602f43f 100644
--- a/commit.c
+++ b/commit.c
@@ -24,16 +24,16 @@ int save_commit_buffer = 1;
const char
Signed-off-by: Stefan Beller
---
tag.c | 10 +-
tag.h | 3 +--
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/tag.c b/tag.c
index 46b5882ee12..682e7793059 100644
--- a/tag.c
+++ b/tag.c
@@ -126,7 +126,7 @@ void release_tag_memory(struct tag *t)
t->date = 0;
}
Add a repository argument to allow the callers of parse_object_buffer
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to
Signed-off-by: Stefan Beller
---
commit.c | 29 +++--
commit.h | 4
object.c | 5 +
object.h | 4
4 files changed, 36 insertions(+), 6 deletions(-)
diff --git a/commit.c b/commit.c
index 41d23352098..1baac77861f 100644
--- a/commit.c
+++ b/commit.c
@@
Over the years of contributing to open source, I realized the world of
open source is smaller than I originally thought and a name is still
a pretty unique thing. So let's assume these two author idents are the
same person.
In 10813e0d3c7 (.mailmap: update long-lost friends with multiple defunct
This is a continuation of 94b410bba86 (.mailmap: Map email
addresses to names, 2013-07-12), merging names that are
spelled differently but have the same author email to the
same person.
Most spellings differed in accents or the order of names.
Signed-off-by: Stefan Beller
---
.mailmap | 11
There are multiple author idents who have different email addresses, but
the same name; assume they are the same person, as the world of open source
is actually rather small.
Sift through the history via:
git shortlog -sne origin/pu |awk '{ NF--; $1=""; print }' |sort |uniq -d
|cut -c 2-
This makes the follow up patch easier.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index ce7bedc1b92..d1bae900cdc 100644
--- a/diff.c
+++ b/diff.c
@@ -707,11 +707,15
There is no need to forward-declare these functions, as they are used
after their implementation only.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
xdiff/xdiffi.c | 17 -
1 file changed, 17 deletions(-)
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index
v4:
* see range diff below
* brought best practices to t4015 and have git not upstream of a pipe
(new patch 3)
* squashed in the SQUASH patches
* fixed the translation as well.
v3:
This is a complete rewrite of the actual patch, with slight modifications]
on the refactoring how to
In the original implementation of the move detection logic the choice for
ignoring white space changes is the same for the move detection as it is
for the regular diff. Some cases came up where different treatment would
have been nice.
Allow the user to specify that white space should be ignored
When we initialize the hashmap, we give it a pointer to the
diff_options, which it then passes along to each call of the
hashmap_cmp_fn function. There's no need to pass it a second time as
the "keydata" parameter, and our comparison functions never look at
keydata.
This was a mistake left over
In t4015 we have a pattern of
git diff [] |
grep -v "index" |
test_decode_color >actual &&
to produce output that we want to test against. This pattern was introduced
in 86b452e2769 (diff.c: add dimming to moved line detection, 2017-06-30)
as then the focus on getting the
The new "blocks" mode provides a middle ground between plain and zebra.
It is as intuitive (few colors) as plain, but still has the requirement
for a minimum of lines/characters to count a block as moved.
Suggested-by: Ævar Arnfjörð Bjarmason
Add a repository argument to allow the callers of lookup_tag
to be more specific about which repository to act on. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch
Add a repository argument to allow callers of
lookup_commit_reference_gently to be more specific about which
repository to handle. This is a small mechanical change; it doesn't
change the implementation to handle repositories other than
the_repository yet.
As with the previous commits, use a
Add a repository argument to allow callers of lookup_commit to be more
specific about which repository to handle. This is a small mechanical
change; it doesn't change the implementation to handle repositories
other than the_repository yet.
As with the previous commits, use a macro to catch
Signed-off-by: Stefan Beller
---
commit.c | 4 ++--
commit.h | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/commit.c b/commit.c
index dd8c9c15b14..15b044331a1 100644
--- a/commit.c
+++ b/commit.c
@@ -283,10 +283,10 @@ void set_commit_buffer(struct repository *r, struct
Add an API around managing the lifetime of cache_entry
structs. Abstracting memory management details behind this API will
allow for alternative memory management strategies without affecting
all the call sites. This commit does not change how memory is
allocated or freed. A later commit in this
When reading large indexes from disk, a portion of the time is
dominated in malloc() calls. This can be mitigated by allocating a
large block of memory and manage it ourselves via memory pools.
This change moves the cache entry allocation to be on top of memory
pools.
Design:
The index_state
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 |
Changes from v4 are minor code review feedback items:
- Remove extern keyword from new function definitions in cache.h
- Make_cache_entry(..) functions work with object_id instead of sha
- Add details to commit message for "block alloc: allocate cache entries from
mem_pool"
- Add details
Add initialization and discard functions to mem_pool type. As the
memory allocated by mem_pool can now be freed, we also track the large
allocations.
If the there are existing mp_blocks in the mem_poo's linked list of
mp_blocksl, then the mp_block for a large allocation is inserted
behind the
Instead of searching all memory blocks for available space to fulfill
a memory request, only search the head block. If the head block does
not have space, assume that previous block would most likely not be
able to fulfill request either. This could potentially lead to more
memory fragmentation,
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
On Wed, Jun 27, 2018 at 12:44:43PM -0400, Todd Zullinger wrote:
> I wrote:
> > Jeff King wrote:
> >> (Related, there's a build target in the local Makefile for using
> >> asciidoctor; does it need updated, too?)
> >
> > I didn't test asciidoctor specficially, but it also respects
> >
Team,
[Cc:ing Tim]
On Thu, 28 Jun 2018, Johannes Schindelin via GitGitGadget wrote:
> In ed32b788c06 (version --build-options: report commit, too, if
> possible, 2017-12-15), we introduced code to let `git version
> --build-options` report the current commit from which the binaries were
>
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 ++
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
On Tue, Jun 26, 2018 at 05:13:05PM -0400, Eric Sunshine wrote:
> On Tue, Jun 26, 2018 at 5:01 PM Jeff King wrote:
> > On Tue, Jun 26, 2018 at 04:46:18PM -0400, Eric Sunshine wrote:
> > > Some of these dangers can be de-thoothed during the linting phase by
> > > defining do-nothing shell
Jameson Miller writes:
> Add an API around managing the lifetime of cache_entry
> structs. Abstracting memory management details behind this API will
> allow for alternative memory management strategies without affecting
> all the call sites. This commit does not change how memory is
>
On Thu, Jun 28, 2018 at 12:48 AM Pratik Karki wrote:
>
> This commit imitates the strategy that was used to convert the
> difftool to a builtin, see be8a90e (difftool: add a skeleton for the
> upcoming builtin, 2017-01-17) for details: This commit renames the
> shell script `git-rebase.sh` to
On 28/06/18 18:45, Jeff King wrote:
> On Thu, Jun 28, 2018 at 05:56:18PM +0100, Ramsay Jones wrote:
[snip]
>>> One thing we could do is turn the parse failure into a noop. The main
>>> point of the check is to protect people against the malicious
>>> .gitmodules bug. If the file can't be
Jameson Miller writes:
> +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
> +
On Thu, Jun 28, 2018 at 12:48 AM Pratik Karki wrote:
>
> The function present in `git-legacy-rebase.sh` are used by backends
> so, this refactor tries to extract the functions out so that, the
it not only tries to, it actually does. :)
> `git-legacy-rebase.sh` can be retired easily as the
>
On Thu, Jun 28, 2018 at 05:56:18PM +0100, Ramsay Jones wrote:
> > Yeah, this solution seems sensible. Given that we would never report any
> > error for that blob, there is no point in even looking at it. I wonder
> > if we ought to do the same for other types, too. Is there any point in
> >
On Thu, Jun 28, 2018 at 10:27:32AM -0700, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> I.e.:
> >>
> >> FOO='with spaces'
> >> BAR=$FOO sh -c 'echo $BAR'
> >>
> >> works just fine.
> >
> > $ x="two spaces"
> >
> > $ echo $x
> > two spaces
> >
> > Maybe we should
On Thu, Jun 28, 2018 at 06:23:56PM +0200, Johannes Schindelin wrote:
> On Thu, 28 Jun 2018, Jeff King wrote:
>
> > On Wed, Jun 27, 2018 at 09:35:23PM +0200, Johannes Schindelin via
> > GitGitGadget wrote:
> >
> > > To prevent erroneous commits from being reported (e.g. when unpacking
> > >
Alban Gruin writes:
> This patch rewrites append_todo_help() from shell to C. The C version
> covers a bit more than the old shell version. To achieve that, some
> parameters were added to rebase--helper.
>
> This also introduce a new source file, rebase-interactive.c.
>
> This is part of the
On Thu, Jun 28, 2018 at 12:36:06PM -0400, Todd Zullinger wrote:
> >> It might be enough if the default values are relatively sane
> >> and consistent. That would be a slight improvement over the
> >> current situation still.
> >
> > Yeah. Taking a step back from the implementation questions, I
On Tue, Jun 26, 2018 at 12:51:45PM -0400, Robert P. J. Day wrote:
> > I agree it's weird. I think it's trying to mean "behaves as if it
> > was set to", but with the additional notion that the command-line
> > argument would take precedence over the environment (which is our
> > usual rule). But
On Mon, Jun 25, 2018 at 04:26:00PM -0500, Taylor Blau wrote:
> For instance, a line containing the following (taken from README.md:27):
>
> (`man gitcvs-migration` or `git help cvs-migration` if git is
>
> Is printed as follows:
>
> $ git grep -no -e git -- README.md | grep ":27"
>
Hi Pratik,
On Thu, Jun 28, 2018 at 12:48 AM Pratik Karki wrote:
>
> The motivation behind this commit is to extract the core part of
> do_reset() from sequencer.c and move it to a new detach_head_to()
> function in checkout.c.
>
[...]
>
> The new function will be used in the next commit by the
We can currently die() or error(), but there's not yet any
way for callers to ask us just to quietly return an error.
Let's give them one.
Signed-off-by: Jeff King
---
config.c | 3 +++
config.h | 1 +
2 files changed, 4 insertions(+)
diff --git a/config.c b/config.c
index
The config code has a die_on_error flag, which lets us emit
an error() instead of dying when we see a bogus config file.
But there's no way for a caller of the config code to set
this: it's auto-set based on whether we're reading a file or
a blob.
Instead, let's add it to the config_options
The underlying config parser knows how to handle a
config_options struct, but git_config_from_mem() always
passes NULL. Let's allow our callers to specify the options
struct.
We could add a "_with_options" variant, but since there are
only a handful of callers, let's just update them to pass
If there's a parsing error we'll already report it via the
usual fsck report() function (or not, if the user has asked
to skip this object or warning type). The error message from
the config parser just adds confusion. Let's suppress it.
Note that we didn't test this case at all, so I've added
On 06/28, Jonathan Tan wrote:
> During negotiation, fetch-pack eventually reports as "have" lines all
> commits reachable from all refs. Allow the user to restrict the commits
> sent in this way by providing a whitelist of tips; only the tips
> themselves and their ancestors will be sent.
>
>
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 still holding onto them.
The tip of 'next' has been
On Thu, Jun 28, 2018 at 12:48 AM Pratik Karki wrote:
>
> This patch gives life to the skeleton added in the previous patch.
> This patch makes real operation happen i.e. by using
> `git -c rebase.usebuiltin=true rebase `.
> With this patch, the basic operation of rebase can be done.
Would it
On Thu, Jun 28, 2018 at 07:53:27PM +0100, Ramsay Jones wrote:
> > Yes, though I don't think it's too bad. We already have a "die_on_error"
> > flag in the config code. I think it just needs to become a tristate:
> > die/error/silent (and probably get passed in via config_options, since I
> >
1 - 100 of 141 matches
Mail list logo