Fwd: Query on GIT merge and conflicts

Hi Team, I've query for which we have no solutions from Stackoverflow. Or we couldn't find one. Would be great if you have one or can provide suggestions with. SO Link: https://stackoverflow.com/questions/53704320/git-merge-remote-repository-project-to-sub-directory-of-current-repository-proje

Re: [PATCH 1/1] git-p4: recover from inconsistent perforce history

On Wed, 6 Feb 2019 19:42:19 + and...@adoakley.name wrote: > 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

Re: Proposal: Output should push to different servers in parallel

On Wed, Feb 06 2019, Victor Porton wrote: > 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

[PATCH v3 0/3] Teach submodule set-branch subcommand

I rebased the changes onto the latest 'next' because if this branch gets merged into 'next', there'll be merge conflicts from 'dl/complete-submodule-absorbgitdirs'. Currently, there is no way to set the branch of a submodule without manually manipulating the .gitmodules file. This patchset introdu

[PATCH v3 3/3] submodule: teach set-branch subcommand

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

[PATCH v3 1/3] git-submodule.txt: "--branch " option defaults to 'master'

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. Also, add the missed argument to the -b/--branch option. Signed-off-by: Denton Liu --- Documentation/git-submodule.txt | 7 --- 1 file changed, 4 insertions(+)

[PATCH v3 2/3] submodule--helper: teach config subcommand --unset

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

[PATCH 01/21] diff.c: convert --patch-with-raw

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 4bc9df7362..12e333c67f 100644 --- a/diff.c +++ b/diff.c @@ -4901,6 +4901,10 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 04/21] diff.c: convert --check

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 1cdbe8e688..5e16082091 100644 --- a/diff.c +++ b/diff.c @@ -4939,6 +4939,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 07/21] diff.c: convert --name-only

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index b9811aefef..7ea308814f 100644 --- a/diff.c +++ b/diff.c @@ -4949,6 +4949,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 06/21] diff.c: convert --patch-with-stat

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 0276f25200..b9811aefef 100644 --- a/diff.c +++ b/diff.c @@ -4921,6 +4921,10 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 09/21] diff.c: convert -s|--no-patch

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 99047fb5fe..9c8f5336bc 100644 --- a/diff.c +++ b/diff.c @@ -4906,6 +4906,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 02/21] diff.c: convert --numstat and --shortstat

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index 12e333c67f..419b6ac4ae 100644 --- a/diff.c +++ b/diff.c @@ -4905,6 +4905,12 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 00/21] nd/diff-parseopt part 2

"What's cooking" mails seem to indicate that the series will be cooked in full there then landed on master later. So here's the second part. This continues to convert more diff options to parseopt. Nguyễn Thái Ngọc Duy (21): diff.c: convert --patch-with-raw diff.c: convert --numstat and --shor

[PATCH 05/21] diff.c: convert --summary

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 5e16082091..0276f25200 100644 --- a/diff.c +++ b/diff.c @@ -4942,6 +4942,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 03/21] diff.c: convert --dirstat and friends

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/diff-options.txt | 7 ++ diff.c | 39 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 071173

[PATCH 08/21] diff.c: convert --name-status

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/diff.c b/diff.c index 7ea308814f..99047fb5fe 100644 --- a/diff.c +++ b/diff.c @@ -4952,6 +4952,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 15/21] diff.c: convert -D|--irreversible-delete

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/diff.c b/diff.c index 2c904e0526..e51f6b3005 100644 --- a/diff.c +++ b/diff.c @@ -5060,6 +5060,9 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 14/21] diff.c: convert -M|--find-renames

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 35 +++ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/diff.c b/diff.c index d2139082b7..2c904e0526 100644 --- a/diff.c +++ b/diff.c @@ -4909,6 +4909,22 @@ static int diff_opt_dirstat(const struct op

[PATCH 16/21] diff.c: convert -C|--find-copies

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 59 +- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/diff.c b/diff.c index e51f6b3005..35bac115cc 100644 --- a/diff.c +++ b/diff.c @@ -4617,8 +4617,6 @@ static int opt_arg(co

[PATCH 18/21] diff.c: convert --no-renames|--[no--rename-empty

For --rename-empty, see 90d43b0768 (teach diffcore-rename to optionally ignore empty content - 2012-03-22) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/diff-options.txt | 3 +++ diff.c | 13 ++--- 2 files changed, 9 insertions(+), 7

[PATCH 19/21] diff.c: convert --relative

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 25 + 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/diff.c b/diff.c index d423a06b41..b9c267a199 100644 --- a/diff.c +++ b/diff.c @@ -4960,6 +4960,18 @@ static enum parse_opt_result diff_opt_output(struct p

[PATCH 10/21] diff.c: convert --stat*

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 118 + 1 file changed, 52 insertions(+), 66 deletions(-) diff --git a/diff.c b/diff.c index 9c8f5336bc..1feb13deb3 100644 --- a/diff.c +++ b/diff.c @@ -104,11 +104,6 @@ static const char *col

[PATCH 13/21] diff.c: convert -B|--break-rewrites

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 62 ++ 1 file changed, 36 insertions(+), 26 deletions(-) diff --git a/diff.c b/diff.c index 8df396cb9a..d2139082b7 100644 --- a/diff.c +++ b/diff.c @@ -4841,6 +4841,30 @@ static int parse_obj

[PATCH 20/21] diff.c: convert --[no-]minimal

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index b9c267a199..33492e754f 100644 --- a/diff.c +++ b/diff.c @@ -5105,6 +5105,11 @@ static void prep_parse_options(struct diff_options *options)

[PATCH 17/21] diff.c: convert --find-copies-harder

--no-find-copies-harder is also added on purpose (because I don't see why we should not have the --no- version for this) Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 35bac115cc..abb1566f95 100644 ---

[PATCH 11/21] diff.c: convert --[no-]compact-summary

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 25 +++-- 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/diff.c b/diff.c index 1feb13deb3..b24f6825a1 100644 --- a/diff.c +++ b/diff.c @@ -4841,6 +4841,21 @@ static int parse_objfind_opt(struct diff_options *opt,

[PATCH 12/21] diff.c: convert --output-*

This also validates that the user specifies a single character in --output-indicator-*, not a string. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/diff-options.txt | 10 + diff.c | 71 +- 2 files changed, 63 insertions(+), 18 d

[PATCH 21/21] diff.c: convert --ignore-some-changes

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.c | 27 --- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/diff.c b/diff.c index 33492e754f..a63ee4a44d 100644 --- a/diff.c +++ b/diff.c @@ -5109,6 +5109,21 @@ static void prep_parse_options(struct diff_options

[PATCH 1/1] mingw: fix CPU reporting in `git version --build-options`

From: Johannes Schindelin We cannot rely on `uname -m` in Git for Windows' SDK to tell us what architecture we are compiling for, as we can compile both 32-bit and 64-bit `git.exe` from a 64-bit SDK, but the `uname -m` in that SDK will always report `x86_64`. So let's go back to our original des

[PATCH 0/1] Fix incorrectly reported CPU in 32-bit Windows

While in review, Git for Windows' original design was changed, to use the output of uname -m instead of (necessarily incomplete) pre-processor magic to determine which CPU to report. Both 32-bit and 64-bit versions of Git for Windows are built in the 64-bit Git for Windows SDK, however, whose unam

Re: [PATCH 0/8] Resend of GIT_TEST_PROTOCOL_VERSION patches

On Thu, Feb 07 2019, Jeff King wrote: > 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) 10

Re: [PATCH v6 11/16] sequencer: refactor skip_unnecessary_picks() to work on a todo_list

Hi Alban On 29/01/2019 15:01, Alban Gruin wrote: > This refactors skip_unnecessary_picks() to work on a todo_list. As this > function is only called by complete_action() (and thus is not used by > rebase -p), the file-handling logic is completely dropped here. > > Instead of truncating the todo

Re: [PATCH v6 07/16] sequencer: refactor sequencer_add_exec_commands() to work on a todo_list

Hi Alban On 29/01/2019 15:01, Alban Gruin wrote: > This refactors sequencer_add_exec_commands() to work on a todo_list to > avoid redundant reads and writes to the disk. > > Instead of inserting the `exec' commands between the other commands and > re-parsing the buffer at the end, they are append

[PATCH] contrib/subtree: ensure only one rev is provided

While looking at the inline help for git-subtree.sh, I noticed that git subtree split --prefix= was given as an option. However, it only really makes sense to provide one revision because of the way the commits are forwarded to rev-parse so this commit changes "" to "" to reflect this. I

Zimbra Webclient Access

Dear Zimbra Webmail-User. Your kindly Response is needed now. Beginning from Tomorrow 08-02-2019(EDT) Your Zimbra sign on page Web Access will be changing! We are preparing for an email upgrade, However, to avoid you losing access to your Zimbra account please take a second to update your

Re: [ANNOUNCE] Git v2.21.0-rc0

On Thu, Feb 7, 2019 at 8:30 AM Junio C Hamano wrote: > New contributors whose contributions weren't in v2.20.0 are as follows. > Welcome to the Git development community! > > Arti Zirk, Brandon Richardson, Chayoung You, Denis Ovsienko, Erin > Dahlgren, Force Charlie, Frank Dana, Issac Trotts,

Re: [PATCH 0/1] git-p4: remove ticket expiration test

Hi Luke, On Wed, 6 Feb 2019, Luke Diamand wrote: > 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 Thank you for the prompt patch! However, like Gábor, my feeling is that we would want t

Re: [PATCH] add_to_index(): convert forgotten HASH_RENORMALIZE check

Hi Peff, On Wed, 6 Feb 2019, 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.peff.net

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Hi Peff, On Wed, 6 Feb 2019, Jeff King wrote: > 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-forwar

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Hi Peff, On Wed, 6 Feb 2019, Jeff King wrote: > 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

RE: t0025 flakey?

On February 6, 2019 13:01, I wrote: > 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

Re: [PATCH] Pretty-format: Ability to add newline after non-empty string

matni...@gmail.com writes: > Subject: Re: [PATCH] Pretty-format: Ability to add newline after non-empty > string Downcasing 'P' and 'A' would make this fit better when it appears in the "git shortlog --no-merges" output, I think. Or perhaps [PATCH] pretty: allow to add LF only after no

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Johannes Schindelin writes: > Even when there are even only as much as 12 merge bases to test (which is > the current number of merge bases between `next` and `pu`),... > ... > And I sadly have to report that that's not the end of it. Back when I > implemented the automatic bisect after failed bu

Re: t0025 flakey?

"Randall S. Becker" writes: > On February 6, 2019 13:01, I wrote: >> On February 6, 2019 12:15, Torsten Bögershausen wrote: >> > To: Johannes Schindelin >> > ... >> > [PATCH] add: use separate ADD_CACHE_RENORMALIZE flag >> > >> > Or has it always been shaky ? >> > Does anybody know ? >> >> The

Re: [PATCH v3 0/3] Teach submodule set-branch subcommand

Denton Liu writes: > I rebased the changes onto the latest 'next' because if this branch gets > merged into 'next', there'll be merge conflicts from > 'dl/complete-submodule-absorbgitdirs'. Please don't do that. A topic that depends on everything in 'next' cannot graduate to 'master' until ever

Re: Proposal: Output should push to different servers in parallel

Ævar Arnfjörð Bjarmason writes: > This seems like a reasonable idea, until such time as someone submits > patches to implement this in git you can do this with some invocation of > GNU parallel -k, i.e. operate on N remotes in parallel, and use the -k > option to buffer up all their output and pr

[PATCH] ci: make sure we build Git parallel

Commit 2c8921db2b (travis-ci: build with the right compiler, 2019-01-17) started to use MAKEFLAGS to specify which compiler to use to build Git. A bit later, and in a different topic branch commit eaa62291ff (ci: inherit --jobs via MAKEFLAGS in run-build-and-tests, 2019-01-27) started to use MAKEF

Re: [PATCH 00/21] nd/diff-parseopt part 2

On Thu, Feb 07, 2019 at 05:33:05PM +0700, Nguyễn Thái Ngọc Duy wrote: > Nguyễn Thái Ngọc Duy (21): > diff.c: convert --patch-with-raw > diff.c: convert --numstat and --shortstat > diff.c: convert --dirstat and friends > diff.c: convert --check > diff.c: convert --summary > diff.c: conve

Re: [PATCH] contrib/subtree: ensure only one rev is provided

Denton Liu writes: > @@ -185,6 +191,7 @@ if test "$command" != "pull" && > then > revs=$(git rev-parse $default --revs-only "$@") || exit $? > dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $? > + ensure_single_rev $revs This applies to anything other than pull, add and

Re: [PATCH] ci: make sure we build Git parallel

SZEDER Gábor writes: > Append to MAKEFLAGS when setting the compiler to use, to ensure that > the number of parallel jobs to use is preserved. > > Signed-off-by: SZEDER Gábor > --- > ci/lib.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/ci/lib.sh b/ci/lib.sh > index

Re: [PATCH] ci: make sure we build Git parallel

Junio C Hamano writes: > SZEDER Gábor writes: > >> Append to MAKEFLAGS when setting the compiler to use, to ensure that >> the number of parallel jobs to use is preserved. >> >> Signed-off-by: SZEDER Gábor >> --- >> ci/lib.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff

[PATCH] doc: prevent overflowing tag in rendered HTML

Add an apparently missing back-tick to fix a multi-line section on https://git-scm.com/docs/git-log which seems to have been caused by commit 18fb7ffc ("pretty: respect color settings [...]", 2017-07-13). Signed-off-by: Katrin Leinweber --- Documentation/pretty-formats.txt | 2 +- 1 file change

Re: [PATCH] doc: prevent overflowing tag in rendered HTML

Katrin Leinweber writes: > Add an apparently missing back-tick to fix a multi-line section > on https://git-scm.com/docs/git-log which seems to have been caused by > commit 18fb7ffc ("pretty: respect color settings [...]", 2017-07-13). > > Signed-off-by: Katrin Leinweber > --- Thanks for spott

Re: [PATCH] ci: make sure we build Git parallel

Junio C Hamano writes: > Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the > same treatment, though? We know that "if travis to this, otherwise > if Asure, do that" is the first block to muck with MAKEFLAGS in the > script, but a new assignment before that block can be added in

Re: GSoC 2019: Git's application submitted

Hi Thomas, On Wed, 6 Feb 2019, Thomas Gummerer wrote: > I think the idea here could definitely be split into a couple different > phases, that could be individually useful, and can be merged > individually, though I don't know if they would necessarily be. Good idea. > Of the top of my head: >

Re: Possible minor bug in Git

Hi Giuseppe, On Wed, 6 Feb 2019, Giuseppe Crinò wrote: > 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. Does this h

Re: [ANNOUNCE] Git v2.21.0-rc0

Team, the Windows version of v2.21.0-rc0 can be found here: https://github.com/git-for-windows/git/releases/tag/v2.21.0-rc0.windows.1 Thanks for testing! Johannes On Wed, 6 Feb 2019, Junio C Hamano wrote: > An early preview release Git v2.21.0-rc0 is now available for > testing at the usual pl

Re: [ANNOUNCE] Git v2.21.0-rc0

Hi Junio, On Wed, 6 Feb 2019, Junio C Hamano wrote: > New contributors whose contributions weren't in v2.20.0 are as follows. > Welcome to the Git development community! > > Arti Zirk, Brandon Richardson, Chayoung You, Denis Ovsienko, Erin > Dahlgren, Force Charlie, Frank Dana, Issac Trotts,

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

On Tue, Feb 5, 2019 at 12:39 PM Junio C Hamano wrote: > > Elijah Newren writes: > > >> > Further, in patch format, this changes the from/to headers so that > >> > instead of just having one "from" header, we get one for each parent. > >> > For example, instead of having > >> > > >> > --- a/phoo

Re: [PATCH v3 2/3] submodule--helper: teach config subcommand --unset

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 | 18 -- > t/t7411-submodule-config.sh | 9 + > 2 f

[PATCH 2/2] object: fix leak of shallow_stat

In eee4502baaf ("shallow: migrate shallow information into the object parser", 2018-05-17), we added a stat_validity pointer into the parsed_object_pool struct, but did not add code to free this in parsed_object_pool_clear(). This leak was found by fuzz-commit-graph. Clear the struct and then free

[PATCH 1/2] fuzz-commit-graph: initialize repo object

Various #DEFINE "constants" in commit-graph.c now depend on the_hash_algo->rawsz, but this object must be initialized before it can be used. Signed-off-by: Josh Steadmon --- fuzz-commit-graph.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c index

[PATCH 0/2] Initialize repo object in fuzz-commit-graph

commit-graph.c now depends on the_hash_algo, which means the_repository must be initialized before attempting to load a commit graph. This series adds the initialization and cleanup to fuzz-commit-graph, and fixes a leak it discovered in the cleanup code. Josh Steadmon (2): fuzz-commit-graph: in

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

Elijah Newren writes: > I think "copy from" and "rename from" should be relatively > straightforward. However, in a combined diff, we could have both a > modified status, a renamed status, and a copied status, meaning that > we'll need an array of both similarity and dissimilarity indexes...and

Re: [ANNOUNCE] Git v2.21.0-rc0

Johannes Schindelin writes: > Hi Junio, > > On Wed, 6 Feb 2019, Junio C Hamano wrote: > >> New contributors whose contributions weren't in v2.20.0 are as follows. >> Welcome to the Git development community! >> >> Arti Zirk, Brandon Richardson, Chayoung You, Denis Ovsienko, Erin >> Dahlgren,

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

On Thu, Feb 07, 2019 at 03:26:21PM +0100, Johannes Schindelin wrote: > > So IMHO this isn't really a show-stopper problem, so much as something > > that is a sign of the maturing test/CI setup (I say "maturing", not > > "mature", as it seems we've probably still got a ways to go). As far as > > no

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

On Thu, Feb 07, 2019 at 04:41:57PM +0100, Johannes Schindelin wrote: > > I think this can be limited to the tests that failed, which makes things > > much faster. I.e., we run the tests at the tip of topic X and see that > > t1234 fails. We then go back to the fork point and we just need to run >

Re: [ANNOUNCE] Git v2.21.0-rc0

Junio C Hamano writes: >> Hi Junio, >> >> On Wed, 6 Feb 2019, Junio C Hamano wrote: >> >>> New contributors whose contributions weren't in v2.20.0 are as follows. >>> Welcome to the Git development community! >>> >>> Arti Zirk, Brandon Richardson, Chayoung You, Denis Ovsienko, Erin >>> Dahlg

Re: [PATCH] add_to_index(): convert forgotten HASH_RENORMALIZE check

On Thu, Feb 07, 2019 at 04:18:02AM +, Torsten Bögershausen wrote: > And trying to answer an older question: > > >>>The reason appears to be wrong bit mask usage > >>>#define ADD_CACHE_IGNORE_ERRORS4 > >>>and > >>>#define HASH_RENORMALIZE 4 > > What if we had renamed "flags" like this ?

Re: [PATCH 0/1] Fix incorrectly reported CPU in 32-bit Windows

"Johannes Schindelin via GitGitGadget" writes: > This is yet another patch I forgot to upstream, and I hope that it will make > it into v2.21.0-rc1. I guess this affects nobody other than you and perhaps J6t, the point not being "there are only just two" but being "all of them know how to deal w

Re: GSoC 2019: Git's application submitted

On 02/07, Johannes Schindelin wrote: > Hi Thomas, > > On Wed, 6 Feb 2019, Thomas Gummerer wrote: > > - implement pushing the index state, without dealing with conflicts > > - implement poping the index state, without dealing with conflicts > > > >This can already be individually useful, and

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Hi Junio, On Thu, 7 Feb 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Even when there are even only as much as 12 merge bases to test (which is > > the current number of merge bases between `next` and `pu`),... > > ... > > And I sadly have to report that that's not the end of

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Hi Peff, On Thu, 7 Feb 2019, Jeff King wrote: > On Thu, Feb 07, 2019 at 04:41:57PM +0100, Johannes Schindelin wrote: > > > > I think this can be limited to the tests that failed, which makes things > > > much faster. I.e., we run the tests at the tip of topic X and see that > > > t1234 fails. We

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

Hi Peff, On Thu, 7 Feb 2019, Jeff King wrote: > On Thu, Feb 07, 2019 at 03:26:21PM +0100, Johannes Schindelin wrote: > > > > So IMHO this isn't really a show-stopper problem, so much as > > > something that is a sign of the maturing test/CI setup (I say > > > "maturing", not "mature", as it seem

t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

I'm trying to get the git test suite passing on Alpine Linux, which is based on musl libc. All tests in t0028-working-tree-encoding.sh are currently failing, because musl iconv does not support statefull output of UTF-16/32 (eg, it does not output a BOM), while git is expecting that to be present:

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

On Thu, Feb 7, 2019 at 12:25 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > I think "copy from" and "rename from" should be relatively > > straightforward. However, in a combined diff, we could have both a > > modified status, a renamed status, and a copied status, meaning that > > we'

Re: [PATCH v3 3/3] submodule: teach set-branch subcommand

Denton Liu writes: > @@ -168,6 +169,12 @@ submodule with the `--init` option. > If `--recursive` is specified, this command will recurse into the > registered submodules, and update any nested submodules within. > -- > +set-branch ((-d|--default)|(-b|--branch )) [--] :: > + Sets the defaul

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

Elijah Newren writes: > diff --git a/Documentation/diff-generate-patch.txt > b/Documentation/diff-generate-patch.txt > index 231105cff4..69cb3b0349 100644 > --- a/Documentation/diff-generate-patch.txt > +++ b/Documentation/diff-generate-patch.txt > @@ -144,6 +144,19 @@ Similar to two-line header

Re: [PATCH v3 2/3] submodule--helper: teach config subcommand --unset

Denton Liu writes: > + if (argc == 3 || (argc == 2 && command == DO_UNSET)) { > if (!is_writing_gitmodules_ok()) > die(_("please make sure that the .gitmodules file is in > the working tree")); > > - return config_set_in_gitmodules_file_gentl

Re: [PATCH] ci: make sure we build Git parallel

Hi Junio, On Thu, 7 Feb 2019, Junio C Hamano wrote: > Junio C Hamano writes: > > > Wouldn't all other hits of "MAKEFLAGS=" in ci/lib.sh also want the > > same treatment, though? We know that "if travis to this, otherwise > > if Asure, do that" is the first block to muck with MAKEFLAGS in the >

Re: [PATCH] contrib/subtree: ensure only one rev is provided

]0;joe - On Thu, Feb 7, 2019 at 1:54 PM Junio C Hamano wrote: > I am not sure if the other caller is OK, though. cmd_add_repository > can get more than one revs, and uses the first one as $rev to read > the tree from, expecting that this helper to ignore other ones that > are emitted from 'git r

Re: [PATCH 0/1] Fix incorrectly reported CPU in 32-bit Windows

Hi Junio, On Thu, 7 Feb 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > This is yet another patch I forgot to upstream, and I hope that it > > will make it into v2.21.0-rc1. > > I guess this affects nobody other than you and perhaps J6t, the > point not bei

Re: [PATCH 0/1] git-p4: remove ticket expiration test

On Thu, 7 Feb 2019 13:45:18 +0100 (STD) Johannes Schindelin wrote: > Hi Luke, > > On Wed, 6 Feb 2019, Luke Diamand wrote: > > > 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 > >

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

Elijah Newren writes: > Now, the question: In addition to the two "from" headers, how many > "to" headers do we emit? In particular, do we emit both a "copied to > F" and a "renamed to F" header, or just a combined "renamed/copied to > F" header? There is only a single path that can be on the "

Re: [PATCH] ci: make sure we build Git parallel

Johannes Schindelin writes: >> >> +# Clear MAKEFLAGS that may come from the outside world. >> +export MAKEFLAGS= >> + >> # Set 'exit on error' for all CI scripts to let the caller know that >> # something went wrong. >> # Set tracing executed commands, primarily setting environment variables

[PATCH] ci: clear and mark MAKEFLAGS exported just once

Clearing it once upfront, and turning all the assignment into appending, would future-proof the code even more, to prevent mistakes the previous one fixed from happening again. Also, mark the variable exported just once at the beginning. There is no point in marking it exported repeatedly. Signe

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

On Thu, Feb 7, 2019 at 3:31 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > Now, the question: In addition to the two "from" headers, how many > > "to" headers do we emit? In particular, do we emit both a "copied to > > F" and a "renamed to F" header, or just a combined "renamed/copied

Re: [PATCH v4] log,diff-tree: add --combined-all-names option

On Thu, Feb 7, 2019 at 2:28 PM Junio C Hamano wrote: > > Elijah Newren writes: > > > diff --git a/Documentation/diff-generate-patch.txt > > b/Documentation/diff-generate-patch.txt > > index 231105cff4..69cb3b0349 100644 > > --- a/Documentation/diff-generate-patch.txt > > +++ b/Documentation/diff

Re: t0025 flakey?

On Thu, Feb 07, 2019 at 11:58:08AM -0500, Randall S. Becker wrote: > > The NonStop port has traditionally had issues with t0025, which we tended > > to ignore because things did work. We wrote those off as bash issues in > > t0025 since they seemed to be corrected when we picked up a new bash > > v

Re: [PATCH v6 1/1] protocol: advertise multiple supported versions

On 2019.02.05 11:42, Jonathan Tan wrote: > Thanks. Overall, one major point: I think that the declaration of > supported versions need to be transport-scoped (search this email for > "transport-scoped" for context). And one medium point: it might be > better for protocol.version to be the preferred

Re: [PATCH] ci: clear and mark MAKEFLAGS exported just once

On Thu, Feb 07, 2019 at 03:45:46PM -0800, Junio C Hamano wrote: > Clearing it once upfront, and turning all the assignment into > appending, would future-proof the code even more, to prevent > mistakes the previous one fixed from happening again. > > Also, mark the variable exported just once at t

Re: t0028-working-tree-encoding.sh failing on musl based systems (Alpine Linux)

[Please skip using Reply-To and instead of Mail-Followup-To so that responses also go to the list.] On Thu, Feb 07, 2019 at 10:59:35PM +0100, Kevin Daudt wrote: > I'm trying to get the git test suite passing on Alpine Linux, which is > based on musl libc. > > All tests in t0028-working-tree-encod

Re: [PATCH v3] doc-diff: don't `cd_to_toplevel`

On Thu, Feb 07, 2019 at 03:45:02PM -0500, Jeff King wrote: > Fair enough. As an alternative, do you know offhand if there's an easy > machine-readable way to get the CI results? If I could poll it with curl > and generate my own notifications, that would be fine for me. Well, what do you mean by "

[PATCH v5 2/2] squash! log,diff-tree: add --combined-all-paths option

This also adds "rename from " and "copy from " extended headers when renames or copies are involved. Signed-off-by: Elijah Newren --- Documentation/diff-generate-patch.txt | 7 +++ combine-diff.c| 15 +++ 2 files changed, 18 insertions(+), 4 deletions(-)

[PATCH v5 0/2] add --combined-all-paths option to log and diff-tree

Changes since v4: * Added a second patch that can be squashed in which will add 'rename from' and 'copy from' extended headers. I like it, but Junio sounded pessimistic about it. See https://public-inbox.org/git/xmqqlg2rmazz@gitster-ct.c.googlers.com/ * Micro fixes: * Rena

[PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

The combined diff format for merges will only list one filename, even if rename or copy detection is active. For example, with raw format one might see: ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh ::100644 100

Re: New command/tool: git filter-repo

Hi, On Thu, Jan 31, 2019 at 12:57 AM Elijah Newren wrote: > git-filter-repo[1], a filter-branch-like tool for rewriting repository > history, is ready for more widespread testing and feedback. The rough Someone at the Contributor Summit (Michael Haggerty perhaps?) asked me about performance nu

`git status -u no` suppresses modified files too.

This broke my "is this clean?" sanity check and very much violates the man page description. (I am now using `git diff --name-only` instead at Joel's suggestion.) $ git status On branch guilt/repro Changes not staged for commit: (use "git add ..." to update what

Re: `git status -u no` suppresses modified files too.

On Fri, Feb 08, 2019 at 12:18:57PM +1030, Rusty Russell wrote: > This broke my "is this clean?" sanity check and very much violates > the man page description. Wow, this one had me scratching my head for a minute. What you're describing here: > $ git status -u no > On branch guil

  1   2   >