Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-26 Thread Eric Sunshine
On Tue, Feb 26, 2019 at 12:59 AM Martin Ågren wrote: > On Mon, 25 Feb 2019 at 22:01, Eric Sunshine wrote: > > I guess I was further confused by the fact that manpage-base-url.xsl > > is still present even after "make distclean", which is not something I > > woul

Re: [GSoC] Introduction

2019-02-25 Thread Eric Sunshine
On Mon, Feb 25, 2019 at 3:22 PM Christian Couder wrote: > On Mon, Feb 25, 2019 at 12:36 PM Rohit Ashiwal > wrote: > > I don't think I quite understood this. Were you asking for replacing > > all `test -X` calls with `test_path_is_*` calls in only one t-*.sh > > file or `test -d` calls with `t

Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-25 Thread Eric Sunshine
On Mon, Feb 25, 2019 at 3:29 PM Martin Ågren wrote: > On Mon, 25 Feb 2019 at 21:08, Eric Sunshine wrote: > > On Mon, Feb 25, 2019 at 3:03 PM Martin Ågren wrote: > > > -%.1 %.5 %.7 : %.xml manpage-base-url.xsl > > > +%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcar

Re: [PATCH 1/3] Documentation/Makefile: add missing xsl dependencies for manpages

2019-02-25 Thread Eric Sunshine
On Mon, Feb 25, 2019 at 3:03 PM Martin Ågren wrote: > These stylesheets very rarely change, but when they do, it really helps > if the manpages depend on them. We're casting the net a bit too wide > here, since we'll only ever use a subset of the stylesheets, but since > these files change so rare

Re: [PATCH 7/8] commit-graph write: don't die if the existing graph is corrupt

2019-02-23 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 6:13 PM Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh > > @@ -408,7 +414,7 @@ test_expect_success 'detect permission problem' ' > > # "chmod 000 file" does not yield EACCES on e.g. "cat fil

Re: [PATCH 3/3] format-patch: --no-clobber refrains from overwriting output files

2019-02-22 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 3:11 PM Junio C Hamano wrote: > If you keep an output for an older iteration of the same topic in > the same directory around and use "git format-patch" to prepare a > newer iteration of the topic, those commits that happen to be at the > same position in the series that ha

Re: [PATCH 1/3] builtin/log: downcase the beginning of error messages

2019-02-22 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 3:11 PM Junio C Hamano wrote: > diff --git a/builtin/log.c b/builtin/log.c > @@ -911,7 +911,7 @@ static void get_patch_ids(struct rev_info *rev, struct > patch_ids *ids) > if (rev->pending.nr != 2) > - die(_("Need exactly one range.")); > +

Re: [PATCH v2 5/5] remote-curl: use post_rpc() for protocol v2 also

2019-02-22 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 8:18 AM Eric Sunshine wrote: > On Thu, Feb 21, 2019 at 3:25 PM Jonathan Tan wrote: > > + for i in $(test_seq 1 1500) > > + do > > + # do not use here-doc, because it requires a process > > +

Re: [PATCH RFC 0/20] cat-file: start using formatting logic from ref-filter

2019-02-22 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 10:58 AM Olga Telezhnaya wrote: > I also have a question about site https://git-scm.com/docs/ > I thought it is updated automatically based on Documentation folder in > the project, but it is not true. I edited docs for for-each-ref in > December, I still see my patch in ma

Re: [PATCH v2 4/6] Makefile: Move *_LIBS assignment into its own section

2019-02-22 Thread Eric Sunshine
On Fri, Feb 22, 2019 at 9:41 AM Ævar Arnfjörð Bjarmason wrote: > Now the only other non-program assignment in the previous list is > PTHREAD_CFLAGS, which'll be moved elsewhere in a follow-up chang. s/chang/change/ > Signed-off-by: Ævar Arnfjörð Bjarmason

Re: [PATCH v2 5/5] remote-curl: use post_rpc() for protocol v2 also

2019-02-22 Thread Eric Sunshine
On Thu, Feb 21, 2019 at 3:25 PM Jonathan Tan wrote: > diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh > @@ -542,7 +542,38 @@ test_expect_success 'clone with http:// using protocol > v2' ' > +test_expect_success 'clone big repository with http:// using protocol v2' ' > + test_wh

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

2019-02-21 Thread Eric Sunshine
On Thu, Feb 21, 2019 at 12:07 PM Phillip Wood wrote: > On 21/02/2019 13:50, Michal Suchánek wrote: > >> On Tue, Feb 19, 2019 at 12:05 AM Michal Suchanek wrote: > > The problem is we don't forbid worktree names ending with ".lock". > > Which means that if we start to forbid them now existing workt

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

2019-02-21 Thread Eric Sunshine
On Wed, Feb 20, 2019 at 1:35 PM Eric Sunshine wrote: > On Wed, Feb 20, 2019 at 12:16 PM Michal Suchánek wrote: > > On Wed, 20 Feb 2019 11:55:46 -0500 > > Eric Sunshine wrote: > > > On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek > > > wrote: > > > &

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

2019-02-20 Thread Eric Sunshine
On Wed, Feb 20, 2019 at 12:16 PM Michal Suchánek wrote: > On Wed, 20 Feb 2019 11:55:46 -0500 > Eric Sunshine wrote: > > On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote: > > > Apparently it can happen that stat() claims there is a commondir file but > > >

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

2019-02-20 Thread Eric Sunshine
On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote: > Apparently it can happen that stat() claims there is a commondir file but when > trying to open the file it is missing. Under what circumstances? > Another even rarer issue is that the file might be zero size because another > process ini

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

2019-02-20 Thread Eric Sunshine
On Wed, Feb 20, 2019 at 11:17 AM Michal Suchanek wrote: > 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. > > Sign

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

2019-02-18 Thread Eric Sunshine
[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

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

2019-02-18 Thread Eric Sunshine
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 2/2] setup: don't fail if commondir is deleted.

2019-02-16 Thread Eric Sunshine
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 does not fail because of incompletely > set-up other worktree. > >

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

2019-02-16 Thread Eric Sunshine
On Fri, Feb 15, 2019 at 1:59 PM Junio C Hamano wrote: > Michal Suchanek writes: > > 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 cr

Re: [PATCH] doc: format pathnames and URLs as monospace

2019-02-14 Thread Eric Sunshine
On Thu, Feb 14, 2019 at 11:32 AM Corentin BOMPARD wrote: > diff --git a/Documentation/technical/pack-protocol.txt > b/Documentation/technical/pack-protocol.txt > @@ -107,7 +107,7 @@ Initiating the upload-pack or receive-pack processes over > SSH is > It is basically equivalent to running this:

Re: [PATCH 1/3] prune: lazily perform reachability traversal

2019-02-14 Thread Eric Sunshine
On Wed, Feb 13, 2019 at 11:35 PM Jeff King wrote: > diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh > @@ -274,6 +274,18 @@ test_expect_success 'prune .git/shallow' ' > +test_expect_success 'prune .git/shallow when there are no loose objects' ' > + SHA1=$(echo hi|git commit-tree HEAD^{tree})

Re: BUG: git worktree add directory-path fails due to over-aggressive disallowing of worktrees with same suffix

2019-02-12 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 6:50 PM Cameron Gunnin wrote: > The bug: > cd unique-path-1 > git --git-dir=../worktree-test-repo/.git worktree add subdir branch1 > cd ../unique-path-2 > git --git-dir=../worktree-test-repo/.git worktree add subdir branch2 > # FAILS WITH: fatal: 'subdir' is a mis

Re: [PATCH 27/31] builtin/difftool: use parse_oid_hex

2019-02-12 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:24 PM brian m. carlson wrote: > 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. > > Signed-off-by: brian m. carlson > --- > diff --git a/builtin/difftool.c b/builtin/difftool.c > @@ -65,

Re: [PATCH 19/31] http-walker: replace sha1_to_hex

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > 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 s/hasH/hash/ > that they are no longer limited to SHA-1. > > Signed-off-by: brian m. carlson

Re: [PATCH 15/31] builtin/pull: make hash-size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > 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. > > Signed-off-by: brian m. carlson > --- > diff --git a/builtin/pull.c b/builtin/pull.c > @@ -365,9 +365,10 @@ st

Re: [PATCH 12/31] fast-import: make hash-size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > 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 > --- > diff

Re: [PATCH 10/31] object-store: rename and expand packed_git's sha1 member

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > 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". > [...] > Signed-off-by: br

Re: [PATCH 08/31] notes: make hash size independent

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 8:23 PM brian m. carlson wrote: > 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 > --- > diff --gi

Re: [Patch v1 1/3] test-lib-functions.sh: add generate_zero_bytes function

2019-02-11 Thread Eric Sunshine
On Mon, Feb 11, 2019 at 7:37 PM Jeff King wrote: > On Sat, Feb 09, 2019 at 09:05:04PM -0500, Eric Sunshine wrote: > > On Sat, Feb 9, 2019 at 1:59 PM wrote: > > > +generate_zero_bytes () { > > > + perl -e 'if ($ARGV[0] == "infinity") { > >

Re: [PATCH v2 09/19] switch: better names for -b and -B

2019-02-10 Thread Eric Sunshine
On Fri, Feb 8, 2019 at 4:05 AM Nguyễn Thái Ngọc Duy wrote: > The shortcut of these options do not make much sense when used with > switch. And their descriptions are also tied to checkout > out. [...] "checkout out"? > Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH] Fix typo: "git bisectreset" -> "git bisect reset"

2019-02-10 Thread Eric Sunshine
On Sun, Feb 10, 2019 at 10:07 PM Jiang Xin wrote: > diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c > @@ -173,7 +173,7 @@ static int bisect_reset(const char *commit) > return error(_("could not check out original" >"

Re: [PATCH v2] utf8: handle systems that don't write BOM for UTF-16

2019-02-10 Thread Eric Sunshine
On Sun, Feb 10, 2019 at 7:23 PM brian m. carlson wrote: > When serializing UTF-16 (and UTF-32), there are three possible ways to > write the stream. One can write the data with a BOM in either big-endian > or little-endian format, or one can write the data without a BOM in > big-endian format. > [

Re: [PATCH v2 15/19] switch: no implicit dwim, use --guess to dwim

2019-02-10 Thread Eric Sunshine
On Fri, Feb 8, 2019 at 4:05 AM Nguyễn Thái Ngọc Duy wrote: > Similar to automatic detach, this behavior could be confusing because > it can sometimes create a new branch without a user asking it to, > especially when the user is still not aware about this feature. > [...] > Signed-off-by: Nguyễn T

Re: [Patch v1 3/3] t5562: replace /dev/zero with a pipe from generate_zero_bytes

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 1:59 PM wrote: > This change removes the dependency on /dev/zero with an equivalent pipe of Too many spaces between "equivalent" and "pipe". > deliberately NUL bytes. This allows tests to proceed where /dev/zero > does not exist. It wouldn't hurt to cite "NonStop" as an

Re: [Patch v1 2/3] t5318: replace use of /dev/zero with generate_zero_bytes

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 2:00 PM wrote: > This change removes the dependency on /dev/zero with generate_zero_bytes > appending NUL values to blocks generating wrong signatures for test cases. This commit message says what the patch does but not _why_. At minimum, it should explain that /dev/zero is

Re: [Patch v1 1/3] test-lib-functions.sh: add generate_zero_bytes function

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 1:59 PM wrote: > t5318 and t5562 used /dev/zero, which is not portable. This function > provides both a fixed block of NUL bytes and an infinite stream of NULs. > > Signed-off-by: Randall S. Becker > --- > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > @@

Re: [PATCH] utf8: handle systems that don't write BOM for UTF-16

2019-02-09 Thread Eric Sunshine
On Sat, Feb 9, 2019 at 3:08 PM brian m. carlson wrote: > [...] > Add a Makefile and #define knob, ICONV_NEEDS_BOM, that can be set if the > iconv implementation has this behavior. When set, Git will write a BOM > manually for UTF-16 and UTF-32 and then force the data to be written in > UTF-16BE or

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

2019-02-08 Thread Eric Sunshine
On Thu, Feb 7, 2019 at 5:46 AM Johannes Schindelin via GitGitGadget wrote: > 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 > alway

Re: [PATCH v2] pack-refs: fail on falsely sorted packed-refs

2019-02-08 Thread Eric Sunshine
On Fri, Feb 8, 2019 at 4:22 PM Max Kirillov wrote: > If packed-refs is marked as sorted but not really sorted it causes > very hard to comprehend misbehavior of reference resolving - a reference > is reported as not found, though it is listed by commands which output > the references list. > > As

Re: [PATCH v3] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-02-04 Thread Eric Sunshine
On Mon, Feb 4, 2019 at 1:47 PM Junio C Hamano wrote: > Eric Sunshine writes: > > On Sun, Feb 3, 2019 at 4:01 PM Sven van Haastregt wrote: > >> We cannot always rely on successfully invoking `git rev-parse` in the > >> submodule directory. Keep the old metho

Re: [PATCH v3] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-02-03 Thread Eric Sunshine
e submodule directory. It would be helpful for the commit message to explain this potential failure in enough detail for someone working in this area in the future to understand any implications of changes to this code. > Signed-off-by: Sven van Haastregt > --- > Differences since v2: Simp

Re: [PATCH] doc-diff: don't `cd_to_toplevel` before calling `usage`

2019-02-03 Thread Eric Sunshine
On Sun, Feb 3, 2019 at 5:37 AM Martin Ågren wrote: > On Sun, 3 Feb 2019 at 10:12, Eric Sunshine wrote: > > On Sun, Feb 3, 2019 at 4:08 AM Eric Sunshine > > wrote: > > > I wonder if a more fruitful, longer-term fix which would save us from > > > having to worr

Re: [PATCH] doc-diff: don't `cd_to_toplevel` before calling `usage`

2019-02-03 Thread Eric Sunshine
On Sun, Feb 3, 2019 at 4:08 AM Eric Sunshine wrote: > I wonder if a more fruitful, longer-term fix which would save us from > having to worry about this in the future, would be to make > git-sh-setup.sh remember the original $0 before cd_to_toplevel() and > then employ the origina

Re: [PATCH] doc-diff: don't `cd_to_toplevel` before calling `usage`

2019-02-03 Thread Eric Sunshine
On Sun, Feb 3, 2019 at 3:37 AM Martin Ågren wrote: > `usage` tries to call $0, which might very well be "./doc-diff", so if > we `cd_to_toplevel` before calling `usage`, we'll end with an error to > the effect of "./doc-diff: not found" rather than a friendly `doc-diff > -h` output. Granted, all o

Re: [PATCH v4 1/2] describe: setup working tree for --dirty

2019-02-02 Thread Eric Sunshine
On Sat, Feb 2, 2019 at 5:05 AM Sebastian Staudt wrote: > Am Fr., 1. Feb. 2019 um 21:12 Uhr schrieb Eric Sunshine > : > > On Fri, Feb 1, 2019 at 8:55 AM Sebastian Staudt wrote: > > > diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh > > > @@ -145,14 +145

Re: [PATCH v7 3/3] branch: Add an extra verbose output displaying worktree path for refs checked out in a linked worktree

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 5:04 PM wrote: > Subject: branch: Add an extra verbose output displaying worktree path for > refs checked out in a linked worktree Overlong subject. Perhaps shorten it to: branch: display worktree path in -v -v mode or something, and use the longer description as the

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

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 5:04 PM wrote: > Add an atom providing the path of the linked worktree where this ref is > checked out, if it is checked out in any linked worktrees, and empty > string otherwise. > > Signed-off-by: Nickolai Belakovski > --- > diff --git a/Documentation/git-for-each-ref.txt

Re: [PATCH v9 1/6] t5323: test cases for git-pack-redundant

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 4:03 PM Junio C Hamano wrote: > Eric Sunshine writes: > > On Fri, Feb 1, 2019 at 11:22 AM Jiang Xin wrote: > >> +# Note: DO NOT run it in a subshell, otherwise the variables will not be > >> set > > > > Which variables won't

Re: [PATCH v4 1/2] describe: setup working tree for --dirty

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 8:55 AM Sebastian Staudt wrote: > We don't use NEED_WORK_TREE when running the git-describe builtin, > since you should be able to describe a commit even in a bare repository. > However, the --dirty flag does need a working tree. Since we don't call > setup_work_tree(), it u

Re: Worktree creation race

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 8:17 AM Duy Nguyen wrote: > I'm not going to bother you with code yet (although if you want, you > can check out branch worktree-name on my gitlab repo), but this is > what the user facing changes look like. Looking good? > > -- 8< -- > diff --git a/Documentation/git-worktre

Re: [PATCH v9 1/6] t5323: test cases for git-pack-redundant

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 11:22 AM Jiang Xin wrote: > Add test cases for git pack-redundant to validate new algorithm for git > pack-redundant. > > Signed-off-by: Jiang Xin > --- > diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh > @@ -0,0 +1,510 @@ > +# Note: DO NOT run it in a su

Re: [PATCH 3/3] It's C not C++ so variable length array should not be used [-Werror=vla] :,).

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 3:36 AM Shahzad Lone wrote: > diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c > @@ -197,9 +197,8 @@ static unsigned long write_large_blob_data(struct > git_istream *st, struct hashfi >const struct object_id *oid) > {

Re: [PATCH 2/3] ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] so fix that.

2019-02-01 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 3:36 AM Shahzad Lone wrote: > diff --git a/pack-revindex.c b/pack-revindex.c > @@ -186,9 +186,9 @@ int find_revindex_position(struct packed_git *p, off_t > ofs) > struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs) > { > - > + int pos; >

Re: Worktree creation race

2019-01-31 Thread Eric Sunshine
On Mon, Jan 28, 2019 at 7:58 AM Marketa Calabkova wrote: > On 15/01/2019 15:03, Marketa Calabkova wrote: > > I am writing to report a bug. The original report is from my colleague, I > > am also providing his suggestions. > > > > There is insufficient locking for worktree addition. Adding worktre

Re: [PATCH v7 1/6] t5323: test cases for git-pack-redundant

2019-01-31 Thread Eric Sunshine
On Fri, Feb 1, 2019 at 12:44 AM Jiang Xin wrote: >> Junio C Hamano 于2019年2月1日周五 上午5:44写道: > > Move this outside loop, not for efficiency but for clarity. This > > helper function creates a single empty tree and bunch of commits > > that hold the same empty tree, arranged as a single strand of > >

Re: [PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 6:04 AM Duy Nguyen wrote: > On Thu, Jan 31, 2019 at 5:49 PM Eric Sunshine wrote: > > On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy > > wrote: > > > +NOTES > > > +- > > > +If a branch is associated with the working

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 1:17 PM Jeremy Sequoia wrote: > > On Jan 31, 2019, at 09:57, Junio C Hamano wrote: > > I still do not see what problem you need a "solution" for in the > > first place---I saw a few comments asking it in the thread, but saw > > no answer. ppc/sha1ppc.S is already tracked,

Re: [PATCH] git-commit.txt: better description what it does

2019-01-31 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 4:21 AM Nguyễn Thái Ngọc Duy wrote: > The description of git-commit jumps right into the commit content, which > is important, but it fails to mention how the commit is "added" to the > repository. Update the first paragraph saying a bit more about branch > update to fill t

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-30 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 2:44 AM Duy Nguyen wrote: > On Thu, Jan 31, 2019 at 1:25 PM Eric Sunshine wrote: > > I find, however, that the top-level git-switch "DESCRIPTION" section, > > which talks about "switching branches" doesn't actually ever explain &

Re: [PATCH 19/19] doc: promote "git switch"

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote: > The new command "git switch" is added to avoid the confusion of > one-command-do-all "git checkout" for new users. They are also helpful > to avoid ambiguation context. > > For these reasons, promote it everywhere possible. This include

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-30 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 1:24 AM Eric Sunshine wrote: > On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote: > > On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine > > wrote: > > > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy > > > wrote: > > > &

Re: [PATCH 17/19] t: add tests for switch

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 4:50 AM Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh > @@ -0,0 +1,91 @@ > +test_expect_success 'switch and create branch' ' > + test_when_finished git switch master && > + git switc

Re: [PATCH 09/19] switch: better names for -b and -B

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote: > The shortcut of these options do not make much sense when used with > switch. And their descriptions are also tied to checkout > out. Move -b/-B to cmd_checkout() and new -c/-C with the same > functionality in cmd_switch_branch() > > Si

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-30 Thread Eric Sunshine
On Thu, Jan 31, 2019 at 12:29 AM Duy Nguyen wrote: > On Thu, Jan 31, 2019 at 7:50 AM Eric Sunshine wrote: > > On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy > > wrote: > > > +'git switch' [] [--guess] > > > +'git switch' []

Re: [PATCH 08/19] checkout: split part of it to new command switch

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 4:49 AM Nguyễn Thái Ngọc Duy wrote: > "git checkout" doing too many things is a source of confusion for many > users (and it even bites old timers sometimes). To remedy that, the > command will be split into two new ones: switch and > something-to-checkout-paths. The good o

Re: [RFC PATCH] pack-refs: fail on falsely sorted packed-refs

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 6:21 PM Max Kirillov wrote: > If packed-refs is marked as sorted but not really sorted it causes > very hard to comprehend misbehavior of reference resolving - a reference > is reported as not found. > > As the scope of the issue is not clear, make it visible by failing > p

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 7:29 AM Eric Sunshine wrote: > On Wed, Jan 30, 2019 at 6:37 AM Jeremy Huddleston Sequoia > wrote: > > > On Jan 30, 2019, at 03:33, Eric Sunshine wrote: > > > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia > > > wrote: > >

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-30 Thread Eric Sunshine
On Wed, Jan 30, 2019 at 6:37 AM Jeremy Huddleston Sequoia wrote: > > On Jan 30, 2019, at 03:33, Eric Sunshine wrote: > > On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia > > wrote: > >> This was causing problems with ppc/sha1ppc.S > > > > What pro

Re: [PATCH (Apple Git) 03/13] t0500: New regression test for git add of a path that contains a .git directory

2019-01-30 Thread Eric Sunshine
On Tue, Jan 29, 2019 at 4:19 PM Jeremy Huddleston Sequoia wrote: > Subject: t0500: New regression test for git add of a path that contains a > .git directory Please describe the actual problem here in the commit message so readers of this change can understand what this is all about. > Signed-o

Re: [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem

2019-01-30 Thread Eric Sunshine
On Tue, Jan 29, 2019 at 3:11 PM Jeremy Huddleston Sequoia wrote: > This was causing problems with ppc/sha1ppc.S What problems, exactly? > Signed-off-by: Jeremy Huddleston Sequoia > --- > diff --git a/.gitignore b/.gitignore > @@ -195,7 +195,7 @@ > -*.[aos] > +*.[ao]

Re: [PATCH v3 2/3] Setup working tree in describe

2019-01-29 Thread Eric Sunshine
On Tue, Jan 29, 2019 at 8:12 AM Jeff King wrote: > On Tue, Jan 29, 2019 at 06:18:58AM +0100, Sebastian Staudt wrote: > > This ensures the given working tree is used for --dirty. > > There's been a lot of digging and discussion on the list about what > happens if we don't do this. Could we summariz

Re: [PATCH v2] git-submodule.sh: shorten submodule SHA-1s using rev-parse

2019-01-27 Thread Eric Sunshine
On Sun, Jan 27, 2019 at 2:28 PM Sven van Haastregt wrote: > Until now, `git submodule summary` was always emitting 7-character > SHA-1s that have a higher chance of being ambiguous for larger > repositories. Use `git rev-parse --short` instead, which will > determine suitable short SHA-1 lengths.

Re: [PATCH v2 2/2] tests: add test for separate author and committer idents

2019-01-26 Thread Eric Sunshine
On Sat, Jan 26, 2019 at 3:53 AM Ævar Arnfjörð Bjarmason wrote: > Which, looking at this again, you'd only want if a previous test in the > file was leaking its state. That's not the case, so this isn't needed > and you can just apply this on top: > > test_expect_success \ > 'autho

Re: [PATCH v2] log,diff-tree: add --combined-with-paths options for merges with renames

2019-01-25 Thread Eric Sunshine
On Fri, Jan 25, 2019 at 12:52 PM Elijah Newren wrote: > On Fri, Jan 25, 2019 at 9:41 AM Derrick Stolee wrote: > > On 1/25/2019 11:54 AM, Elijah Newren wrote: > > > + printf "0f9645804ebb04cc3eef91f799eb7fb54d70cefb\0::100644 100644 > > > 100644 f00c965d8307308469e537302baa73048488f162 > > >

Re: [PATCH/RFC v2 1/1] test-lint: Only use only sed [-n] [-e command] [-f command_file]

2019-01-22 Thread Eric Sunshine
On Tue, Jan 22, 2019 at 3:00 PM Torsten Bögershausen wrote: > On 22.01.19 20:47, Junio C Hamano wrote: > > tbo...@web.de writes: > >> -/\bsed\s+-i/ and err 'sed -i is not portable'; > >> +/\bsed\s+-[^efn]\s+/ and err 'Not portable option with sed (use only > >> [-n] [-e command] [-f comma

Re: [PATCH/RFC v1 1/1] test-lint: sed -E (or -a, -l) are not portable

2019-01-15 Thread Eric Sunshine
On Tue, Jan 15, 2019 at 3:31 PM wrote: > From `man sed` (on a Mac OS X box): > The -E, -a and -i options are non-standard FreeBSD extensions and may not be > available > on other operating systems. > [...] > To be on the safe side, don't allow it. > > Signed-off-by: Torsten Bögershausen > --- >

Re: [Bug report] Git incorrectly selects language in macos

2019-01-15 Thread Eric Sunshine
On Tue, Jan 15, 2019 at 2:06 PM Nate Weaver wrote: > Nevermind: I've been informed that this has already been fixed on the git > trunk > for gettext, and will be in the next release. > > (See: https://savannah.gnu.org/bugs/?49560) Thanks for the follow-up report. It's good to know that this is f

Re: [PATCH 1/2] git-p4: add failing test for shelved CL update involving move

2019-01-13 Thread Eric Sunshine
On Sun, Jan 13, 2019 at 8:58 AM Luke Diamand wrote: > Updating a shelved P4 changelist where one or more of the files have > been moved does not work. Add a test for this. Perhaps this message could give more detail about the actual problem than the generic "does not work" which provides no usefu

Re: [PATCH] fetch: fix extensions.partialclone name in error message

2019-01-13 Thread Eric Sunshine
On Sun, Jan 13, 2019 at 3:52 AM Christian Couder wrote: > There is "extensions.partialclone" and "core.partialCloneFilter", but > not "core.partialclone". Only "extensions.partialclone" is meant to > contain a remote name. > > While at it, let's wrap the relevant code lines to keep them at a > rea

Re: [PATCH] diff: ensure correct lifetime of external_diff_cmd

2019-01-09 Thread Eric Sunshine
On Wed, Jan 9, 2019 at 5:19 PM Kim Gybels wrote: > According to getenv(3)'s notes: > [...] > Since strings returned by getenv() are allowed to change on subsequent > calls to getenv(), make sure to duplicate when caching external_diff_cmd > from environment. > [...] > Signed-off-by: Kim Gybels >

Re: [PATCH] doc/config: do a better job of introducing 'worktree.guessRemote'

2019-01-06 Thread Eric Sunshine
On Sun, Jan 6, 2019 at 1:09 PM Thomas Gummerer wrote: > On 12/23, Eric Sunshine wrote: > > The documentation for this option jumps right in with "With `add`", > > without explaining that `add` is a sub-command of "git worktree". > > Together with rather o

Re: [PATCH v2] worktree: allow to (re)move worktrees with uninitialized submodules

2019-01-05 Thread Eric Sunshine
On Fri, Jan 4, 2019 at 5:51 PM Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > Uninitialized submodules have nothing valueable for us to be worried > > about. They are just SHA-1. Let "worktree remove" and "worktree move" > > continue in this case so that people can still use multiple w

Re: [Patch v5 3/4] git-compat-util.h: add FLOSS headers for HPE NonStop

2019-01-03 Thread Eric Sunshine
On Thu, Jan 3, 2019 at 4:04 PM wrote: > The HPE NonStop (a.k.a. __TANDEM) platform cannot build git without > using the FLOSS package supplied by HPE. The convenient location > for including the relevant headers is in this file. > > The NSIG define is also not defined on __TANDEM, so we define it

Re: [Patch v5 2/4] config.mak.uname: support for modern HPE NonStop config.

2019-01-03 Thread Eric Sunshine
On Thu, Jan 3, 2019 at 4:04 PM wrote: > A number of configuration options are not automatically detected by > configure mechanisms, including the location of Perl and Python. > > There was a problem at a specific set of operating system versions > that caused getopt to have compile errors. Account

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

2019-01-03 Thread Eric Sunshine
On Thu, Jan 3, 2019 at 12:40 AM Jeff King wrote: > On Mon, Dec 24, 2018 at 12:47:54AM -0800, nbelakov...@gmail.com wrote: > > +test_expect_success 'validate worktree atom' ' > > + { > > + echo master: $PWD && > > + echo master_worktree: $PWD/worktree_dir && > > + echo side: not che

Re: [PATCH] test-lib: check Bash version for '-x' without using shell arrays

2019-01-02 Thread Eric Sunshine
On Tue, Jan 1, 2019 at 6:20 PM SZEDER Gábor wrote: > [...] > To my understanding both shells are right and conform to POSIX, > because the standard allows both behavior by stating the following s/behavior/behaviors/ > under '2.8.1 Consequences of Shell Errors': > > Reported-by: Max Kirillov > S

Re: [PATCH] banned.h: mark strncat() as banned

2019-01-02 Thread Eric Sunshine
On Wed, Jan 2, 2019 at 4:38 AM Eric Wong wrote: > > strncat() has the same quadratic behavior as strcat() and is > difficult-to-read and bug-prone. While it hasn't yet been a > problem in git iself, strncat() found it's way into 'master' s/iself/itself/ > of cgit and caused segfaults on my syst

Re: [PATCH 2/2] Unset CURLOPT_FAILONERROR

2018-12-28 Thread Eric Sunshine
On Fri, Dec 28, 2018 at 2:51 PM Masaya Suzuki wrote: > On Fri, Dec 28, 2018 at 11:37 AM Eric Sunshine > wrote: > > On Thu, Dec 27, 2018 at 8:47 PM Masaya Suzuki > > wrote: > > > +test_expect_success 'failure in git-upload-pack is shown' ' > >

Re: [PATCH v3 2/4] config.mak.uname: support for modern HPE NonStop config.

2018-12-28 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 5:39 PM wrote: > A number of configuration options are not automatically detected by > configure mechanisms, including the location of Perl and Python. > > There was a problem at a specific set of operating system versions > that caused getopt to have compile errors. Accoun

Re: [PATCH 2/2] Unset CURLOPT_FAILONERROR

2018-12-28 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 8:47 PM Masaya Suzuki wrote: > When GIT_CURL_VERBOSE is set, libcurl produces request/response headers > to stderr. However, if the response is an error response and > CURLOPT_FAILONERROR is set, libcurl stops parsing the response, and it > won't ump the headers. Showing HT

Re: [PATCH 4/6] config: use OPT_FILENAME()

2018-12-27 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote: > Do not handle prefix directly. It's simpler to use OPT_FILENAME() > instead. The othe reason for doing this is because this code (where s/othe/other/ > the deleted code is) will be factored out and called when "prefix" is > not avail

Re: [PATCH 2/6] worktree.c: add get_worktree_config()

2018-12-27 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 10:56 AM Nguyễn Thái Ngọc Duy wrote: > "git config --worktree" can write to the write file whether s/write file/right file/ > extensions.worktreeConfig is enabled or not. In order to do the same > using config API, we need to determine the right file to write to. Add > th

Re: [PATCH 74/75] diff --no-index: use parse_options() instead of diff_opt_parse()

2018-12-27 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 11:26 AM Nguyễn Thái Ngọc Duy wrote: > While at there, move exit() back to the caller. It's easier to see the > flow that way then burying it in diff-no-index.c s/then/than/ > Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v2 2/4] config.mak.uname: support for modern HPE NonStop config.

2018-12-27 Thread Eric Sunshine
On Thu, Dec 27, 2018 at 1:35 PM wrote: > A number of configuration options are not automatically detected by > configure mechanisms, including the location of Perl and Python. > > There was a problem at a specific set of operating system versions > that caused getopt to have compile errors. Accoun

Re: [PATCH v1 2/4] config.mak.uname: support for modern HPE NonStop config.

2018-12-27 Thread Eric Sunshine
On Wed, Dec 26, 2018 at 6:05 PM wrote: > A number of configuration options are not automatically detected by > configure mechanisms, including the location of Perl and Python. > [...] > Signed-off-by: Randall S. Becker > --- > diff --git a/config.mak.uname b/config.mak.uname > @@ -441,26 +441,45

[PATCH] doc/config: do a better job of introducing 'worktree.guessRemote'

2018-12-23 Thread Eric Sunshine
Clarify by improving the grammar and mentioning "git worktree add" explicitly. Reported-by: Олег Самойлов Signed-off-by: Eric Sunshine --- Reference: https://public-inbox.org/git/0e640233-b2cb-465d-9713-bbece331c...@ya.ru/ Documentation/config/worktree.txt | 4 ++-- 1 file changed

Re: [PATCH v2 7/8] checkout: introduce --{,no-}overlay option

2018-12-23 Thread Eric Sunshine
On Sun, Dec 23, 2018 at 3:05 AM Duy Nguyen wrote: > On Thu, Dec 20, 2018 at 2:48 PM Thomas Gummerer wrote: > > +--[no-]overlay:: > > + In the default overlay mode files `git checkout` never > > -ECANTPARSE. Maybe "files" should be removed from this line? Also, add a comma after "mode".

Re: [PATCH] worktree: allow to (re)move worktrees with uninitialized submodules

2018-12-16 Thread Eric Sunshine
On Sun, Dec 16, 2018 at 7:12 AM Nguyễn Thái Ngọc Duy wrote: > Uninitialized submodules have nothing valueable for us to be worried > about. They are just SHA-1. Let "worktree remove" and "worktree move" > continue in this case so that people can still use multiple worktrees > on repos with optiona

Re: [PATCH] submodule update: run at most one fetch job unless otherwise set

2018-12-13 Thread Eric Sunshine
On Thu, Dec 13, 2018 at 2:03 PM Stefan Beller wrote: > In a028a1930c (fetching submodules: respect `submodule.fetchJobs` > config option, 2016-02-29), we made sure to keep the default behavior > of a fetching at most one submodule at once when not setting the s/of a/of/ > newly introduced `submo

<    1   2   3   4   5   6   7   8   9   10   >