Re: git rebase --continue after solving conflicts doesn't work anymore

[cc:+phillip.w...@talktalk.net] On Tue, Feb 19, 2019 at 1:45 AM Christian Couder wrote: > On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla > wrote: > > But since Git 2.20.x it doesn't work anymore. Now after solving the > > conflicts > > and running "git rebase --continue" I get this error m

Antw: Antw:

>>> Elijah Newren schrieb am 18.02.2019 um 19:41 in Nachricht <20190218184147.7563-1-new...@gmail.com>: > Hi Ulrich, > > Sorry for the late reply... No problem, thanks for the explanation. I'll "fast forward" directly to the patch below and comment inline: -- Ulrich [...] > ‑‑ 8< ‑‑ > Subject:

Re: git rebase --continue after solving conflicts doesn't work anymore

On Tue, Feb 19, 2019 at 5:20 AM Sebastián Mancilla wrote: > > I've always used "git rebase --continue" as the help shows: > > Resolve all conflicts manually, mark them as resolved with > "git add/rm ", then run "git rebase --continue". > > and Git would apply the conflicted commit without

Re: [PATCH 6/8] checkout: add --cached option

On Sat, Feb 2, 2019 at 12:57 AM Junio C Hamano wrote: > > Duy Nguyen writes: > > > Of course we could just do --index and --worktree, each option > > restores the respective part. Then it's combinable (and extensible in > > the future). But then "git restore" means "git restore --index > > --work

git rebase --continue after solving conflicts doesn't work anymore

I've always used "git rebase --continue" as the help shows: Resolve all conflicts manually, mark them as resolved with "git add/rm ", then run "git rebase --continue". and Git would apply the conflicted commit without issues and the rebase would continue. But since Git 2.20.x it doesn't

GOOD NEWS

WINDOWS PROMOTION-1.docx Description: MS-Word 2007 document

RE: Delivery Status Notification (Failure)

> -Original Message- > From: Johannes Schindelin > Sent: Monday, February 18, 2019 4:00 PM > > On Mon, 18 Feb 2019, Senol Yazici wrote: > > > > I just stumbled over following page > > > > https://git-scm.com/about/distributed > > > > and was wondering if it is possible to > > > > - demilit

Re: [PATCH v12 18/26] stash: convert push to builtin

On Tue, Feb 12, 2019 at 11:18:37PM +, Thomas Gummerer wrote: > Thanks. I still didn't manage to reproduce it locally, but I was now > able to test it on Travis CI. > > The diff below fixes the issue, but I still need to spend some time to > better understand why it does. There is nothing lik

[PATCH v2 10/35] notes: make hash size independent

Switch out various uses of the GIT_SHA1_* constants with GIT_MAX_* constants for allocations and the_hash_algo for general parsing. Update a comment to no longer be SHA-1 specific. Signed-off-by: brian m. carlson --- notes.c | 32 +--- 1 file changed, 17 insertions(+

[PATCH v2 09/35] notes-merge: switch to use the_hash_algo

Switch from using GIT_SHA1_HEXSZ to GIT_MAX_HEXSZ and the_hash_algo so that the code works with any hash algorithm. Signed-off-by: brian m. carlson --- notes-merge.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index 280aa8e6c1..2fe724f1

[PATCH v2 13/35] builtin/name-rev: make hash-size independent

Use the_hash_algo when parsing instead of GIT_SHA1_HEXSZ so that this function works with any size hash. Rename the variable forty to counter, as this is a better name and is independent of the hash size. Signed-off-by: brian m. carlson --- builtin/name-rev.c | 14 -- 1 file changed

[PATCH v2 34/35] Git.pm: make hash size independent

The cat_blob function was matching on exactly 40 hex characters. This won't work with SHA-256, which uses 64-character hex object IDs. While it should be fine to simply match any number of hex characters since the output is space delimited, be extra safe by matching either exactly 40 or exactly 6

[PATCH v2 04/35] pack-bitmap: convert struct stored_bitmap to object_id

Convert struct stored_bitmap to use struct object_id. Signed-off-by: brian m. carlson --- pack-bitmap.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index b53f37243c..c760913cea 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@ -18,7 +

[PATCH v2 05/35] pack-bitmap: replace sha1_to_hex

Replace the uses of sha1_to_hex in the pack bitmap code with hash_to_hex to allow the use of SHA-256 as well. Rename a few variables since they are no longer limited to SHA-1. Signed-off-by: brian m. carlson --- pack-bitmap-write.c | 6 +++--- pack-bitmap.c | 8 2 files changed,

[PATCH v2 01/35] t/lib-submodule-update: use appropriate length constant

Instead of using a specific invalid hard-coded object ID, produce one of the appropriate length by using test_oid. Signed-off-by: brian m. carlson --- t/lib-submodule-update.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-updat

[PATCH v2 15/35] fast-import: replace sha1_to_hex

Replace the uses of sha1_to_hex in this function with hash_to_hex to allow the use of SHA-256 as well. Rename a variable since it is no longer limited to SHA-1. Signed-off-by: brian m. carlson --- fast-import.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fast-import.

[PATCH v2 26/35] hash: add a function to lookup hash algorithm by length

There are some cases, such as the dumb HTTP transport and bundles, where we can only determine the hash algorithm in use by the length of the object IDs. Provide a function that looks up the algorithm by length. Signed-off-by: brian m. carlson --- hash.h | 2 ++ sha1-file.c | 8 2

[PATCH v2 28/35] builtin/get-tar-commit-id: make hash size independent

To make this code independent of the hash size, verify that the length of the comment is equal to that of any supported hash algorithm. Signed-off-by: brian m. carlson --- builtin/get-tar-commit-id.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/builtin/get-tar-commit-id.

[PATCH v2 25/35] remote-curl: make hash size independent

Change one hard-coded use of the constant 40 to a reference to the_hash_algo. In addition, switch a use of get_oid_hex to parse_oid_hex to avoid the need to use a constant. Signed-off-by: brian m. carlson --- remote-curl.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff

[PATCH v2 23/35] http: compute hash of downloaded objects using the_hash_algo

Signed-off-by: brian m. carlson --- http.c | 10 +- http.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 993ddc956a..458d07fabb 100644 --- a/http.c +++ b/http.c @@ -2337,8 +2337,8 @@ static size_t fwrite_sha1_file(char *ptr, size_t eltsize,

[PATCH v2 30/35] refspec: make hash size independent

Switch a use of GIT_SHA1_HEXSZ to use the_hash_algo. Signed-off-by: brian m. carlson --- refspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refspec.c b/refspec.c index f529092fd6..9a9bf21934 100644 --- a/refspec.c +++ b/refspec.c @@ -72,7 +72,7 @@ static int parse_refs

[PATCH v2 06/35] pack-bitmap: switch hard-coded constants to the_hash_algo

Switch two hard-coded uses of 20 to references to the_hash_algo. Signed-off-by: brian m. carlson --- pack-bitmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pack-bitmap.c b/pack-bitmap.c index 6d6fa68563..603492c237 100644 --- a/pack-bitmap.c +++ b/pack-bitmap.c @@

[PATCH v2 29/35] archive: convert struct archiver_args to object_id

Change the commit_sha1 member to be called "commit_oid" and change it to be a pointer to struct object_id. Additionally, update some uses of GIT_SHA1_HEXSZ and hard-coded values to use the_hash_algo instead. Signed-off-by: brian m. carlson --- archive-tar.c | 7 --- archive-zip.c | 10

[PATCH v2 24/35] http: replace sha1_to_hex

Since sha1_to_hex is limited to SHA-1, replace it with hash_to_hex. Signed-off-by: brian m. carlson --- http.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/http.c b/http.c index 458d07fabb..8ab07458e4 100644 --- a/http.c +++ b/http.c @@ -2079,19 +2079,19 @@ in

[PATCH v2 12/35] object-store: rename and expand packed_git's sha1 member

This member is used to represent the pack checksum of the pack in question. Expand this member to be GIT_MAX_RAWSZ bytes in length so it works with longer hashes and rename it to be "hash" instead of "sha1". This transformation was made with a change to the definition and the following semantic pa

[PATCH v2 14/35] fast-import: make hash-size independent

Replace several uses of GIT_SHA1_HEXSZ and 40-based constants with references to the_hash_algo. Update the note handling code here to compute path sizes based on GIT_MAX_RAWSZ as well. Signed-off-by: brian m. carlson --- fast-import.c | 45 + 1 file c

[PATCH v2 27/35] get-tar-commit-id: parse comment record

From: Rene Scharfe Parse pax comment records properly and get rid of magic numbers for acceptable comment length. This simplifies a later change to handle longer hashes. Signed-off-by: Rene Scharfe Signed-off-by: brian m. carlson --- builtin/get-tar-commit-id.c | 13 +++-- 1 file cha

[PATCH v2 17/35] builtin/pull: make hash-size independent

Instead of using get_oid_hex and GIT_SHA1_HEXSZ, use parse_oid_hex to avoid the need for a constant and simplify the code. Additionally, fix some comments to refer to object IDs instead of SHA-1 and update a constant used to provide an allocation hint. Signed-off-by: brian m. carlson --- builti

[PATCH v2 20/35] http-push: remove remaining uses of sha1_to_hex

Since sha1_to_hex is limited to SHA-1, switch all remaining uses of it in this file to hash_to_hex or oid_to_hex. Modify update_remote to take a pointer to struct object_id, and since we don't modify that parameter in the function, set it to be const as well. Signed-off-by: brian m. carlson ---

[PATCH v2 31/35] builtin/difftool: use parse_oid_hex

Instead of using get_oid_hex and adding constants to the result, use parse_oid_hex to make this code independent of the hash size. Additionally, correct a typo that would cause us to print one too few characters on error, since we will already have incremented the pointer to point to the beginning

[PATCH v2 16/35] builtin/am: make hash size independent

Instead of using GIT_SHA1_HEXSZ, switch to using the_hash_algo and parse_oid_hex to parse the lines involved in rebasing notes. Signed-off-by: brian m. carlson --- builtin/am.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/am.c b/builtin/am.c index 58a2aef2

[PATCH v2 22/35] http: replace hard-coded constant with the_hash_algo

Replace a hard-coded 40 with a reference to the_hash_algo. Signed-off-by: brian m. carlson --- http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/http.c b/http.c index a09adc518f..993ddc956a 100644 --- a/http.c +++ b/http.c @@ -2065,7 +2065,7 @@ int http_fetch_ref(const c

[PATCH v2 33/35] read-cache: read data in a hash-independent way

Index entries are structured with a variety of fields up front, followed by a hash and one or two flags fields. Because the hash field is stored in the middle of the structure, it's difficult to use one fixed-size structure that easily allows access to the hash and flags fields. Adjust the structu

[PATCH v2 32/35] dir: make untracked cache extension hash size independent

Instead of using a struct with a flex array member to read and write the untracked cache extension, use a shorter, fixed-length struct and add the name and hash data explicitly. Signed-off-by: brian m. carlson --- dir.c | 28 ++-- 1 file changed, 14 insertions(+), 14 dele

[PATCH v2 19/35] http-backend: allow 64-character hex names

In an SHA-256-backed repository using the http-backend handler for dumb protocol clients, it may be necessary to access the raw packs using their full SHA-256-specified names. Allow packs and loose objects to be accessed using their full SHA-256-specified 64-character hex names. Signed-off-by: br

[PATCH v2 21/35] http-walker: replace sha1_to_hex

Since sha1_to_hex is limited to SHA-1, replace the uses of it in this file with hash_to_hex. Rename several variables accordingly to reflect that they are no longer limited to SHA-1. Signed-off-by: brian m. carlson --- http-walker.c | 18 +- 1 file changed, 9 insertions(+), 9 de

[PATCH v2 35/35] gitweb: make hash size independent

Gitweb has several hard-coded 40 values throughout it to check for values that are passed in or acquired from Git. To simplify the code, introduce a regex variable that matches either exactly 40 or exactly 64 hex characters, and use this variable anywhere we would have previously hard-coded a 40 i

[PATCH v2 03/35] pack-bitmap: make bitmap header handling hash agnostic

Increase the checksum field in struct bitmap_disk_header to be GIT_MAX_RAWSZ bytes in length and ensure that we hash the proper number of bytes out when computing the bitmap checksum. Signed-off-by: brian m. carlson --- pack-bitmap-write.c | 2 +- pack-bitmap.c | 2 +- pack-bitmap.h

[PATCH v2 00/35] Hash function transition part 16

This is the sixteenth series of hash function transition patches. Note that the patches khash patches use a different name (kh_oid_map_t) than the SHA-1 type (kh_sha1_t). The _oid names are already used by the oidset code, which uses a set approach, not a map approach. This series has slightly mo

[PATCH v2 02/35] khash: move oid hash table definition

Move the oid khash table definition to khash.h and define a typedef for it, similar to the one we have for unsigned char pointers. Define variants that are maps as well. Signed-off-by: brian m. carlson --- khash.h | 18 ++ oidset.h | 12 2 files changed, 18 insertio

[PATCH v2 11/35] notes: replace sha1_to_hex

Replace the uses of sha1_to_hex in this function with hash_to_hex to allow the use of SHA-256 as well. Rename some variables since this code is no longer limited to SHA-1. Signed-off-by: brian m. carlson --- notes.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git

[PATCH v2 18/35] http-push: convert to use the_hash_algo

Switch the lock token code to use the_hash_algo and increase its buffers to be allocated using GIT_MAX_* constants. Update the parsing of object paths to use the_hash_algo as well. Signed-off-by: brian m. carlson --- http-push.c | 20 ++-- 1 file changed, 10 insertions(+), 10 de

[PATCH v2 08/35] submodule: avoid hard-coded constants

Instead of using hard-coded 40-based constants, express these values in terms of the_hash_algo and GIT_MAX_HEXSZ. Signed-off-by: brian m. carlson --- merge-recursive.c | 2 +- submodule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/merge-recursive.c b/merge-recur

[PATCH v2 07/35] pack-bitmap: switch hash tables to use struct object_id

Instead of storing unsigned char pointers in the hash tables, switch to storing instances of struct object_id. Update several internal functions and one external function to take pointers to struct object_id. Signed-off-by: brian m. carlson --- builtin/pack-objects.c | 6 ++--- pack-bitmap.c

Re: [GSoC][PATCH 2/2] clone: use dir-iterator to avoid explicit dir traversal

On 02/18, Matheus Tavares Bernardino wrote: > On Sat, Feb 16, 2019 at 12:38 PM Thomas Gummerer wrote: > > > > On 02/15, Matheus Tavares wrote: > > > - struct dirent *de; > > > - struct stat buf; > > > int src_len, dest_len; > > > - DIR *dir; > > > - > > > - dir = opendir(src-

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

Hi, On Mon, 18 Feb 2019, Johannes Schindelin wrote: > On Sat, 16 Feb 2019, Junio C Hamano wrote: > > > [...] but I'm inclined to > > > > - keep b46221ff in 'master', not reverted. > > - apply Max's "t5562: do not reuse output files" > > > > to 'master' and hope that we can declare victory in

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On February 18, 2019 15:41, Johannes Schindelin wrote: > To: Randall S. Becker > Cc: 'Junio C Hamano' ; 'Johannes Schindelin via > GitGitGadget' ; git@vger.kernel.org; 'Max Kirillov' > > Subject: RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1 > > Hi Randall, > > On Thu, 14 Feb 201

Re: default gpg signing key

On Mon, Feb 18, 2019 at 03:12:32PM -0500, Marco Sirabella wrote: > Hi all, > > When signing a commit with git, the newer of two signing keys under my main > master key is used. This is even the case when `default-key` is set in > `gpg.conf` (`gpg --sign` uses the correct key). > > Is there any wa

Re: [GSoC][PATCH 1/2] clone: extract function from copy_or_link_directory

On Sat, Feb 16, 2019 at 4:23 AM Christian Couder wrote: > > On Fri, Feb 15, 2019 at 5:39 PM Matheus Tavares > wrote: > > > > Extract dir creation code snippet from copy_or_link_directory to its own > > function named mkdir_if_missing. This change will help removing > > copy_or_link_directory's ex

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On Mon, Feb 18, 2019 at 10:06:21PM +0100, Ævar Arnfjörð Bjarmason wrote: >> But in our attempt to exit(), we try to "cleanup children" and that >> is what gets stuck. > > I have not paid enough attention to this thread to say if this is dumb, > but just in case it's useful. For this class of probl

Re: [GSoC][PATCH 2/2] clone: use dir-iterator to avoid explicit dir traversal

On Sat, Feb 16, 2019 at 12:38 PM Thomas Gummerer wrote: > > On 02/15, Matheus Tavares wrote: > > Replace usage of opendir/readdir/closedir API to traverse directories > > recursively, at copy_or_link_directory function, by the dir-iterator > > API. > > > > Signed-off-by: Matheus Tavares > > --- >

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On Thu, Feb 14 2019, Junio C Hamano wrote: > "Randall S. Becker" writes: > >> Unfortunately, subtest 13 still hangs on NonStop, even with this >> patch, so our Pipeline still hangs. I'm glad it's better on Azure, >> but I don't think this actually addresses the root cause of the >> hang. > > Si

Re: [PATCH 2/2] setup: don't fail if commondir reference is deleted.

On Mon, Feb 18, 2019 at 12:05 PM Michal Suchanek wrote: > When adding wotktrees git can die in get_common_dir_noenv while > examining existing worktrees because the commondir file does not exist. > Rather than testing if the file exists before reading it handle ENOENT. This commit message leaves

Re: [PATCH 30/31] Git.pm: make hash size independent

On Mon, Feb 18 2019, brian m. carlson wrote: > On Tue, Feb 12, 2019 at 11:59:27AM +0100, Ævar Arnfjörð Bjarmason wrote: >> The gitweb code doesn't load Git.pm now, but does anyone know a reason >> for why we'd avoid any perl/* dependency in the gitweb code? If not the >> regex here & in gitweb c

Re: Delivery Status Notification (Failure)

Hi, On Mon, 18 Feb 2019, Senol Yazici wrote: > Hi all, > > I just stumbled over following page > > https://git-scm.com/about/distributed > > and was wondering if it is possible to > > - demilitarise that “dictator/lieutenant” thing and > - de-religionise that “blessed” thing > > I did not h

Re: [PATCH] t5562: chunked sleep to avoid lost SIGCHILD

On Mon, Feb 18, 2019 at 03:54:27PM -0500, Randall S. Becker wrote: > On February 18, 2019 15:50, Max Kirillov wrote: > > To: SZEDER Gábor ; git@vger.kernel.org > > Cc: Max Kirillov ; Johannes Schindelin > > ; Randall S. Becker > > ; 'Junio C Hamano' > > Subject: [PATCH] t5562: chunked sleep to avo

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On February 18, 2019 15:47, I wrote: > On February 18, 2019 15:41, Johannes Schindelin wrote: > > On Thu, 14 Feb 2019, Randall S. Becker wrote: > > > > > On February 14, 2019 17:39, Junio C Hamano wrote: > > > > To: Randall S. Becker > > > > Cc: 'Johannes Schindelin via GitGitGadget' > > > > ; git

Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On Mon, Feb 18, 2019 at 03:46:34PM -0500, Randall S. Becker wrote: > On February 18, 2019 15:41, Johannes Schindelin wrote: > > So could you try with this patch? > > > > -- snipsnap -- > > diff --git a/http-backend.c b/http-backend.c index d5cea0329a..7c1b4a2555 > > 100644 > > --- a/http-backend.c

RE: [PATCH] t5562: chunked sleep to avoid lost SIGCHILD

On February 18, 2019 15:50, Max Kirillov wrote: > To: SZEDER Gábor ; git@vger.kernel.org > Cc: Max Kirillov ; Johannes Schindelin > ; Randall S. Becker > ; 'Junio C Hamano' > Subject: [PATCH] t5562: chunked sleep to avoid lost SIGCHILD > > If was found during stress-test run that a test may hang

[PATCH] t5562: chunked sleep to avoid lost SIGCHILD

If was found during stress-test run that a test may hang by 60 seconds. It supposedly happens because SIGCHILD was received before sleep has started. Fix by looping by smaller chunks, checking $exited after each of them. Then lost SIGCHILD would not cause longer delay than 1 second. Reported-by:

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

On February 18, 2019 15:41, Johannes Schindelin wrote: > On Thu, 14 Feb 2019, Randall S. Becker wrote: > > > On February 14, 2019 17:39, Junio C Hamano wrote: > > > To: Randall S. Becker > > > Cc: 'Johannes Schindelin via GitGitGadget' ; > > > git@vger.kernel.org; 'Max Kirillov' > > > Subject: R

RE: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-rc1

Hi Randall, On Thu, 14 Feb 2019, Randall S. Becker wrote: > On February 14, 2019 17:39, Junio C Hamano wrote: > > To: Randall S. Becker > > Cc: 'Johannes Schindelin via GitGitGadget' ; > > git@vger.kernel.org; 'Max Kirillov' > > Subject: Re: [PATCH 0/1] Fix hang in t5562, introduced in v2.21.0-

Re: [PATCH] git-rebase.txt: update to reflect merge now implemented on sequencer

Hi Elijah, On Thu, 14 Feb 2019, Elijah Newren wrote: > Since commit 8fe9c3f21dff (Merge branch 'en/rebase-merge-on-sequencer', > 2019-02-06), --merge now uses the interactive backend (and matches its > behavior) so there is no separate merge backend anymore. Fix an > oversight in the docs that s

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

On February 18, 2019 15:25, Max Kirillov wrote: > On Sat, Feb 16, 2019 at 10:57:52AM -0800, Junio C Hamano wrote: > > I'm inclined to > > > > - keep b46221ff in 'master', not reverted. > > from the branch, cc95bc2025 "t5562: replace /dev/zero with a pipe from > generate_zero_bytes" could be repla

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

On Sat, Feb 16, 2019 at 10:57:52AM -0800, Junio C Hamano wrote: > I'm inclined to > > - keep b46221ff in 'master', not reverted. from the branch, cc95bc2025 "t5562: replace /dev/zero with a pipe from generate_zero_bytes" could be replaced with [1] "t5562: do not depend on /dev/zero", for simplic

default gpg signing key

Hi all, When signing a commit with git, the newer of two signing keys under my main master key is used. This is even the case when `default-key` is set in `gpg.conf` (`gpg --sign` uses the correct key). Is there any way to tell git to not use the `--local-user` flag when signing, and just let `gp

Re: [BUG] More on t5562 hangs randomly in subtests 6,8 and 13 in 2.21.0-rc0

Hi Max, On Wed, 13 Feb 2019, Max Kirillov wrote: > On Wed, Feb 13, 2019 at 10:16:26AM -0500, randall.s.bec...@rogers.com wrote: > > On 2019-02-13, Max Kirillov, wrote: > > As far as the unintended reuse of the output file, and issues with pipes, > > yes, the NonStop is very sensitive to complex u

Re: How to get next commit that just after a specified commit

On 2/13/2019 4:36 PM, Ævar Arnfjörð Bjarmason wrote: > > On Wed, Feb 13 2019, Junio C Hamano wrote: > >> Ævar Arnfjörð Bjarmason writes: > > Their point in comparing it to git is that there's nothing intuitive in > the UI that exposes this information for the *current* graph, whereas in > fossi

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

Hi Junio, On Sat, 16 Feb 2019, Junio C Hamano wrote: > "Randall S. Becker" writes: > > >> > The current condition of the code is (the generate_zero_bytes delete > >> > was previously removed so can be ignored for the patch): > >> > >> Just to make sure I do not misunderstand, this result is wi

Re: [PATCH 30/31] Git.pm: make hash size independent

On Tue, Feb 12, 2019 at 11:59:27AM +0100, Ævar Arnfjörð Bjarmason wrote: > The gitweb code doesn't load Git.pm now, but does anyone know a reason > for why we'd avoid any perl/* dependency in the gitweb code? If not the > regex here & in gitweb could be factored into e.g. a tiny Git::OID > library

Re: [PATCH 1/1] mingw: safe-guard a bit more against getenv() problems

Hi Jeff, On Fri, 15 Feb 2019, Jeff Hostetler wrote: > On 2/15/2019 10:17 AM, Johannes Schindelin via GitGitGadget wrote: > > From: Johannes Schindelin > > > > diff --git a/compat/mingw.c b/compat/mingw.c > > index 4276297595..8141f77189 100644 > > --- a/compat/mingw.c > > +++ b/compat/mingw.c >

RE: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

On February 18, 2019 13:46, Junio C Hamano wrote: > Junio C Hamano writes: > > > I have been wondering about the whole /dev/zero business. Although we > > have b46221ff ("Merge branch 'rb/no-dev-zero-in-test'", > > 2019-02-13) in 'master', "git grep /dev/zero t" has hits in > > t/helper/test-sha

Re: [ANNOUNCE] Git v2.21.0-rc1 (NonStop Results) - Good News

Junio C Hamano writes: > I have been wondering about the whole /dev/zero business. Although > we have b46221ff ("Merge branch 'rb/no-dev-zero-in-test'", > 2019-02-13) in 'master', "git grep /dev/zero t" has hits in > t/helper/test-sha1.sh and t/t4152-am-resume-override-opts.sh, so it > must have

[no subject]

Hi Ulrich, Sorry for the late reply... On Tue, Jan 22, 2019 at 11:04 PM Ulrich Windl wrote: > >>> Elijah Newren schrieb am 22.01.2019 um 22:29 in > Nachricht > > On Tue, Jan 22, 2019 at 1:05 PM Ulrich Windl > > wrote: > >> > >> Using git version 2.16.4 on OpenSUSE Leap 15.0, it seems that "--

Re: [RFE] Demilitarize Documentation (was RE: Delivery Status Notification (Failure))

"Randall S. Becker" writes: >> Taking a lesson from other Open Source projects, Jenkins has deprecated >> Master/Slave in favour of Controller/Agent. This seems not only more >> acceptable to some, but in my view more descriptive. The terms on the page >> above do not actually make any descriptiv

Re: [RFE] Demilitarize Documentation (was RE: Delivery Status Notification (Failure))

Hello, On Mon, 18 Feb 2019 11:51:57 -0500 "Randall S. Becker" wrote: > On February 18, 2019 11:13, I wrote: > > To: 'Senol Yazici' ; git@vger.kernel.org > > Subject: RE: Delivery Status Notification (Failure) > > > > On February 18, 2019 5:47, Senol Yazici > > > I just stumbled over following

[PATCH 0/2] worktree add race fix

Hello, I am running a git automation script that crates a tree and commmits it into a git repository repeatedly. I noticed that the step which creates a tree is most time-consuming part of the script and when a lot of data is to be automatically added to the repository it is benefical to parallel

[PATCH 1/2] worktree: fix worktree add race.

Git runs a stat loop to find a worktree name that's available and then does mkdir on the found name. Turn it to mkdir loop to avoid another invocation of worktree add finding the same free name and creating the directory first. Signed-off-by: Michal Suchanek --- v2: - simplify loop exit condition

[PATCH 2/2] setup: don't fail if commondir reference is deleted.

When adding wotktrees git can die in get_common_dir_noenv while examining existing worktrees because the commondir file does not exist. Rather than testing if the file exists before reading it handle ENOENT. Signed-off-by: Michal Suchanek --- v2: - do not test file existence first, just read it a

Re: [RFE] Demilitarize Documentation (was RE: Delivery Status Notification (Failure))

On February 18, 2019 11:13, I wrote: > To: 'Senol Yazici' ; git@vger.kernel.org > Subject: RE: Delivery Status Notification (Failure) > > On February 18, 2019 5:47, Senol Yazici > > I just stumbled over following page > > > > https://git-scm.com/about/distributed > > > > and was wondering if it is

RE: [BUG] ls-files showing deleted files (unchecked lstat return value)

On February 18, 2019 10:17, SZEDER Gábor wrote: > To: Joe Ranieri > Cc: git@vger.kernel.org > Subject: Re: [BUG] ls-files showing deleted files (unchecked lstat return > value) > > On Sun, Feb 17, 2019 at 08:49:39AM -0500, Joe Ranieri wrote: > > "git ls-files -m" can show deleted files, despite -

RE: Delivery Status Notification (Failure)

On February 18, 2019 5:47, Senol Yazici > I just stumbled over following page > > https://git-scm.com/about/distributed > > and was wondering if it is possible to > > - demilitarise that “dictator/lieutenant” thing and > - de-religionise that “blessed” thing > > I did not had the feeling that g

Re: [PATCH 1/1] tests: teach the test-tool to generate NUL bytes and use it

Hi Junio, On Fri, 15 Feb 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Thu, 14 Feb 2019, Junio C Hamano wrote: > > > >> "Johannes Schindelin via GitGitGadget" > >> writes: > >> > >> > From: Johannes Schindelin > >> > > >> > In cc95bc2025 (t5562: replace /dev/zero with a

Re: [ANNOUNCE] Git v2.21.0-rc1

Sorry for the late reply, Git for Windows v2.21.0-rc1 is available (since Thursday night, actually) from here: https://github.com/git-for-windows/git/releases/tag/v2.21.0-rc1.windows.1 I would be highly grateful for extensive testing, also for -rc2 (because we just updated the MSYS2 runtime

Re: git gc fails with "unable to resolve reference" for worktree

On Mon, Feb 18, 2019 at 10:09 PM wrote: > > > > On Пн, Feb 18, 2019 at 6:02 PM, Duy Nguyen wrote: > > On Mon, Feb 18, 2019 at 9:44 PM wrote: > >> > >> # Steps to reproduce (in terms of terminal commands) > >> > >> $ mkdir foo > >> $ cd foo > >> $ git init > >> Initialized em

Re: [BUG] ls-files showing deleted files (unchecked lstat return value)

On Sun, Feb 17, 2019 at 08:49:39AM -0500, Joe Ranieri wrote: > "git ls-files -m" can show deleted files, despite -d not having been > specified. To my understanding that's intentional: a deleted file is considered modified, because its content clearly doesn't match the tracked content. > This i

Re: git gc fails with "unable to resolve reference" for worktree

On Пн, Feb 18, 2019 at 6:02 PM, Duy Nguyen wrote: On Mon, Feb 18, 2019 at 9:44 PM wrote: # Steps to reproduce (in terms of terminal commands) $ mkdir foo $ cd foo $ git init Initialized empty Git repository in /tmp/foo/.git/ $ echo hello > testfile $ git add

Re: git gc fails with "unable to resolve reference" for worktree

On Mon, Feb 18, 2019 at 9:44 PM wrote: > > # Steps to reproduce (in terms of terminal commands) > > $ mkdir foo > $ cd foo > $ git init > Initialized empty Git repository in /tmp/foo/.git/ > $ echo hello > testfile > $ git add testfile && git commit -m "my commit1" > [m

git gc fails with "unable to resolve reference" for worktree

# Steps to reproduce (in terms of terminal commands) $ mkdir foo $ cd foo $ git init Initialized empty Git repository in /tmp/foo/.git/ $ echo hello > testfile $ git add testfile && git commit -m "my commit1" [master (root-commit) d5f0b47] my commit1 1 file changed, 1 inse

Re: [BUG] ls-files showing deleted files (unchecked lstat return value)

On 2/17/19 10:59, Randall S. Becker wrote: On February 17, 2019 8:50, Joe Ranieri wrote: "git ls-files -m" can show deleted files, despite -d not having been specified. This is due to ls-files.c's show_files function calling lstat but not checking the return value before calling ie_modified wit

Re: Delivery Status Notification (Failure)

Hi all, I just stumbled over following page https://git-scm.com/about/distributed and was wondering if it is possible to - demilitarise that “dictator/lieutenant” thing and - de-religionise that “blessed” thing I did not had the feeling that git is “pro military”, or is against “non religious”

Re: [PATCH 1/1] Introduce "precious" file concept

On Mon, Feb 18, 2019 at 4:53 PM Ævar Arnfjörð Bjarmason wrote: > > > On Sun, Feb 17 2019, Duy Nguyen wrote: > > > On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason > > wrote: > >> > >> > >> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote: > >> > >> [Re-CC some people involved the last time

Re: [PATCH v7 1/3] ref-filter: add worktreepath atom

Well, it sounded like we didn't like the ":" extender from another conversation on this thread. Do you think this patch should move back in that direction? On Tue, Feb 5, 2019 at 3:14 AM Junio C Hamano wrote: > > Nickolai Belakovski writes: > > > There's been a little back and forth on it, but m

Re: [PATCH 1/1] Introduce "precious" file concept

On Sun, Feb 17 2019, Duy Nguyen wrote: > On Sun, Feb 17, 2019 at 2:36 AM Ævar Arnfjörð Bjarmason > wrote: >> >> >> On Sat, Feb 16 2019, Nguyễn Thái Ngọc Duy wrote: >> >> [Re-CC some people involved the last time around] >> >> > A new attribute "precious" is added to indicate that certain files

Re: [PATCH 2/2] setup: don't fail if commondir is deleted.

On Sun, 17 Feb 2019 02:14:14 -0500 Eric Sunshine wrote: > On Fri, Feb 15, 2019 at 1:16 PM Michal Suchanek wrote: > > When adding wotktrees git can die in get_common_dir_noenv while > > examining existing worktrees because the commondir file does not exist. > > Handle ENOENT so adding a worktree