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.
An early preview of upcoming relea
An early preview release Git v2.21.0-rc0 is now available for
testing at the usual places. It is comprised of 426 non-merge
commits since v2.20.0, contributed by 57 people, 13 of which are
new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The followi
From: Mats Nilsson
This allows for expansion of %*x to %x followed by a LF if
and only if %x is non-empty.
Signed-off-by: Mats Nilsson
---
Documentation/pretty-formats.txt | 4
pretty.c | 11 +--
t/t6006-rev-list-format.sh | 5 +
3 files changed
This teaches git-submodule the set-branch subcommand which allows the
branch of a submodule to be set through a porcelain command without
having to manually manipulate the .gitmodules file.
---
Documentation/git-submodule.txt| 7 ++
contrib/completion/git-completion.bash | 5 +-
git-subm
Currently, there is no way to set the branch of a submodule without
manually manipulating the .gitmodules file. This patchset introduces a
porcelain command that enables this.
Changes since v1:
* Fixed incorrect usage of OPT_CMDMODE
Denton Liu (3):
git-submodule.txt: document default b
This teaches submodule--helper config the --unset option, which removes
the specified configuration key from the .gitmodule file.
Signed-off-by: Denton Liu
---
builtin/submodule--helper.c | 18 --
t/t7411-submodule-config.sh | 9 +
2 files changed, 21 insertions(+), 6 de
This behavior is mentioned in gitmodules.txt but not in
git-submodule.txt so we copy the information over so that it is not
missed.
Signed-off-by: Denton Liu
---
Documentation/git-submodule.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-submodule.txt
On Wed, Feb 06, 2019 at 09:00:22PM -0500, Jeff King wrote:
> On Wed, Feb 06, 2019 at 11:42:43AM +0100, SZEDER Gábor wrote:
>
> > I reported this and Peff looked into it on the way to Git Merge, but
> > not working solution yet.
> >
> > https://public-inbox.org/git/20190129225121.gd1...@sigill.intra
On Wed, Feb 06, 2019 at 06:53:50PM -0800, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> >> The patch looks good to me.
> >
> > Thanks, all.
>
> Oops, spoke a bit too fast. As the previous one is already in
> 'next', let's do this instead.
That's fine with me. Sorry about the delay getting
Junio C Hamano writes:
>> The patch looks good to me.
>
> Thanks, all.
Oops, spoke a bit too fast. As the previous one is already in
'next', let's do this instead.
-- >8 --
From: "brian m. carlson"
Date: Wed, 6 Feb 2019 23:59:37 +
Subject: [PATCH] fetch-pack: clear alternate shallow in on
Duy Nguyen writes:
> On Thu, Feb 7, 2019 at 7:00 AM brian m. carlson
> wrote:
>>
>> When we write an alternate shallow file in update_shallow, we write it
>> into the lock file. The string stored in alternate_shallow_file is
>> copied from the lock file path, but it is freed the moment that the
On Thu, Feb 7, 2019 at 7:00 AM brian m. carlson
wrote:
>
> When we write an alternate shallow file in update_shallow, we write it
> into the lock file. The string stored in alternate_shallow_file is
> copied from the lock file path, but it is freed the moment that the lock
> file is closed, since
On Wed, Feb 06, 2019 at 11:42:43AM +0100, SZEDER Gábor wrote:
> I reported this and Peff looked into it on the way to Git Merge, but
> not working solution yet.
>
> https://public-inbox.org/git/20190129225121.gd1...@sigill.intra.peff.net/T/#u
Oof. Well, now I know why my attempts to fix the test
> > @@ -327,6 +327,9 @@ marked strings" in po/README for details.
> > GIT_TEST_SPLIT_INDEX= forces split-index mode on the whole
> > test suite. Accept any boolean values that are accepted by git-config.
> >
> > +GIT_TEST_PROTOCOL_VERSION=, when set, overrides the
> > +'protocol.version' setting
When we write an alternate shallow file in update_shallow, we write it
into the lock file. The string stored in alternate_shallow_file is
copied from the lock file path, but it is freed the moment that the lock
file is closed, since we call strbuf_release to free that path.
This used to work, sinc
On Tue, Feb 05, 2019 at 08:26:36AM -0800, Jonathan Tan wrote:
> > It may be worth mentioning bd0b42aed3 (fetch-pack: do not take shallow
> > lock unnecessarily - 2019-01-10). I believe this is the same problem
> > and a full solution was suggested but not implemented in that commit.
>
> For refere
On Wed, Feb 06, 2019 at 11:20:32PM +0100, Ævar Arnfjörð Bjarmason wrote:
> >> So far we've had the convention that these GIT_TEST_* variables,
> >> e.g. the one for the commit graph, work the same way. Thus we guarantee
> >> that we get (in theory) 100% coverage even when running the tests in
> >>
Jeff King writes:
> An alternative view is that anybody who calls git_author_info() to
> create a commit _should_ be checking author_ident_sufficiently_given(),
> and it's a bug that they're not.
>
> I.e., should we be doing something like this (and probably some other
> spots, too):
>
> diff --g
I experienced a slowdown in Git pushing when I push to more than one server.
I propose:
Run push to several servers in parallel.
Not to mix the output, nevertheless serialize the output, that is for
example cache the output of the second server push and start to output
it immediately after th
On Wed, Feb 06 2019, Jeff King wrote:
> On Wed, Feb 06, 2019 at 10:52:15PM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> > I wonder if it would be more obvious what's going on if we instead had a
>> > prereq like:
>> >
>> > test_expect_success !PROTO_V2 'ls-remote --symref' '
>> > ...
>> >
Jeff King writes:
> Yep. Here it is.
>
> Rather than a range-diff, which is quite large due to the code movement,
> I'll include below the interesting hunk of a diff between the two
> endpoints (i.e., what we would have seen applying the packet-err-check
> changes on top of my code movement, whic
I wanted to have a look at the bug, and I can correctly reproduce it using
version 2.20.1.windows.1.
To start to even think of fixing this bug I need to build the source for
Windows, but I got lost on how to do that.
Is it correct that I should cross-compile from a POSIX system (GNU/Linux),
us
On Wed, Feb 06, 2019 at 10:52:15PM +0100, Ævar Arnfjörð Bjarmason wrote:
> > I wonder if it would be more obvious what's going on if we instead had a
> > prereq like:
> >
> > test_expect_success !PROTO_V2 'ls-remote --symref' '
> > ...
> > '
> >
> > and just skipped those tests entirely (
On 02/05, Christian Couder wrote:
> On Tue, Feb 5, 2019 at 10:17 PM Thomas Gummerer wrote:
> >
> > [Dropped Stefan from the Cc list, as his email bounces]
> >
> > On 02/04, Thomas Gummerer wrote:
>
> > The idea is to add an option to 'git stash push', so it can stash
> > merge conflicts, and rest
On Wed, Feb 06 2019, Jonathan Tan wrote:
> Define a GIT_TEST_PROTOCOL_VERSION environment variable meant to be used
> from tests. When set, this ensures protocol.version is at least the
> given value, allowing the entire test suite to be run as if this
> configuration is in place for all reposit
On Wed, Feb 06 2019, Jeff King wrote:
> On Tue, Feb 05, 2019 at 04:21:14PM -0800, Jonathan Tan wrote:
>
>> This is on the latest master (8feddda32c ("Fifth batch for 2.21",
>> 2019-02-05)) + js/protocol-advertise-multi.
>>
>> This is a resend of [1], which was built on the result of merging many
On Tue, Feb 05, 2019 at 04:21:14PM -0800, Jonathan Tan wrote:
> This is on the latest master (8feddda32c ("Fifth batch for 2.21",
> 2019-02-05)) + js/protocol-advertise-multi.
>
> This is a resend of [1], which was built on the result of merging many
> branches. Now that most of the branches have
On Tue, Feb 05, 2019 at 04:21:22PM -0800, Jonathan Tan wrote:
> In post_rpc(), remote-curl calls credential_fill() if HTTP_REAUTH is
> returned, but this is not true in proxy_request(). Do this in
> proxy_request() too.
Can we do this as a general rule? If we look at the code in post_rpc(),
there
On Wed, Feb 06, 2019 at 11:29:03AM -0800, Josh Steadmon wrote:
> > + packet_reader_init(&reader, -1, d->buf, d->len,
> > + PACKET_READ_CHOMP_NEWLINE |
> > + PACKET_READ_DIE_ON_ERR_PACKET);
> > + if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
>
Hi Phillip,
I’ve just reread this message and have a couple of additionnal comments.
Le 01/02/2019 à 12:03, Phillip Wood a écrit :
> Hi Alban
>
> This looks good apart from some missing error handling.
>
> On 29/01/2019 15:01, Alban Gruin wrote:
>> edit_todo_list() is changed to work on a todo_
Josh Steadmon writes:
>> +packet_reader_init(&reader, -1, d->buf, d->len,
>> + PACKET_READ_CHOMP_NEWLINE |
>> + PACKET_READ_DIE_ON_ERR_PACKET);
>> +if (packet_reader_read(&reader) != PACKET_READ_NORMAL)
>> +die("invalid server respon
I am using vimdiff as my merge tool. Unfortunately, vim(diff) crashed
and it froze my terminal completely, so I had to kill git. That was
kinda painful since I lost some of the work I did.
My expectation is that git should be able to recover from mergetool crash.
I'm actually unsure if git can ac
From: Andrew Oakley
Perforce allows you commit files and directories with the same name, so
you could have files //depot/foo and //depot/foo/bar both checked in. A
p4 sync of a repository in this state fails. Deleting one of the files
recovers the repository.
When this happens we want git-p4 t
The getnanos() helper always gets the current time from our
getnanotime() facility. The caller cannot override it via TEST_DATE_NOW,
and hence we simply ignore the "now" parameter to the function. Let's
remove it, as it may mislead callers into thinking it does something.
Signed-off-by: Jeff King
On 2019.02.06 14:18, Jeff King wrote:
> After making initial contact with an http server, we have to decide if
> the server supports smart-http, and if so, which version. Our rules are
> a bit inconsistent:
>
> 1. For v0, we require that the content-type indicates a smart-http
> response. W
"Johannes Schindelin via GitGitGadget"
writes:
> I totally missed that this patch made it into next, and then master. Sorry
> about that.
Will queue. Let's make sure -y won't escape to the released
version(s).
Thanks for a quick update.
In a v2 smart-http conversation, the server should reply to our initial
request with a pkt-line saying "version 2". We check that with
starts_with(), but really that should be the only thing in that packet.
A response of "version 20" should not match.
Let's tighten this check to use strcmp(). Note
After making initial contact with an http server, we have to decide if
the server supports smart-http, and if so, which version. Our rules are
a bit inconsistent:
1. For v0, we require that the content-type indicates a smart-http
response. We also require the response to look vaguely like a
From: Josh Steadmon
When a smart HTTP server sends an error message via pkt-line, we detect
the error due to using PACKET_READ_DIE_ON_ERR_PACKET. This case was
added by 2d103c31c2 (pack-protocol.txt: accept error packets in any
context, 2018-12-29), but not covered by tests.
Signed-off-by: Josh
On Tue, Feb 05, 2019 at 03:29:18PM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > After making initial contact with an http server, we have to decide if
> > the server supports smart-http, and if so, which version. Our rules are
> > a bit inconsistent:
> > ...
> >
> > - we now predicate
Denton Liu writes:
> This teaches submodule--helper config the --unset option, which removes
> the specified configuration key from the .gitmodule file.
>
> Signed-off-by: Denton Liu
> ---
> builtin/submodule--helper.c | 15 +++
> t/t7411-submodule-config.sh | 9 +
> 2 file
On Tue, Feb 05, 2019 at 10:45:35AM -0800, Junio C Hamano wrote:
> - Perhaps find the fork point, run tests to find known breakages
>and exclude them? This would simply be not practical, as it
>doubles the number of tests run, for individual topic branches
>because there are an order
On Tue, Feb 05, 2019 at 11:34:54AM +0100, Johannes Schindelin wrote:
> Peff, you asked at the Contributors' Summit for a way to get notified when
> CI fails for your patch, and I was hesitant to add it (even if it would be
> straight-forward, really) because of the false positives.
>
> This is on
Denton Liu writes:
> This behavior is mentioned in gitmodules.txt but not in
> git-submodule.txt so we copy the information over so that it is not
> missed.
>
> Signed-off-by: Denton Liu
> ---
> Documentation/git-submodule.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff -
I totally missed that this patch made it into next, and then master. Sorry
about that.
Changes since v1:
* Focused on the "why?" in the commit message.
Johannes Schindelin (1):
Revert "rebase: introduce a shortcut for --reschedule-failed-exec"
Documentation/git-rebase.txt | 6 --
built
From: Johannes Schindelin
This patch was contributed only as a tentative "we could introduce a
convenient short option if we do not want to change the default behavior
in the long run" patch, opening the discussion whether other people
agree with deprecating the current behavior in favor of the r
On Wed, Feb 06, 2019 at 01:26:12PM -0500, Jeff King wrote:
> On Wed, Feb 06, 2019 at 10:28:34AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> > I did some further digging. One of the confusing things is that we've
> > been carrying dead code since 2012 to set this
> > author_ident_explicitly_given var
On Wed, Feb 06 2019, Jeff King wrote:
> On Tue, Feb 05, 2019 at 12:50:23AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
>> >> As this is pretty-much a test-only option, perhaps going longer but
>> >> more descriptive would make sense?
>> >>
>> >> git rev-parse --compute-abbrev-length-for
>> >>
>>
On Wed, Feb 06, 2019 at 10:28:34AM +0100, Ævar Arnfjörð Bjarmason wrote:
>
> William, is that something you're intererested in carrying forward? I
> can also help if you want. Sorry your first contribution to git has
> turned into this mess of re-rolls, as often happens we find that when
> trying
On Tue, Feb 05, 2019 at 12:50:23AM +0100, Ævar Arnfjörð Bjarmason wrote:
> >> As this is pretty-much a test-only option, perhaps going longer but
> >> more descriptive would make sense?
> >>
> >>git rev-parse --compute-abbrev-length-for
> >>
> >> may be an overkill, but something along those
On Wed, Feb 06, 2019 at 10:28:34AM +0100, Ævar Arnfjörð Bjarmason wrote:
> I did some further digging. One of the confusing things is that we've
> been carrying dead code since 2012 to set this
> author_ident_explicitly_given variable. We can just apply this on top of
> master:
> [...]
> @@ -4
Am 06.02.19 um 12:56 schrieb Johannes Schindelin:
> On Tue, 5 Feb 2019, Johannes Sixt wrote:
>> Am 05.02.19 um 12:06 schrieb Johannes Schindelin:
>>> The real examples are much more mundane, and very different from what you
>>> suspected, e.g. inserting the tag header before the tag message in
>>>
On February 6, 2019 12:15, Torsten Bögershausen wrote:
> To: Johannes Schindelin
> Cc: SZEDER Gábor ; Jeff King ;
> git@vger.kernel.org
> Subject: Re: t0025 flakey?
>
> On Wed, Feb 06, 2019 at 02:52:53PM +0100, Johannes Schindelin wrote:
> > Hi Gábor,
> >
> > On Wed, 6 Feb 2019, SZEDER Gábor wrot
Jeff Hostetler writes:
> On 2/5/2019 6:37 PM, Junio C Hamano wrote:
>> * jh/trace2 (2019-02-01) 15 commits
>> - trace2: add for_each macros to clang-format
>> - trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
>> - trace2:data: add subverb for rebase
>> - trace2:data: add subver
Denton Liu writes:
> On Tue, Feb 05, 2019 at 03:37:01PM -0800, Junio C Hamano wrote:
>> * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits
>> - merge: add scissors line on merge conflict
>> - merge: cleanup messages like commit
>> - t7600: clean up 'merge --squash c3 with c7' test
>> - co
On Wed, Feb 06, 2019 at 05:15:17PM +, Torsten Bögershausen wrote:
> On Wed, Feb 06, 2019 at 02:52:53PM +0100, Johannes Schindelin wrote:
> > Hi Gábor,
> >
> > On Wed, 6 Feb 2019, SZEDER Gábor wrote:
> >
> > > On Wed, Feb 06, 2019 at 11:25:38AM +0100, Johannes Schindelin wrote:
> > >
> > > > at
Johannes Schindelin writes:
>> For a topic like doc-diff that is primarily meant for developers and
>> documenters, it does not matter much, but for an old but important bug,
>> forking the topic to fix it at a point close to the origin is
>> crucial---that is what would allow people to merge the
On 2/5/2019 6:37 PM, Junio C Hamano wrote:
* jh/trace2 (2019-02-01) 15 commits
- trace2: add for_each macros to clang-format
- trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh
- trace2:data: add subverb for rebase
- trace2:data: add subverb to reset command
- trace2:data: a
From: Jeff Hostetler
Create unit tests for Trace2.
Signed-off-by: Jeff Hostetler
---
Makefile | 1 +
t/helper/test-tool.c | 1 +
t/helper/test-tool.h | 1 +
t/helper/test-trace2.c| 273 ++
t/t0210-trace2-normal.sh | 135
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/reset.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/builtin/reset.c b/builtin/reset.c
index 59898c972e..4e34c61401 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -340,6 +340,7 @@ int cmd_reset(int argc, const ch
From: Jeff Hostetler
Created design document for Trace2 feature.
Signed-off-by: Jeff Hostetler
---
Documentation/technical/api-trace2.txt | 1347
1 file changed, 1347 insertions(+)
create mode 100644 Documentation/technical/api-trace2.txt
diff --git a/Documentation/t
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
.clang-format | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.clang-format b/.clang-format
index de1c8b5c77..41d4cd23fd 100644
--- a/.clang-format
+++ b/.clang-format
@@ -149,7 +149,7 @@ Cpp11BracedListStyle: false
#
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/checkout.c | 7 +++
1 file changed, 7 insertions(+)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 6fadf412e8..f911c88bb4 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -262,6 +262,8 @@ static int check
From: Jeff Hostetler
Add trace2_region_enter() and trace2_region_leave() calls around the
various phases of a status scan. This gives elapsed time for each
phase in the GIT_TR2_PERF and GIT_TR2_EVENT trace target.
Also, these Trace2 calls now use s->repo rather than the_repository.
Signed-off-
From: Jeff Hostetler
Classify certain child processes as hooks.
Signed-off-by: Jeff Hostetler
---
builtin/am.c | 1 +
builtin/receive-pack.c | 4
builtin/worktree.c | 1 +
sequencer.c| 2 ++
transport.c| 1 +
5 files changed, 9 insertions(+)
diff --g
From: Jeff Hostetler
Signed-off-by: Jeff Hostetler
---
builtin/rebase.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 774264bae8..f5ac4fe2ea 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -850,6 +850,14 @@ int cmd_rebas
From: Jeff Hostetler
Add platform-specific interface to log information about the current
process.
On Windows, this interface is used to indicate whether the git process
is running under a debugger and list names of the process ancestors.
Information for other platforms is left for a future eff
From: Jeff Hostetler
Add trace2 events to measure reading and writing the index.
Signed-off-by: Jeff Hostetler
---
read-cache.c | 51 ++-
1 file changed, 50 insertions(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index bfff271a3d..
V6 addresses: [] The remaining hdr-check warning in trace2/tr2_tls.h
There are no other outstanding comments that I'm aware of.
Thanks Jeff
V5 addresses: [] renames "verb" and "subverb" to "cmd_name" and "cmd_mode"
in
From: Jeff Hostetler
Create a new unified tracing facility for git. The eventual intent is to
replace the current trace_printf* and trace_performance* routines with a
unified set of git_trace2* routines.
In addition to the usual printf-style API, trace2 provides higer-level
event verbs with fix
From: Jeff Hostetler
Add trace2 process classification for editor and pager
child processes.
Signed-off-by: Jeff Hostetler
---
editor.c | 1 +
pager.c | 1 +
2 files changed, 2 insertions(+)
diff --git a/editor.c b/editor.c
index c985eee1f9..71547674ab 100644
--- a/editor.c
+++ b/editor.c
@@
From: Derrick Stolee
When studying the performance of 'git push' we would like to know
how much time is spent at various parts of the command. One area
that could cause performance trouble is 'git pack-objects'.
Add trace2 regions around the three main actions taken in this
command:
1. Enumerat
From: Jeff Hostetler
Add trace2 child classification for transport processes.
Signed-off-by: Jeff Hostetler
---
connect.c | 3 +++
transport-helper.c | 2 ++
2 files changed, 5 insertions(+)
diff --git a/connect.c b/connect.c
index 24281b6082..3c6f829a05 100644
--- a/connect.c
+++ b/
From: Jeff Hostetler
Add trace2 classification for long-running processes
started in sub-process.c
Signed-off-by: Jeff Hostetler
---
sub-process.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sub-process.c b/sub-process.c
index 8d2a1707cf..3f4af93555 100644
--- a/sub-process.c
+++ b/sub
On Wed, Feb 06, 2019 at 02:52:53PM +0100, Johannes Schindelin wrote:
> Hi Gábor,
>
> On Wed, 6 Feb 2019, SZEDER Gábor wrote:
>
> > On Wed, Feb 06, 2019 at 11:25:38AM +0100, Johannes Schindelin wrote:
> >
> > > at first I thought that those intermittent test failures were limited
> > > to Windows, b
On Wed, Feb 06, 2019 at 03:11:53PM +, Luke Diamand wrote:
> The git-p4 login ticket expiry test causes unreliable test
> runs. Since the handling of ticket expiry in git-p4 is far
> from polished anyway, let's remove it for now.
I can't judge how far it is from polished, and whether it's worth
Hello, we are a team of French CS students and our project is to
collaborate to a free software.
We chose GIT as our subject and we will try to implements some
improvements during the three next months.
Our tutor Matthieu Moy, proposed some on this page
https://git.wiki.kernel.org/index.php/Small
The git-p4 login ticket expiry test causes unreliable test
runs. Since the handling of ticket expiry in git-p4 is far
from polished anyway, let's remove it for now.
A better way to actually run the test is to create a python
"fake" version of "p4" which returns whatever expiry results
the test req
As per thread here, this removes the git-p4 ticket expiration
test, since it isn't really that useful.
https://marc.info/?l=git&m=154946136416003&w=2
Luke Diamand (1):
git-p4: remove ticket expiry test
t/t9833-errors.sh | 27 ---
1 file changed, 27 deletions(-)
--
2.
Here is today's test coverage report.
Thanks,
-Stolee
[1] https://derrickstolee.github.io/git-test-coverage/reports/2019-02-06.htm
[2] https://derrickstolee.github.io/git-test-coverage/reports/2019-02-06.txt
[3] https://dev.azure.com/git/git/_build/results?buildId=335
---
pu 6e9ee141a1008e
Hi Gábor,
On Wed, 6 Feb 2019, SZEDER Gábor wrote:
> On Wed, Feb 06, 2019 at 11:33:21AM +0100, Johannes Schindelin wrote:
>
> > in a private Azure Pipeline (sorry...) I noticed an intermittent problem
> > in the p4 tests on osx-gcc.
> >
> > I would point you to a public log, but the Azure Pipeli
Hi Gábor,
On Wed, 6 Feb 2019, SZEDER Gábor wrote:
> On Wed, Feb 06, 2019 at 11:25:38AM +0100, Johannes Schindelin wrote:
>
> > at first I thought that those intermittent test failures were limited
> > to Windows, but they are not: I can see it now in a build on 32-bit
> > Linux.
> > Full logs he
On Wed, Feb 6, 2019 at 11:25 AM Luke Diamand wrote:
>
> I've recently started seeing a lot of this message when doing a rebase:
>
>warning: could not freshen shared index
> '/home/ldiamand/git/dev_full/.git/worktrees/gcc8-take-2/sharedindex.'
Thanks for
Hi Thomas,
On Tue, 5 Feb 2019, Thomas Gummerer wrote:
> Here's an idea, that I think could make a good GSoC project. Dscho
> mentioned this to me at Git Merge, and I liked the idea, but I'd like to
> get some feedback on the list first before adding it to the project
> list, to get others opinio
Hi Junio,
On Tue, 5 Feb 2019, Junio C Hamano wrote:
> I am wondering if the automated testing can be made more useful by
> limiting the scope of testing if it is run on individual topic. For
> four primary integration branches, we do want to ensure all tests keep
> passing (or at least no tests
Hi Hannes,
On Tue, 5 Feb 2019, Johannes Sixt wrote:
> Am 05.02.19 um 12:06 schrieb Johannes Schindelin:
> > The real examples are much more mundane, and very different from what you
> > suspected, e.g. inserting the tag header before the tag message in
> > `create_tag()` in `builtin/tag.c`. Basic
On Wed, 6 Feb 2019 at 11:11, SZEDER Gábor wrote:
>
> On Wed, Feb 06, 2019 at 11:33:21AM +0100, Johannes Schindelin wrote:
> > Hi Luke,
> >
> > in a private Azure Pipeline (sorry...) I noticed an intermittent problem
> > in the p4 tests on osx-gcc.
> >
> > I would point you to a public log, but the
Hi Junio,
On Tue, 5 Feb 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Thanks for finding it. This needs to be squashed into bfc3fe33
> >> ("strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`",
> >> 2018-12-20)?
> >
> > Since you want to open that can of worms again, yo
Hi Junio,
On Tue, 5 Feb 2019, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Mon, 4 Feb 2019, SZEDER Gábor wrote:
> >
> >> Under Dscho's bugreport it looks like they already merged a one-liner
> >> fix, but how long will it take to tickle down to Travis CI, I have no
> >> idea.
>
On Wed, Feb 06, 2019 at 11:33:21AM +0100, Johannes Schindelin wrote:
> Hi Luke,
>
> in a private Azure Pipeline (sorry...) I noticed an intermittent problem
> in the p4 tests on osx-gcc.
>
> I would point you to a public log, but the Azure Pipelines support *just*
> made it to next, so I *just* s
This teaches git-submodule the set-branch subcommand which allows the
branch of a submodule to be set through a porcelain command without
having to manually manipulate the .gitmodules file.
---
Documentation/git-submodule.txt| 7 ++
contrib/completion/git-completion.bash | 5 +-
git-subm
This behavior is mentioned in gitmodules.txt but not in
git-submodule.txt so we copy the information over so that it is not
missed.
Signed-off-by: Denton Liu
---
Documentation/git-submodule.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/git-submodule.txt
This teaches submodule--helper config the --unset option, which removes
the specified configuration key from the .gitmodule file.
Signed-off-by: Denton Liu
---
builtin/submodule--helper.c | 15 +++
t/t7411-submodule-config.sh | 9 +
2 files changed, 20 insertions(+), 4 delet
Currently, there is no way to set the branch of a submodule without
manually manipulating the .gitmodules file. This patchset introduces a
porcelain command that enables this.
Denton Liu (3):
git-submodule.txt: document default behavior without --branch
submodule--helper: teach config subcomm
On Wed, Feb 06, 2019 at 11:25:38AM +0100, Johannes Schindelin wrote:
> Hi Torsten,
>
> at first I thought that those intermittent test failures were limited to
> Windows, but they are not: I can see it now in a build on 32-bit Linux.
> Full logs here:
>
> https://dev.azure.com/gitgitgadget/git/_b
Hi Luke,
in a private Azure Pipeline (sorry...) I noticed an intermittent problem
in the p4 tests on osx-gcc.
I would point you to a public log, but the Azure Pipelines support *just*
made it to next, so I *just* set up a public one targeting anything else
than my `vsts-ci` branch, at
https://dev
I've recently started seeing a lot of this message when doing a rebase:
warning: could not freshen shared index
'/home/ldiamand/git/dev_full/.git/worktrees/gcc8-take-2/sharedindex.'
(There's a repo called dev_full, and I've got a worktree where I'm
worki
Hi Torsten,
at first I thought that those intermittent test failures were limited to
Windows, but they are not: I can see it now in a build on 32-bit Linux.
Full logs here:
https://dev.azure.com/gitgitgadget/git/_build/results?buildId=1032&_a=summary&view=ms.vss-test-web.build-test-results-tab
E
Hi Christopher,
I just spotted what I believe to be a typo in po/es.po:
#~ msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
While I am not fluent in Spanish, I am fairly certain that it should be
"fetch-pack", not "getch-pack".
Correct?
Johannes
Signed-off-by: Denton Liu
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 499e56f83d..de56879960 100644
--- a/contrib/completion/git-completion.bas
1 - 100 of 103 matches
Mail list logo
