On Mon, Aug 20, 2018 at 11:24 AM Derrick Stolee wrote:
>
> One unresolved issue with the commit-graph feature is that it can cause
> issues when combined with replace objects, commit grafts, or shallow
> clones. These are not 100% incompatible, as one could be reasonably
> successful writing a
On Mon, Aug 20, 2018 at 11:24 AM Derrick Stolee wrote:
> Because of the change of base, it is hard to provide a side-by-side diff
> from v1.
I thought that was the whole point of range-diff. ;-)
I'll take a look.
Thanks,
Stefan
On Mon, Aug 20, 2018 at 6:18 AM Matthew DeVore wrote:
>
> There were many instances in this file where it seemed like BUG would be
> better, so I created a new commit before this one to switch them over. The
> interdiff is below.
>
> BTW, why are there so many instances of "die" without "_"? I
On Fri, Aug 17, 2018 at 3:44 PM Junio C Hamano wrote:
>
> Usually, I refrain from merging larger topics in 'next' down to
> 'master' when we get close to -rc0, but I am wondering if it is
> better to merge all of them to 'master', even the ones on the larger
> and possibly undercooked side,
On Fri, Aug 17, 2018 at 2:06 PM Jeff King wrote:
>
> When we serve a fetch, we pass the "wants" and "haves" from
> the fetch negotiation to pack-objects. That tells us not
> only which objects we need to send, but we also use the
> boundary commits as "preferred bases": their trees and blobs
>
> diff --git a/pack-bitmap.h b/pack-bitmap.h
> index 4555907dee..02a60ce670 100644
> --- a/pack-bitmap.h
> +++ b/pack-bitmap.h
> @@ -50,6 +50,13 @@ int rebuild_existing_bitmaps(struct bitmap_index *, struct
> packing_data *mapping
> khash_sha1 *reused_bitmaps, int
On Fri, Aug 17, 2018 at 3:20 PM Matthew DeVore wrote:
>
> On Fri, Aug 17, 2018 at 2:42 PM Stefan Beller wrote:
> >
> > On Wed, Aug 15, 2018 at 4:23 PM Matthew DeVore wrote:
> > >
> > > Teach list-objects the "tree:0" filter which allows for filteri
On Fri, Aug 17, 2018 at 3:04 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > This improves colors of the range-diff, see last patch for details.
>
> How does this relate to your other "color with range-diff" topic
> that is still in fl
On Wed, Aug 15, 2018 at 4:23 PM Matthew DeVore wrote:
>
> Teach list-objects the "tree:0" filter which allows for filtering
> out all tree and blob objects (unless other objects are explicitly
> specified by the user). The purpose of this patch is to allow smaller
> partial clones.
>
> The name
This improves colors of the range-diff, see last patch for details.
it is also available via
git fetch https://github.com/stefanbeller/git sb/range-diff-better-colors
Thanks,
Stefan
Stefan Beller (3):
diff.c: add --output-indicator-{new, old, context}
range-diff: make use of different
/git
Signed-off-by: Stefan Beller
---
range-diff.c | 2 ++
t/t3206-range-diff.sh | 12 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/range-diff.c b/range-diff.c
index a906d25f139..3e9b9844012 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -90,6 +90,7
moved lines with lines other than +/-.
Signed-off-by: Stefan Beller
---
diff.c | 21 ++---
diff.h | 5 +
2 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/diff.c b/diff.c
index c5c7739ce34..03486c35b75 100644
--- a/diff.c
+++ b/diff.c
@@ -1281,7 +1281,9 @@ static
This change itself only changes the internal communication and should
have no visible effect to the user. We instruct the diff code that
produces the inner diffs to use other markers instead of the
usual markers for new, old and context lines.
Signed-off-by: Stefan Beller
---
range-diff.c | 20
On Thu, Aug 16, 2018 at 8:12 AM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > Originally we have had the url in the config, (a) that we can change
> > the URLs after the "git submodule init" and "git submodule update"
> > step th
On Thu, Aug 16, 2018 at 4:55 AM Shani Fridman
wrote:
>
>
> Hi everybody,
>
> I've got a question regarding submodules -
>
> I'm working on a git project with submodules connected to it, and pulling
> changes from them every month (more or less).
> Sometimes I need to checkout older versions of
On Thu, Aug 16, 2018 at 6:15 AM Derrick Stolee wrote:
>
> On 8/15/2018 7:01 PM, Junio C Hamano wrote:
> > * ds/commit-graph-with-grafts (2018-07-19) 8 commits
> >(merged to 'next' on 2018-08-02 at 0ee624e329)
> > + commit-graph: close_commit_graph before shallow walk
> > + commit-graph:
> [...]
all good reasons; ship it :-)
> All at the cost of recording a little configuration somewhere. If we
> want to decrease the configuration, we can avoid recording it there in
> the easy cases (e.g. when name == gitdirname). That's "just" an
> optimization.
Sounds good, but gerrit for
>
> * sb/config-write-fix (2018-08-08) 3 commits
> - git-config: document accidental multi-line setting in deprecated syntax
> - config: fix case sensitive subsection names on writing
> - t1300: document current behavior of setting options
>
> Recent update to "git config" broke updating
for a future change to make
use of the data the update_clone_data struct.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 31 +++
1 file changed, 19 insertions(+), 12 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index
do not need (b) any more.
So the URL turns into a useless piece of cruft that just is unneeded
and might confuse the user.
Opinions?
Thanks,
Stefan
Stefan Beller (7):
t7410: update to new style
builtin/submodule--helper: remove stray new line
submodule: is_submodule_active to differentiat
We do not need to update the submodule url in the superprojects config
if the url is not used to keep the submodule active.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/builtin/submodule--helper.c
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 5c9d1fb496d..2f20bd4abdc 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -1024,7 +1024,6
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 24 ++--
t/t5526-fetch-submodules.sh | 2 +-
t/t7406-submodule-update.sh | 8
t/t7410-submodule-checkout-to.sh | 2 +-
4 files changed, 32 insertions(+), 4 deletions(-)
diff --git
While at it fix a typo (s/independed/independent) and
make sure git is not in a chain of pipes.
Signed-off-by: Stefan Beller
---
t/t7410-submodule-checkout-to.sh | 99 +++-
1 file changed, 58 insertions(+), 41 deletions(-)
diff --git a/t/t7410-submodule-checkout
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 639d0bb20a1..1c9a12781fd 100644
--- a/builtin/submodule--helper.c
+++ b/builtin
.active setting or via
the old .url setting.
Signed-off-by: Stefan Beller
---
submodule.c | 5 +
submodule.h | 6 ++
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/submodule.c b/submodule.c
index 6e14547e9e0..d56350ed094 100644
--- a/submodule.c
+++ b/submodule.c
@@ -221,9
On Tue, Aug 14, 2018 at 11:27 PM "Jochen Kühner" wrote:
>
>
>
>
> We use git for windows, there I cannot fin the git-submodule.sh! How can I
> fix it there?
>
>
It probably doesn't have the .sh extension. I don't know where all git
executables are located in GfW.
Maybe "dir /s git.exe" can
On Wed, Aug 15, 2018 at 1:35 PM Linus Torvalds
wrote:
>
> Sadly, as of less-530, the behavior of "less -F" is broken enough that
> I think git needs to potentially think about changing the defaults for
> the pager, or people should at least be aware of it.
>
> Older versions of less (at least up
On Mon, Aug 13, 2018 at 2:24 PM Junio C Hamano wrote:
>
> Brandon Williams writes:
>
> > On 08/13, Nguyễn Thái Ngọc Duy wrote:
> >> This is the third part of killing the_index (at least outside
> >> builtin/). Part 1 [1] is dropped. Part 2 is nd/no-extern on 'pu'. This
> >> part is built on top
On Wed, Aug 15, 2018 at 12:21 PM Duy Nguyen wrote:
>
> On Wed, Aug 15, 2018 at 9:10 PM Stefan Beller wrote:
> >
> > On Mon, Aug 13, 2018 at 9:15 AM Nguyễn Thái Ngọc Duy
> > wrote:
> > >
> > > Signed-off-by: Nguyễn Thái Ngọc Duy
> >
> >
On Mon, Aug 13, 2018 at 9:15 AM Nguyễn Thái Ngọc Duy wrote:
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
This removes the only existing extern keyword, which was added by
Linus in 933bf40a5c6 (Start moving unpack-trees to "struct tree_desc",
2007-08-09). All other callers do not have this noise
On Mon, Aug 13, 2018 at 9:15 AM Nguyễn Thái Ngọc Duy wrote:
>
> write_eolinfo() does take an istate as function argument and it should
> be used instead of the_index.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> builtin/ls-files.c | 17 +
> 1 file changed, 9 insertions(+), 8
On Wed, Aug 15, 2018 at 10:18 AM Duy Nguyen wrote:
>
> On Wed, Aug 15, 2018 at 7:09 PM Stefan Beller wrote:
> > Technically you would not need patch 1 in this series, as you could call
> > remove_branch_state(void) as before that patch to do the same thing here.
> > I gu
On Wed, Aug 15, 2018 at 9:23 AM Nguyễn Thái Ngọc Duy wrote:
>
> --quit is supposed to be --abort but without restoring HEAD. Leaving
> CHERRY_PICK_HEAD behind could make other commands mistake that
> cherry-pick is still ongoing (e.g. "git commit --amend" will refuse to
> work). Clean it too.
>
>
On Wed, Aug 15, 2018 at 9:53 AM Duy Nguyen wrote:
>
> On Wed, Aug 15, 2018 at 6:48 PM Elijah Newren wrote:
> >
> > On Wed, Aug 15, 2018 at 9:24 AM Nguyễn Thái Ngọc Duy
> > wrote:
> >
> > The patch looks good, but since this touches multiple .c files, I
> > think I'd s/branch.c/branch/ in the
On Tue, Aug 14, 2018 at 4:20 PM Junio C Hamano wrote:
>
> Junio C Hamano writes:
>
> > My understanding of what Joakim wants to do is to have a top-level
> > project that has three subdirectories, e.g. kernel/v2.2, kernel/v2.4
> > and kernel/v2.6, each of which is a submodule that houses these
>
On Tue, Aug 14, 2018 at 4:04 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > Signed-off-by: Stefan Beller
> > ---
> > path.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > On Tue, Aug 14, 2018 at 3:27 PM Joakim Tjernlund
> >
On Tue, Aug 14, 2018 at 4:12 PM Jonathan Nieder wrote:
>
> Hi,
>
> Stefan Beller wrote:
> > On Tue, Aug 14, 2018 at 3:28 PM Jonathan Nieder wrote:
>
> >> repack in GC has been updated to not touch promisor
> >> packfiles at all, and to only repack ot
On Tue, Aug 14, 2018 at 3:28 PM Jonathan Nieder wrote:
>
> Rendered documentation can be easier to read than raw text because
> headings and emphasized phrases stand out. Add the missing markup and
> Makefile rule required to render this design document using asciidoc.
>
> Tested by running
>
>
Signed-off-by: Stefan Beller
---
path.c | 1 +
1 file changed, 1 insertion(+)
On Tue, Aug 14, 2018 at 3:27 PM Joakim Tjernlund
wrote:
>
> I am trying to create 3 submodules from the same git repo, each pointing to a
> different branch.
> Since the repo is somewhat large, I don'
On Tue, Aug 14, 2018 at 2:12 PM Jonathan Nieder wrote:
>
> Hi,
>
> Stefan Beller wrote:
> > On Tue, Aug 14, 2018 at 11:57 AM Jonathan Nieder wrote:
>
> >> Second, what if we store the pathname in config? We already store the
> >> URL there:
>
On Tue, Aug 14, 2018 at 2:16 PM Ævar Arnfjörð Bjarmason
wrote:
>
>
> On Tue, Aug 14 2018, Stefan Beller wrote:
>
> > On Tue, Aug 14, 2018 at 2:05 PM Ævar Arnfjörð Bjarmason
> > wrote:
> >
> >> > So ideally we'd also error out as soon as the host name is
gist
On Tue, Aug 14, 2018 at 2:01 PM Junio C Hamano wrote:
>
> Stefan Beller writes:
>
> > Thanks Brandon for pointing out to use repo_git_path instead of
> > manually constructing the path.
> >
> > That is the only change in this resend.
>
> Rcpt. Hop
On Tue, Aug 14, 2018 at 2:05 PM Ævar Arnfjörð Bjarmason
wrote:
> > So ideally we'd also error out as soon as the host name is touched?
>
> Do we have some utility function that'll take whatever we have in
> remote..url and spew out the username / host / path? We must,
> since the clone protocol
On Tue, Aug 14, 2018 at 11:57 AM Jonathan Nieder wrote:
>
> Hi,
>
> Brandon Williams wrote:
> > On 08/09, Jeff King wrote:
>
> >> One interesting thing about url-encoding is that it's not one-to-one.
> >> This case could also be %2F, which is a different file (on a
> >> case-sensitive
On Tue, Aug 14, 2018 at 1:09 PM Christian Couder
wrote:
>
> Hi,
>
> When cloning with --mirror, the clone gets its HEAD initialized with
> the value HEAD has in its origin remote. After that if HEAD changes in
> origin there is no simple way to sync HEAD at the same time as the
> refs are synced.
On Tue, Aug 14, 2018 at 12:36 PM Jeff King wrote:
> Thanks, it was nice to see a more comprehensive list in one spot.
>
> It would be neat to have a tool that presents all of these
> automatically, but I think the email ones are pretty tricky (most people
> don't have the whole list archive
On Tue, Aug 14, 2018 at 11:59 AM Ævar Arnfjörð Bjarmason
wrote:
>
> The tests added in 63e95beb08 ("submodule: port resolve_relative_url
> from shell to C", 2016-04-15) didn't do a good job of testing various
> up-path invocations where the up-path would bring us beyond even the
> URL in question
On Tue, Aug 14, 2018 at 11:54 AM Johannes Schindelin
wrote:
>
> Hi Stefan,
>
> On Mon, 13 Aug 2018, Stefan Beller wrote:
>
> > > > The later lines that indicate a change to the Makefile will be treated
> > > > as
> > > > context both in t
On Tue, Aug 14, 2018 at 11:32 AM Duy Nguyen wrote:
>
> On Tue, Aug 14, 2018 at 8:19 PM Jeff Hostetler wrote:
> > I'm looking at adding code to my SLOG (better name suggestions welcome)
> > patch series to eventually replace the existing git_trace facility.
>
> Complement maybe. Replace, please
On Tue, Aug 14, 2018 at 11:15 AM Ævar Arnfjörð Bjarmason
wrote:
>
> Add a --send-delay option with a corresponding sendemail.smtpSendDelay
> configuration variable. When set to e.g. 2, this causes send-email to
> sleep 2 seconds before sending the next E-Mail. We'll only sleep
> between sends,
.
(2) seems like it could work reasonably well without more regressions
(3) seems easiest to implement as well as actually is a feature with the
last-one-wins rule of passing flags to Git commands.
Signed-off-by: Stefan Beller
---
On Tue, Aug 14, 2018 at 10:54 AM Jochen Kühner wrote
On Tue, Aug 14, 2018 at 7:47 AM Jeff King wrote:
>
> One problem there is that the prefixes are ambiguous (e.g., Jacob Keller
> shares with me, and I think at least one other over the years). You
> could look at the author of the tip commit, but that's not always right
> (and in fact, counting
On Tue, Aug 14, 2018 at 8:05 AM Johannes Schindelin
wrote:
>
> Hi Stefan,
>
> On Mon, 13 Aug 2018, Stefan Beller wrote:
>
> > This applies on top of js/range-diff (a7be92acd9600), this version
> > * resolves a semantic conflict in the test
> > (Did rang
The 'expect'ed outcome has been taken by running the 'range-diff | decode'.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/t3206-range-diff.sh | 39 +++
1 file changed, 39 insertions(+)
diff --git a/t/t3206-range-diff.sh b/t/t3206-range
The order shall be all colors first, then the content, flags at the end.
The colors are in the order of occurrence, i.e. first the color for the
sign and then the color for the rest of the line.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 12 ++--
1 file
Due to the previous condition we know "set_sign != NULL" at that point.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index ae131495216..f6df18af913 100644
--- a/diff.c
++
of emit_line_0 per line, the checks are dead code.
Signed-off-by: Stefan Beller
---
diff.c | 5 +
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index 4f430f44e64..7a23adf254d 100644
--- a/diff.c
+++ b/diff.c
@@ -629,10 +629,7 @@ static void emit_line_0(struct
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/test-lib-functions.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 2b2181dca09..be8244c47b5 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
or 0 as the 'first'
character of the line.
Signed-off-by: Stefan Beller
---
diff.c | 73 --
1 file changed, 40 insertions(+), 33 deletions(-)
diff --git a/diff.c b/diff.c
index 7a23adf254d..c5c7739ce34 100644
--- a/diff.c
+++ b/diff.c
All lines that use emit_line_0 multiple times per line, are combined
into a single call to emit_line_0, making use of the 'set' argument.
We gain a little efficiency here, as we can omit emission of color and
accompanying reset if 'len == 0'.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C
parameter to no longer refer
to the color of the diff marker, but instead to refer to the color
of the rest of the line. A value of `NULL` indicates that the rest
of the line wants to be colored the same as the diff marker.
Helped-by: Johannes Schindelin
Signed-off-by: Stefan Beller
Signed-off-by: Juni
erdiff seems more useful than the range-diff here,
both attached below.
Thanks,
Stefan
Stefan Beller (8):
test_decode_color: understand FAINT and ITALIC
t3206: add color test for range-diff --dual-color
diff.c: simplify caller of emit_line_0
diff.c: reorder arguments for emit_line_ws_
On Mon, Aug 13, 2018 at 5:15 AM Johannes Schindelin
wrote:
>
> Hi Stefan,
>
> On Fri, 10 Aug 2018, Stefan Beller wrote:
>
> > For now just change the signature, we'll reason about the actual
> > change in a follow up patch.
> >
> > Pass 'set_sign' (which is
On Fri, Aug 10, 2018 at 3:34 PM Stefan Beller wrote:
>
> This is also avaliable as
> git fetch https://github.com/stefanbeller/git sb/range-diff-colors
>
> and is a resend of sb/range-diff-colors.
I thought about this series a bit, and I think we would want to break
it up into 2:
in
a follow up patch, as we do not need the 'name' in shell now.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 64 +++--
git-submodule.sh| 7 ++--
2 files changed, 42 insertions(+), 29 deletions(-)
diff --git
determine_submodule_update_strategy accessible
for arbitrary repositories.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 61 +
git-submodule.sh| 16 +-
2 files changed, 62 insertions(+), 15 deletions
In a later patch we'll find this method handy.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index
to migrate the rest of the submodule update
into C, we're better off having access to the raw information in a helper
struct.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 37 +++--
1 file changed, 27 insertions(+), 10
.
A later patch in this series also touches the communication between
the submodule helper and git-submodule.sh, but let's have this as
a preparatory patch, as it eases the next patch, which stores the
raw data instead of the line printed for this communication.
Signed-off-by: Stefan Beller
Signed
Separate the command line parsing from the actual execution of the command
within the repository. For now there is not a lot of execution as
most of it is still in git-submodule.sh.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
builtin/submodule--helper.c | 59
Thanks Brandon for pointing out to use repo_git_path instead of
manually constructing the path.
That is the only change in this resend.
Thanks,
Stefan
Stefan Beller (7):
git-submodule.sh: align error reporting for update mode to use path
git-submodule.sh: rename unused variables
builtin
All other error messages in cmd_update are reporting the submodule based
on its path, so let's do that for invalid update modes, too.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
git-submodule.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/git
On Mon, Aug 13, 2018 at 2:06 PM Jeff King wrote:
>
> On Mon, Aug 13, 2018 at 01:41:51PM -0700, Stefan Beller wrote:
>
> > > Oh, using "git shortlog" might be also simpler ;-)
> >
> > I guess you'd need to memorize a different set of flags for that
>
On Mon, Aug 13, 2018 at 1:36 PM Junio C Hamano wrote:
>
> Ævar Arnfjörð Bjarmason writes:
>
> >Or would those companies be OK with trusting that some 20-ish of us
> >can hold our tongues for one day and not ruin the surprise?
> >
> >There's also overlap with the remote A/V concerns
On Mon, Aug 13, 2018 at 12:25 PM Jeff King wrote:
> I can buy the argument that it's nice to have some form of profiling
> that works everywhere, even if it's lowest-common-denominator. I just
> wonder if we could be investing effort into tooling around existing
> solutions that will end up more
On Mon, Aug 13, 2018 at 5:26 AM Johannes Schindelin
wrote:
>
> Hi,
>
>
> On Fri, 10 Aug 2018, Stefan Beller wrote:
>
> > Signed-off-by: Stefan Beller
> > Signed-off-by: Junio C Hamano
>
> Well, my rationale for having the explicit `reverse` paramet
On Mon, Aug 13, 2018 at 5:42 AM Johannes Schindelin
wrote:
>
> Hi Stefan,
>
> On Fri, 10 Aug 2018, Stefan Beller wrote:
>
> > emit_line_0 has no nested conditions, but puts out all its arguments
> > (if set) in order.
>
> Well, currently `emit_line_0()` *has*
> > The later lines that indicate a change to the Makefile will be treated as
> > context both in the outer and inner diff, such that those lines stay
> > regular color.
>
> While I am a fan of having those lines colored correctly, I have to admit
> that I am not exactly enthusiastic about that
On Mon, Aug 13, 2018 at 5:05 AM Johannes Schindelin
wrote:
>
> Hi Stefan,
>
> On Fri, 10 Aug 2018, Stefan Beller wrote:
>
> > +test_expect_success 'dual-coloring' '
> > + sed -e "s|^:||" >expect <<-\EOF &&
> > + :1: a4b = 1:
> > strbuf_addbuf(, );
> > + }
>
> My preliminary reading (I sadly lack the time to pull your branch and play
> with it) suggests that this works, although I have to admit that X/Y/Z
> would confuse me in 6 months from now, as they do not really read like
> diff
On Mon, Aug 13, 2018 at 4:47 AM Johannes Schindelin
wrote:
>
> Hi Steafn,
>
> On Fri, 10 Aug 2018, Stefan Beller wrote:
>
> > This will prove useful in range-diff in a later patch as we will be able to
> > differentiate between adding a new
On Mon, Aug 13, 2018 at 4:42 AM Johannes Schindelin
wrote:
> > +/*
> > + * Emits
> > + * LF
> > + * if they are present. 'first' is a NULL terminated string,
> > + * 'second' is a buffer of length 'len'.
> > + */
>
> That does not make it clear what the role of `first` or `second` is.
On Mon, Aug 13, 2018 at 9:31 AM Jeff King wrote:
>
> For the past several years, we've held a Git Contributor Summit as part
> of the Git Merge conference. I'd like to get opinions from the community
> to help plan future installments. Any feedback or opinion is welcome,
> but some obvious things
On Fri, Aug 10, 2018 at 4:33 PM Jeff King wrote:
>
> On Fri, Aug 10, 2018 at 07:31:33PM -0400, Jeff King wrote:
>
> > On Fri, Aug 10, 2018 at 04:27:25PM -0700, Stefan Beller wrote:
> >
> > > > cache.h| 13 -
> > > > packfile.h | 8 ++-
On Fri, Aug 10, 2018 at 4:09 PM Jeff King wrote:
>
> These flags were split between cache.h and packfile.h,
> because some of the flags apply only to packs. However, they
> share a single numeric namespace, since both are respected
> for the packed variant. Let's make sure they're defined
>
/git
Signed-off-by: Stefan Beller
---
range-diff.c | 2 ++
t/t3206-range-diff.sh | 12 ++--
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/range-diff.c b/range-diff.c
index 6e4192c8e79..a8db7c4f8d3 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -85,6 +85,7
reset) series of sb/range-diff-colors.
Thanks,
Stefan
Stefan Beller (4):
diff.c: emit_line_0 to take string instead of first sign
diff.c: add --output-indicator-{new, old, context}
range-diff: make use of different output indicators
range-diff: indent special lines as context
diff.c
moved lines with lines other than +/-.
Signed-off-by: Stefan Beller
---
diff.c | 21 +
diff.h | 5 +
2 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/diff.c b/diff.c
index b3cb73eb69a..b75eb085cb3 100644
--- a/diff.c
+++ b/diff.c
@@ -1237,7 +1237,7 @@ static
By providing a string as the first part of the emission we can extend
it later more easily.
While at it, document emit_line_0.
Signed-off-by: Stefan Beller
---
diff.c | 28 +---
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/diff.c b/diff.c
index
This change itself only changes the internal communication and should
have no visible effect to the user. We instruct the diff code that produces
the inner diffs to use X, Y, Z instead of the usual markers for new, old
and context lines
Signed-off-by: Stefan Beller
---
range-diff.c | 15
we ignore it).
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 73 +-
1 file changed, 41 insertions(+), 32 deletions(-)
diff --git a/diff.c b/diff.c
index e50cd312755..af9316c8f91 100644
--- a/diff.c
+++ b/diff.c
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/diff.c b/diff.c
index 01095a59d3d..e50cd312755 100644
--- a/diff.c
+++ b/diff.c
@@ -622,11 +622,12 @@ static void check_blank_at_eof(mmfile_t
The 'expect'ed outcome has been taken by running the 'range-diff | decode'.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/t3206-range-diff.sh | 39 +++
1 file changed, 39 insertions(+)
diff --git a/t/t3206-range-diff.sh b/t/t3206-range
Due to the previous condition we know "set_sign != NULL" at that point.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/diff.c b/diff.c
index ae131495216..f6df18af913 100644
--- a/diff.c
++
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
t/test-lib-functions.sh | 2 ++
1 file changed, 2 insertions(+)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 2b2181dca09..be8244c47b5 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
The order shall be all colors first, then the content, flags at the end.
The colors are in order.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c
index f6df18af913
to be adapted slightly in one line, too)
range-diff below.
Stefan Beller (8):
test_decode_color: understand FAINT and ITALIC
t3206: add color test for range-diff --dual-color
diff.c: simplify caller of emit_line_0
diff.c: reorder arguments for emit_line_ws_markup
diff.c: add set_sign
.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/diff.c b/diff.c
index ab6e6a88a56..5eea5edca50 100644
--- a/diff.c
+++ b/diff.c
@@ -622,7 +622,7 @@ static void check_blank_at_eof
All lines that use emit_line_0 multiple times per line, are combined
into a single call to emit_line_0, making use of the 'set' argument.
Signed-off-by: Stefan Beller
Signed-off-by: Junio C Hamano
---
diff.c | 26 --
1 file changed, 12 insertions(+), 14 deletions
501 - 600 of 7892 matches
Mail list logo
