From: Stefan Beller
In the coming patches we want to eliminate writes that do not go
though emit_line_* as we later want to hook into the emit_line_*
functions to add a buffered output. To make the conversion easy,
add a function that takes a format string.
Signed-off-by: Stefan Beller
---
dif
From: Stefan Beller
At all call sites of emit_{add, del, context}_line we increment the line
count, so move it into the respective functions to make the code at the
calling site a bit clearer.
Signed-off-by: Stefan Beller
---
diff.c | 15 ++-
1 file changed, 6 insertions(+), 9 dele
From: Stefan Beller
---
diff.c | 5 ++---
diff.h | 3 +++
submodule.c | 42 +-
submodule.h | 3 +--
4 files changed, 23 insertions(+), 30 deletions(-)
diff --git a/diff.c b/diff.c
index 255fbf3..c00306b 100644
--- a/diff.c
+++ b/diff.c
@@ -49
From: Stefan Beller
---
diff.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/diff.c b/diff.c
index 98d6655..255fbf3 100644
--- a/diff.c
+++ b/diff.c
@@ -690,7 +690,7 @@ static void emit_rewrite_lines(struct emit_callback *ecb,
if (!endp) {
const char
From: Stefan Beller
---
diff.c | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/diff.c b/diff.c
index 85fb887..87b1bb2 100644
--- a/diff.c
+++ b/diff.c
@@ -4608,6 +4608,17 @@ void diff_warn_rename_limit(const char *varname, int
needed, int degraded_cc)
From: Stefan Beller
Signed-off-by: Stefan Beller
---
diff.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index 9d2e704..85fb887 100644
--- a/diff.c
+++ b/diff.c
@@ -4176,7 +4176,7 @@ int diff_unmodified_pair(struct diff_filepair *p)
return
From: Stefan Beller
---
diff.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 87b1bb2..2aefd0f 100644
--- a/diff.c
+++ b/diff.c
@@ -473,11 +473,13 @@ static void emit_line_0(struct diff_options *o, const
char *set, const char *res
}
From: Stefan Beller
Signed-off-by: Stefan Beller
---
diff.c | 33 ++---
1 file changed, 18 insertions(+), 15 deletions(-)
diff --git a/diff.c b/diff.c
index 7dcef73..98d6655 100644
--- a/diff.c
+++ b/diff.c
@@ -653,17 +653,17 @@ static void remove_tempfile(void)
From: Stefan Beller
Signed-off-by: Stefan Beller
---
diff.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index cc8e812..aa50b2d 100644
--- a/diff.c
+++ b/diff.c
@@ -610,6 +610,9 @@ static void emit_hunk_header(struct emit_callback *ecbdata,
}
From: Stefan Beller
When `first` equals '\r', then it cannot equal '\n', which makes
`!has_trailing_newline` always true if `first` is '\r'.
Drop that check.
Signed-off-by: Stefan Beller
---
diff.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index 156c
From: Stefan Beller
This applies on top of sb/diff-cleanup.
The long term strategy is to get the rename detection done, is to run
any output through emit_line as there we can either write it to the
output file or buffer it internally across file pairs and work on the
buffered output.
As I got s
Отправлено с iPhone
[]
One general question up here, more comments inline.
The current order for a clean-filter is like this, I removed the error handling:
int convert_to_git()
{
ret |= apply_filter(path, src, len, -1, dst, filter);
if (ret && dst) {
src = dst->buf;
le
On 9/10/16, Jakub Narębski wrote:
> You would need post-checkout hook together with clean / smudge filters
> (though you could get by without smudge filter, at least in theory...).
> The `post-checkout` hook could run e.g. "git checkout -- '*.conf'"
> to force use of smudge filter, after checking
Otherwise for people who use autotools-based configure in main worktree,
the performance testing results will be inconsistent as work and build
trees could be using e.g. different optimization levels.
See e.g.
http://public-inbox.org/git/20160818175222.bmm3ivjheokf2...@sigill.intra.peff.
Starting from 6b8fda2d (pack-objects: use bitmaps when packing objects)
if a repository has bitmap index, pack-objects can nicely speedup
"Counting objects" graph traversal phase. That however was done only for
case when resultant pack is sent to stdout, not written into a file.
The reason here is
Since 6b8fda2d (pack-objects: use bitmaps when packing objects) there
are two codepaths in pack-objects: with & without using bitmap
reachability index.
However add_object_entry_from_bitmap(), despite its non-bitmapped
counterpart add_object_entry(), in no way does check for whether --local
or --h
On Thu, Aug 18, 2016 at 02:06:15PM -0400, Jeff King wrote:
> On Tue, Aug 09, 2016 at 10:32:17PM +0300, Kirill Smelkov wrote:
>
> > Subject: Re: [PATCH 2/2 v7] pack-objects: use reachability bitmap index when
> >generating non-stdout pack
>
> This is v7, but as I understand your numbering, it
On Thu, Aug 18, 2016 at 01:52:22PM -0400, Jeff King wrote:
> On Tue, Aug 09, 2016 at 10:31:43PM +0300, Kirill Smelkov wrote:
>
> > Since 6b8fda2d (pack-objects: use bitmaps when packing objects) there
> > are two codepaths in pack-objects: with & without using bitmap
> > reachability index.
>
> S
W dniu 10.09.2016 o 01:07, john smith pisze:
> On 9/10/16, Junio C Hamano wrote:
>> The clean and smudge operations should look _only_ at the contents
>> they are filtering, and nothing else, and the clean/smudge filtering
>> mechanism is designed to support that use case. It is not designed
>> t
W dniu 09.09.2016 o 22:52, Christian Neukirchen napisał:
> Jakub Narębski writes:
>
>> Which means that with "git add -p && git commit ",
>> the "git add -p " would carefully craft the state
>> in the index... and "git commit " would take worktree version
>> of for commit, ignoring what was in
On mercredi 7 septembre 2016 14:49:08 CEST Vasco Almeida wrote:
> Mark error messages for translation passed to die() function.
> Change "Cannot" to lowercase following the usual style.
>
> Reflect changes to test by using test_i18ngrep.
>
> Signed-off-by: Vasco Almeida
> ---
> builtin/blame.c
--
Shougang Group
45 Huagong Road Xinji City,
Hebei Province China.
webpage: www.shougang.com.cn
This is an official request for Professional/consultants who will stand as
our regional representative to run logistics on behalf of Shougang Group.
We are only looking for individual or company fr
Hi Stefan,
On Fri, 9 Sep 2016, Stefan Beller wrote:
> On Fri, Sep 9, 2016 at 9:19 AM, Sergio Martín Turiel
> wrote:
>
> > Can you tell me what I'm doing wrong?
>
> Not crying out loud when that commit was discussed on the
> mailing list. ;)
Umm, I think it would be more: "Not stepping up to m
Hi Junio,
On Fri, 9 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > +test_expect_success 'path= complains without
> > --textconv/--filters' '
>
> I wonder where this "path" came from; it wasn't in v2 I queued,
> but somehow came back mysteriously.
No idea how it c
Hi Junio,
On Fri, 9 Sep 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > So I would not mind if we define the semantics of "--filters" as
> > such (as long as it is clearly documented, of course). AFAICS, the
> > batch interface does not call filter_object() for non-blobs, and by
> >
Hi Junio,
On Fri, 9 Sep 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign`
> > config setting. This broke committing in Git GUI.
>
> Thanks. Will shift it up to apply to my copy of git-gui project and
> then pul
27 matches
Mail list logo
