Re: [PATCH 2/3] git-column.1: clarify initial description, provide examples

2018-09-20 Thread Eric Sunshine
On Thu, Sep 20, 2018 at 1:47 PM wrote: > On Thu, Sep 20, 2018 at 06:23:03PM +0200, Duy Nguyen wrote: > > On Wed, Sep 19, 2018 at 03:59:58PM -0700, Junio C Hamano wrote: > > > > @@ -23,7 +26,7 @@ OPTIONS > > > > > > > > --mode=:: > > > > Specify layout mode. See configuration variable column.ui

Re: [PATCH 0/3] some documentation changes from the beginning of the alphabet

2018-09-20 Thread Eric Sunshine
4f7b81fed64ec8fbfc81952557f > > Sébastien Guimmara > > Nguyễn Thái Ngọc Duy > > Eric Sunshine > > Junio C Hamano > > $ ./contrib/contacts/git-contacts > > ./outgoing/0002-git-column.1-clarify-initial-description-provide-exa.patch > > Junio C Ham

Re: bug with git merge-base

2018-09-20 Thread Eric Sunshine
On Wed, Sep 19, 2018 at 6:25 PM Alexander Mills wrote: > The following command sequence exits with 1, and no stderr > > base='remotes/origin/dev'; > fork_point="$(git merge-base --fork-point "$base")"; > > I cannot figure out why it's exiting with 1, but there is no stdout/stderr Unable to

Re: [PATCH] Add an EditorConfig file

2018-09-20 Thread Eric Sunshine
On Wed, Sep 19, 2018 at 8:00 PM brian m. carlson wrote: > (I am having trouble getting make style to work, though, because it > seems to invoke clang-format as a git subcommand, and I don't think that > works. I may send a patch.) You're probably missing this piece:

Re: [PATCH] reflog expire: add progress output

2018-09-20 Thread Eric Sunshine
On Wed, Sep 19, 2018 at 10:10 AM Ævar Arnfjörð Bjarmason wrote: > Before this change the "git reflog expire" command didn't report any > progress. This is the second command (after "pack-refs --all --prune") > that the "gc" command will run. > [...] > That may just be some artifact of the

Re: [PATCH v3 1/5] CodingGuidelines: add shell piping guidelines

2018-09-20 Thread Eric Sunshine
On Thu, Sep 20, 2018 at 9:43 PM Matthew DeVore wrote: > Add two guidelines: Probably s/two/three/ or s/two/several/ since the patch now adds three guidelines. > - pipe characters should appear at the end of lines, and not cause >indentation The "not cause indentation" bit is outdated

Re: [PATCH v2 6/6] t9109-git-svn-props.sh: split up several pipes

2018-09-19 Thread Eric Sunshine
On Tue, Sep 18, 2018 at 10:56 PM Matthew DeVore wrote: > On Mon, Sep 17, 2018 at 6:57 PM Eric Sunshine wrote: > > On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > > > + cmp - $3 > > > > This is just wrong. The "-" argument to 'c

Re: [PATCH v2 1/6] CodingGuidelines: add shell piping guidelines

2018-09-19 Thread Eric Sunshine
On Tue, Sep 18, 2018 at 10:11 PM Matthew DeVore wrote: > Yes, it's probably better to add a point about that. Here is the new > documentation after applying your suggestions: > > - If a piped sequence which spans multiple lines, put each statement s/which// >on a separate line and put

Re: [PATCH 3/3] fetch doc: correct grammar in --force docs

2018-09-18 Thread Eric Sunshine
On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason wrote: > "Work the same" is incorrect and needs to be "Works the same > way". Fixes grammar in document anion I added in the recently landed I, too, find those "document anions" problematic. Perhaps the physicists around here can do

Re: [PATCH v2 6/6] t9109-git-svn-props.sh: split up several pipes

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > t9109-git-svn-props.sh: split up several pipes Similar to my comment about 5/6, this title talks about the mechanical changes made by the patch but not the intent. Perhaps reword it like this: t9109: avoid swallowing Git exit code

Re: [PATCH v2 5/6] tests: split up pipes

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > tests: split up pipes This title explains the mechanical changes the patch is making but not the intent. Perhaps reword it to say something like: tests: avoid swallowing Git exit code upstream of a pipe > Some pipes in tests lose the

Re: [PATCH v2 4/6] tests: Add linter check for pipe placement style

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > tests: Add linter check for pipe placement style Until now, the various "lint" checks have been for genuine portability problems (except perhaps 'test-lint-duplicates'). This new lint check makes style violations worthy of failing "make

Re: [PATCH v2 1/6] CodingGuidelines: add shell piping guidelines

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 6:24 PM Matthew DeVore wrote: > diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines > @@ -163,6 +163,35 @@ For shell scripts specifically (not exhaustive): > + - In a piped sequence which spans multiple lines, put each statement > + on a separate

Re: [PATCH 3/3] doc/Makefile: drop doc-diff worktree and temporary files on "make clean"

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 4:43 PM Eric Sunshine wrote: > I did consider this case and felt that it would be reasonable for it > to error out and ignore the error if git was missing or if the > directory was not a repository. And, I _thought_ I had prefixed the > line with "

Re: [PATCH 3/3] doc/Makefile: drop doc-diff worktree and temporary files on "make clean"

2018-09-17 Thread Eric Sunshine
On Mon, Sep 17, 2018 at 3:36 PM Junio C Hamano wrote: > Jonathan Nieder writes: > >> +'$(SHELL_PATH_SQ)' ./doc-diff --clean > > > > This means I need a copy of git in order to run "make clean". That > > was never required before. It makes bootstrapping difficult --- do we > > really need

Re: [RFC PATCH v4 3/3] t0014: Introduce alias testing suite

2018-09-16 Thread Eric Sunshine
On Fri, Sep 14, 2018 at 7:12 PM Tim Schumacher wrote: > This is the first multi-patch series that I submitted, so I'm unsure if I > should send the updated patch only or if I should send the complete series > again as v5. Any pointers to what the correct procedure for this case is would > be

Re: [PATCH] read-cache.c: fix a sparse warning

2018-09-16 Thread Eric Sunshine
On Fri, Sep 14, 2018 at 7:29 PM Ramsay Jones wrote: > At one time, the POSIX standard required the type used to represent > a thread handle (pthread_t) be an arithmetic type. This is no longer > the case, probably because different platforms used to regularly > ignore that requirement. For

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

2018-09-16 Thread Eric Sunshine
On Fri, Sep 14, 2018 at 10:20 PM Niko Dzhus wrote: > Looks like the issue appeared after updating git from brew. > > A quick search revealed that brew changed how it builds git recently. > I think, it just didn't include i18n by default before, so I never > noticed this. > > Anybody here familiar

Re: [PATCH] refs: docstirng typo

2018-09-14 Thread Eric Sunshine
On Fri, Sep 14, 2018 at 10:45 AM Tao Qingyun wrote: > refs: docstirng typo Typo: s/docstirng/docstring/ > --- Please sign-off your patch. See Documentation/SubmittingPatches. Thanks.

Re: [PATCH 3/3] sequencer: use read_author_script()

2018-09-13 Thread Eric Sunshine
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote: > Use the new function to read the author script, updating > read_env_script() and read_author_ident(). This means we now have a > single code path that reads the author script and uses sq_dequote() to > dequote it. This fixes potential problems

Re: [PATCH 2/3] add read_author_script() to libgit

2018-09-13 Thread Eric Sunshine
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote: > Add read_author_script() to sequencer.c based on the implementation in > builtin/am.c and update read_am_author_script() to use > read_author_script(). The sequencer code that reads the author script > will be updated in the next commit. > >

Re: [PATCH v2 1/1] contrib: add coverage-diff script

2018-09-13 Thread Eric Sunshine
On Thu, Sep 13, 2018 at 10:56 AM Derrick Stolee via GitGitGadget wrote: > There have been a few bugs in recent patches what would have been caught > if the test suite covered those blocks (including a few of mine). I want > to work towards a "sensible" amount of coverage on new topics. In my

Re: [PATCH] linear-assignment: fix potential out of bounds memory access (was: Re: Git 2.19 Segmentation fault 11 on macOS)

2018-09-13 Thread Eric Sunshine
On Wed, Sep 12, 2018 at 3:01 PM Thomas Gummerer wrote: > Subject: [PATCH] linear-assignment: fix potential out of bounds memory access > > Currently the 'compute_assignment()' function can may read memory out "can may"? > of bounds, even if used correctly. Namely this happens when we only >

Re: [PATCH 3/3] sequencer: use read_author_script()

2018-09-12 Thread Eric Sunshine
On Wed, Sep 12, 2018 at 6:11 AM Phillip Wood wrote: > Use the new function to read the author script, updating > read_env_script() and read_author_ident(). This means we now have a > single code path that reads the author script and uses sq_dequote() to > dequote it. This fixes potential problems

Re: [PATCH 1/1] t3206-range-diff.sh: cover single-patch case

2018-09-11 Thread Eric Sunshine
On Tue, Sep 11, 2018 at 4:26 PM Derrick Stolee via GitGitGadget wrote: > The commit 40ce4160 "format-patch: allow --range-diff to apply to > a lone-patch" added the ability to see a range-diff as commentary > after the commit message of a single patch series (i.e. [PATCH] > instead of [PATCH

Re: [PATCH 0/1] Add coverage for 'git format-patch --range-diff' single-patch case

2018-09-11 Thread Eric Sunshine
On Tue, Sep 11, 2018 at 4:26 PM Derrick Stolee via GitGitGadget wrote: > In es/format-patch-rangediff, we added a '--range-diff' option to > git-format-patch to automatically add a range-diff. We also added an option > to write the diff as commentary to a single patch submission. However, this >

Re: [RFC PATCH v4 3/3] t0014: Introduce alias testing suite

2018-09-07 Thread Eric Sunshine
On Fri, Sep 7, 2018 at 6:44 PM Tim Schumacher wrote: > Introduce a testing suite that is dedicated to aliases. > For now, check only if nested aliases work and if looping > aliases are detected successfully. > > The looping aliases check for mixed execution is there but > expected to fail because

Re: [PATCH] status: show progress bar if refreshing the index takes too long

2018-09-07 Thread Eric Sunshine
On Fri, Sep 7, 2018 at 4:29 PM Derrick Stolee wrote: > On 9/7/2018 1:38 PM, Eric Sunshine wrote: > > On Fri, Sep 7, 2018 at 11:51 AM Nguyễn Thái Ngọc Duy > > wrote: > >> + if (progress) > >> + display_progress(progre

Re: [PATCH] status: show progress bar if refreshing the index takes too long

2018-09-07 Thread Eric Sunshine
On Fri, Sep 7, 2018 at 11:51 AM Nguyễn Thái Ngọc Duy wrote: > Refreshing the index is usually very fast, but it can still take a > long time sometimes. Cold cache is one, or something else silly (*). > In this case, it's good to show something to let the user know "git > status" is not hanging,

Re: [PATCH 11/14] format-patch: extend --range-diff to accept revision range

2018-09-07 Thread Eric Sunshine
On Wed, Jul 25, 2018 at 4:53 PM Junio C Hamano wrote: > Eric Sunshine writes: > > When submitting a revised a patch series, the --range-diff option embeds > > a range-diff in the cover letter showing changes since the previous > > version of the patch series. The arg

Re: [PATCH 14/14] format-patch: allow --range-diff to apply to a lone-patch

2018-09-07 Thread Eric Sunshine
On Wed, Jul 25, 2018 at 5:07 PM Junio C Hamano wrote: > Eric Sunshine writes: > > + if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) { > > + struct diff_queue_struct dq; > > + > > + memcpy(, _queued_diff, sizeof(diff_queued_diff

Re: [PATCH 09/11] multi-pack-index: verify object offsets

2018-09-06 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget wrote: > Replace the BUG() statement with a die() statement, now that we > may hit a bad pack-int-id during a 'verify' command on a corrupt > multi-pack-index, and it is covered by a test. > > Signed-off-by: Derrick Stolee > --- >

Re: [PATCH 02/11] multi-pack-index: verify bad header

2018-09-06 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget wrote: > Add tests that check corrupted headers in a few ways: > [...] > Signed-off-by: Derrick Stolee > --- > diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh > @@ -154,6 +154,51 @@ test_expect_success 'verify

Re: [PATCH 01/11] multi-pack-index: add 'verify' verb

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 10:46 AM Derrick Stolee via GitGitGadget wrote: > The multi-pack-index builtin writes multi-pack-index files, and > uses a 'write' verb to do so. Add a 'verify' verb that checks this > file matches the contents of the pack-indexes it replaces. > [...] > Signed-off-by:

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 5:14 AM Eric Sunshine wrote: > On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote: > > * es/worktree-forced-ops-fix (2018-08-30) 9 commits > This description mischaracterizes what these changes are about. [...] > > So, perhaps rewrite thi

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 8:39 AM Johannes Schindelin wrote: > So let's hear some ideas how to improve the situation, m'kay? > Just as a reminder, this is the problem I want to solve: I want to run the > tests in a light-weight manner, with minimal output, and only in case of > an error do I want to

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Eric Sunshine
On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote: > * es/worktree-forced-ops-fix (2018-08-30) 9 commits > - worktree: delete .git/worktrees if empty after 'remove' > - worktree: teach 'remove' to override lock when --force given twice > - worktree: teach 'move' to override lock when --force

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Eric Sunshine
On Tue, Sep 4, 2018 at 6:36 PM Junio C Hamano wrote: > * es/worktree-forced-ops-fix (2018-08-30) 9 commits > - worktree: delete .git/worktrees if empty after 'remove' > - worktree: teach 'remove' to override lock when --force given twice > - worktree: teach 'move' to override lock when --force

Re: What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-05 Thread Eric Sunshine
On Wed, Sep 5, 2018 at 4:29 AM Ævar Arnfjörð Bjarmason wrote: > I recently gained access to a Solaris 10 SPARC (5.10) box and discovered > that the chainlint.sed implementation in 2.19.0 has more sed portability > issues. > > First, whoever implemented the /bin/sed on Solaris apparently read the

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-04 Thread Eric Sunshine
On Tue, Sep 4, 2018 at 4:27 PM Ævar Arnfjörð Bjarmason wrote: > With --stdin-packs we don't show any estimation of how much is left to > do. This is because we might be processing more than one pack. We > could be less lazy here and show progress, either detect by detecting s/detect// > that

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-03 Thread Eric Sunshine
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget wrote: > So let's do something different in VSTS: let's run all the tests with > `--quiet` first, and only if a failure is encountered, try to trace the > commands as they are executed. [...] > > Signed-off-by: Johannes

Re: [PATCH 4/9] tests: optionally write results as JUnit-style .xml

2018-09-03 Thread Eric Sunshine
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget wrote: > This will come in handy when publishing the results of Git's test suite > during an automated VSTS CI run. > > Signed-off-by: Johannes Schindelin > --- > diff --git a/t/test-lib.sh b/t/test-lib.sh > @@ -431,11 +434,24

Re: [PATCH v4 01/12] t: add test functions to translate hash-related values

2018-09-03 Thread Eric Sunshine
On Mon, Sep 3, 2018 at 7:25 PM brian m. carlson wrote: > Add several test functions to make working with various hash-related > values easier. > [...] > diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh > @@ -1155,3 +1155,70 @@ depacketize () { > +# Detect the hash algorithm in use.

Re: [PATCH 2/9] ci/lib.sh: encapsulate Travis-specific things

2018-09-03 Thread Eric Sunshine
On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget wrote: > The upcoming patches will allow building git.git via VSTS CI, where > variable names and URLs look a bit different than in Travis CI. > > Signed-off-by: Johannes Schindelin > --- > diff --git

Re: [GSoC][PATCH v8 17/20] stash: convert save to builtin

2018-09-03 Thread Eric Sunshine
On Mon, Sep 3, 2018 at 2:44 PM Johannes Schindelin wrote: > where `strbuf_join_argv()` would be implemented like this (and I would put > it into strbuf.c and strbuf.h: > > const char *strbuf_join_argv(struct strbuf *buf, > int argc, const char **argv,

Re: [PATCH v2 2/3] Add test for commit --dry-run --short.

2018-09-01 Thread Eric Sunshine
On Sat, Sep 1, 2018 at 10:18 PM Eric Sunshine wrote: > On Sat, Sep 1, 2018 at 7:53 PM Stephen P. Smith wrote: > > The test demonstrates that the setting of the commitable flag is > > broken. > > s/commitable/committable/ Looking at patch 3/3, I see that this misspelli

Re: [PATCH v2 2/3] Add test for commit --dry-run --short.

2018-09-01 Thread Eric Sunshine
On Sat, Sep 1, 2018 at 7:53 PM Stephen P. Smith wrote: > Add test for commit --dry-run --short. The first line of a commit message typically mentions the area or module being touched. It's also customary not to capitalize the first word and to omit the final period. So, for instance: t7501:

Re: [PATCH 3/3] doc/Makefile: drop doc-diff worktree and temporary files on "make clean"

2018-08-31 Thread Eric Sunshine
On Fri, Aug 31, 2018 at 4:07 PM Jeff King wrote: > On Fri, Aug 31, 2018 at 02:33:18AM -0400, Eric Sunshine wrote: > > diff --git a/Documentation/Makefile b/Documentation/Makefile > > @@ -332,6 +332,7 @@ clean: > > $(RM) manpage-base-url.xsl > > + '$(SHELL_P

Re: [PATCH 2/3] doc-diff: add --clean mode to remove temporary working gunk

2018-08-31 Thread Eric Sunshine
On Fri, Aug 31, 2018 at 4:01 PM Jeff King wrote: > On Fri, Aug 31, 2018 at 02:33:17AM -0400, Eric Sunshine wrote: > > OPTIONS_SPEC="\ > > doc-diff [options] [-- ] > > +doc-diff (-c|--clean) > > -- > > j=n parallel argument to pass to make > >

Re: [PATCH] config.mak.uname: resolve FreeBSD iconv-related compilation warning

2018-08-31 Thread Eric Sunshine
On Fri, Aug 31, 2018 at 1:00 PM Jonathan Nieder wrote: > > From: Jonathan Nieder > > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines > > it unconditionally. However, recent versions do not need it, and its > > presence results in compilation warnings. Resolve this issue by

Re: [PATCH v3 05/11] t0027: make hash size independent

2018-08-31 Thread Eric Sunshine
On Fri, Aug 31, 2018 at 2:21 PM Torsten Bögershausen wrote: > > diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh > > @@ -14,11 +14,13 @@ compare_files () { > > compare_ws_file () { > > + tmp=$2.tmp > > act=$pfx.actual.$3 > > - tr '\015\000abcdef0123456789'

Re: [PATCH] config.mak.uname: resolve FreeBSD iconv-related compilation warning

2018-08-31 Thread Eric Sunshine
On Fri, Aug 31, 2018 at 7:54 AM Ævar Arnfjörð Bjarmason wrote: > On Fri, Aug 31, 2018 at 11:52 AM Eric Sunshine > wrote: > > OLD_ICONV has long been needed by FreeBSD so config.mak.uname defines > > it unconditionally. However, recent versions do not need it, and its &g

[PATCH] config.mak.uname: resolve FreeBSD iconv-related compilation warning

2018-08-31 Thread Eric Sunshine
/b709ec868adb5170d09bc5a66b18d0e0d5987ab6 [es: commit message; tweak version check to distinguish 10.x versions] Signed-off-by: Jonathan Nieder Signed-off-by: Eric Sunshine --- This is a follow-up to [1] which encapsulates Jonathan's proposed change as a proper patch. I made Jonathan as the author

[PATCH 0/3] doc-diff: add "clean" mode & fix portability problem

2018-08-31 Thread Eric Sunshine
and generated files, and has "make clean" invoke that instead. It also fixes a portability problem which prevented doc-diff from working on MacOS and FreeBSD. [1]: https://public-inbox.org/git/20180830195546.ga22...@sigill.intra.peff.net/ Eric Sunshine (3): doc-diff: fix non-portable 'm

[PATCH 3/3] doc/Makefile: drop doc-diff worktree and temporary files on "make clean"

2018-08-31 Thread Eric Sunshine
, never runs doc-diff), as a convenience, update "make clean" to clean up doc-diff's working tree and generated files along with other development detritus normally removed by "make clean". Signed-off-by: Eric Sunshine --- Documentation/Makefile | 1 + 1 file changed, 1 inse

[PATCH 1/3] doc-diff: fix non-portable 'man' invocation

2018-08-31 Thread Eric Sunshine
specified explicitly. Therefore, make the invocation portable to the various platforms by simply dropping -l. Signed-off-by: Eric Sunshine --- Documentation/doc-diff | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/doc-diff b/Documentation/doc-diff index f483fe427

[PATCH 2/3] doc-diff: add --clean mode to remove temporary working gunk

2018-08-31 Thread Eric Sunshine
and deletes all generated files. Signed-off-by: Eric Sunshine --- Documentation/doc-diff | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/Documentation/doc-diff b/Documentation/doc-diff index c2906eac5e..f397fd229b 100755 --- a/Documentation/doc-diff +++ b

Re: [PATCH] doc/Makefile: remove tmp-doc-diff on "make clean"

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 4:34 PM Eric Sunshine wrote: > Taking into consideration that people might be surprised and alarmed > to find "git worktree list" showing a worktree they didn't explicitly > create, would it make sense to do something like this? > > clean: >

Re: [PATCH] doc/Makefile: remove tmp-doc-diff on "make clean"

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:55 PM Jeff King wrote: > The tmp-doc-diff directory isn't strictly a build product of > the Makefile, since it's only present if you manually run > the doc-diff script. But anybody running "make clean" would > probably want it to go away. > >

Re: feature request: allow commit.email config setting

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 7:26 AM Rasmus Villemoes wrote: > I can set GIT_COMMITTER_EMAIL in the environment, but that is > rather inconvenient, since that means I have to remember to do that in > the shell I'm using for that particular project, and I can't use that > shell for other projects. So

Re: [PATCH] doc-diff: always use oids inside worktree

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 4:12 AM Jeff King wrote: > The doc-diff script immediately resolves its two endpoints > to actual object ids, so that we can reuse cached results > even if they appear under a different name. But we still use > the original name the user fed us when running "git >

Re: [PATCH 0/9] worktree: fix bugs and broaden --force applicability

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:54 AM Jeff King wrote: > Subject: [PATCH] doc-diff: force worktree add > > We avoid re-creating our temporary worktree if it's already > there. But we may run into a situation where the worktree > has been deleted, but an entry still exists in > $GIT_DIR/worktrees. Can

Re: [PATCH 0/9] worktree: fix bugs and broaden --force applicability

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:54 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:17PM -0400, Eric Sunshine wrote: > > This series started as a fix for a bug reported by Peff[1] in which the > > "database" of worktrees could be corrupted (or at least become > > int

Re: [PATCH 3/9] worktree: generalize delete_git_dir() to reduce code duplication

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 2:57 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:20PM -0400, Eric Sunshine wrote: > > Simplify by extending delete_git_dir() to handle the little bit of > > extra functionality needed by prune_worktrees(), and drop the > > effectively duplicate

Re: [PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:40 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:25PM -0400, Eric Sunshine wrote: > > - N_("force removing even if the worktree is dirty"), > > + N_("force removal even if worktree is dirty

Re: [PATCH 7/9] worktree: teach 'move' to override lock when --force given twice

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:38 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:24PM -0400, Eric Sunshine wrote: > > For consistency with "add -f -f", which allows a missing but locked > > worktree path to be re-used, allow "move -f -f" to override a lock, &

Re: [PATCH 6/9] worktree: teach 'add' to respect --force for registered but missing path

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:36 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:23PM -0400, Eric Sunshine wrote: > > + if ((!locked && opts->force) || (locked && opts->force > 1)) { > > + if (delete_git_dir(wt->id)) > > +

Re: [PATCH 5/9] worktree: disallow adding same path multiple times

2018-08-30 Thread Eric Sunshine
On Thu, Aug 30, 2018 at 3:28 AM Jeff King wrote: > On Tue, Aug 28, 2018 at 05:20:22PM -0400, Eric Sunshine wrote: > > + /* > > + * find_worktree()'s suffix matching may undesirably find the main > > + * rather than a linked worktree (for instanc

[PATCH] chainlint: match "quoted" here-doc tags

2018-08-29 Thread Eric Sunshine
A here-doc tag can be quoted ('EOF'/"EOF") or escaped (\EOF) to suppress interpolation within the body. chainlint recognizes single-quoted and escaped tags, but does not know about double-quoted tags. For completeness, teach it to recognize double-quoted tags, as well. Signed-of

Re: [PATCH 1/1] commit-graph: define GIT_TEST_COMMIT_GRAPH

2018-08-28 Thread Eric Sunshine
On Tue, Aug 28, 2018 at 5:31 PM Derrick Stolee wrote: > On 8/28/2018 4:41 PM, Stefan Beller wrote: > > On Tue, Aug 28, 2018 at 1:33 PM Derrick Stolee via GitGitGadget > > wrote: > >> + GIT_TEST_COMMIT_GRAPH=0 && > >> + test_must_fail git merge -m final G > > This

Re: [PATCH] doc: Don't echo sed command for manpage-base-url.xsl

2018-08-28 Thread Eric Sunshine
On Tue, Aug 28, 2018 at 5:21 PM Tim Schumacher wrote: > Previously, the sed command for generating manpage-base-url.xsl > was printed to the console when being run. > > For the purpose of silencing it, define a $(QUIET) variable which > contains an '@' if verbose mode isn't enabled and which is

[PATCH 5/9] worktree: disallow adding same path multiple times

2018-08-28 Thread Eric Sunshine
rktree creation only if the given path is not already associated with an existing worktree (even if the path itself is non-existent), thus preventing such bogus worktree entries from being created in the first place. Reported-by: Jeff King Signed-off-by: Eric Sunshine --- builtin/

[PATCH 4/9] worktree: prepare for more checks of whether path can become worktree

2018-08-28 Thread Eric Sunshine
function to avoid further bloating add_worktree(). Signed-off-by: Eric Sunshine --- builtin/worktree.c | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/builtin/worktree.c b/builtin/worktree.c index 0affcb476c..46c93771e8 100644 --- a/builtin/worktree.c +++ b/builtin

[PATCH 9/9] worktree: delete .git/worktrees if empty after 'remove'

2018-08-28 Thread Eric Sunshine
For cleanliness, "git worktree prune" deletes the .git/worktrees directory if it is empty after pruning is complete. For consistency, make "git worktree remove " likewise delete .git/worktrees if it is empty after the removal. Signed-off-by: Eric Sunshine --- builtin/w

[PATCH 6/9] worktree: teach 'add' to respect --force for registered but missing path

2018-08-28 Thread Eric Sunshine
ciated with a worktree entry if the path is non-existent. For a locked worktree, require --force to be specified twice. Signed-off-by: Eric Sunshine --- Documentation/git-worktree.txt | 8 ++-- builtin/worktree.c | 10 -- t/t2025-worktree-add.sh| 13 ++

[PATCH 0/9] worktree: fix bugs and broaden --force applicability

2018-08-28 Thread Eric Sunshine
revealed another existing bug, and after several additional "while we're here" changes, the series ended up a bit longer than expected. [1]: https://public-inbox.org/git/20180821193556.ga...@sigill.intra.peff.net/ [2]: https://public-inbox.org/git/capig+ctghgbbo5vfzn+vp2vm00npkhuqm0douqo37arx

[PATCH 7/9] worktree: teach 'move' to override lock when --force given twice

2018-08-28 Thread Eric Sunshine
For consistency with "add -f -f", which allows a missing but locked worktree path to be re-used, allow "move -f -f" to override a lock, as well, as a convenience. Signed-off-by: Eric Sunshine --- Documentation/git-worktree.txt | 3 +++ builtin/worktree.c | 13 ++

[PATCH 3/9] worktree: generalize delete_git_dir() to reduce code duplication

2018-08-28 Thread Eric Sunshine
by extending delete_git_dir() to handle the little bit of extra functionality needed by prune_worktrees(), and drop the effectively duplicate code from the latter. Signed-off-by: Eric Sunshine --- builtin/worktree.c | 25 + 1 file changed, 9 insertions(+), 16 deletions(-) diff

[PATCH 8/9] worktree: teach 'remove' to override lock when --force given twice

2018-08-28 Thread Eric Sunshine
For consistency with "add -f -f" and "move -f -f" which override the lock on a worktree, allow "remove -f -f" to do so, as well, as a convenience. Signed-off-by: Eric Sunshine --- Documentation/git-worktree.txt | 1 + builtin/worktree.c | 11 ++-

[PATCH 1/9] worktree: don't die() in library function find_worktree()

2018-08-28 Thread Eric Sunshine
, this bug hasn't otherwise been a serious problem since existing callers all die() anyhow when the worktree can't be found. However, that may not be true of callers added in the future, so fix find_worktree() to avoid die()ing. Signed-off-by: Eric Sunshine --- t/t2028-worktree-m

[PATCH 2/9] worktree: move delete_git_dir() earlier in file for upcoming new callers

2018-08-28 Thread Eric Sunshine
This is a pure code movement to avoid having to forward-declare the function when new callers are subsequently added. Signed-off-by: Eric Sunshine --- builtin/worktree.c | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/builtin/worktree.c b

Re: [PATCH v4 4/6] tests: use shorter here-docs in chainlint.sed for AIX sed

2018-08-28 Thread Eric Sunshine
On Tue, Aug 28, 2018 at 4:14 PM Ævar Arnfjörð Bjarmason wrote: > On Fri, Aug 24 2018, Eric Sunshine wrote: > > Shortening the names makes them ugly and often unreadable. That's not > > a complaint with this patch; just a general observation regarding > > 8-byte limitation

Re: worktree duplicates, was: [PATCH] SubmittingPatches: mention doc-diff

2018-08-27 Thread Eric Sunshine
On Fri, Aug 24, 2018 at 7:25 PM Jeff King wrote: > On Fri, Aug 24, 2018 at 06:55:24PM -0400, Eric Sunshine wrote: > > On Fri, Aug 24, 2018 at 10:47 AM Duy Nguyen wrote: > > > > I was thinking that "worktree add" could start respecting the --force &g

Re: [PATCH 9/9] show_dirstat: simplify same-content check

2018-08-25 Thread Eric Sunshine
On Sat, Aug 25, 2018 at 4:17 AM Jeff King wrote: > We two nested conditionals to store a content_changed grammo... > variable, but only bother to look at the result once, > directly after we set it. We can drop the variable entirely > and just use a single "if". > > This needless complexity is

Re: worktree duplicates, was: [PATCH] SubmittingPatches: mention doc-diff

2018-08-24 Thread Eric Sunshine
On Fri, Aug 24, 2018 at 10:47 AM Duy Nguyen wrote: > On Thu, Aug 23, 2018 at 8:21 PM Eric Sunshine wrote: > > Peff wrote: > > > Yes, but then what's the next step for my script? I can't "remove" since > > > the worktree isn't there. I can't blow away any dir

Re: [PATCH v4 4/6] tests: use shorter here-docs in chainlint.sed for AIX sed

2018-08-24 Thread Eric Sunshine
vious fix to this file makes > GIT_TEST_CHAIN_LINT=1 (which is the default) working again on AIX > without issues, and the "gmake check-chainlint" test also passes. > > Signed-off-by: Ævar Arnfjörð Bjarmason FWIW, Acked-by: Eric Sunshine > diff --git a/t/chainlint.sed b/t/chainlint.s

Re: [PATCH v4 3/6] tests: fix comment syntax in chainlint.sed for AIX sed

2018-08-24 Thread Eric Sunshine
y not worth a re-roll. > Signed-off-by: Ævar Arnfjörð Bjarmason FWIW, Acked-by: Eric Sunshine

Re: [PATCH v4 5/6] tests: fix version-specific portability issue in Perl JSON

2018-08-24 Thread Eric Sunshine
On Fri, Aug 24, 2018 at 11:20 AM Ævar Arnfjörð Bjarmason wrote: > The test guarded by PERLJSON added in 75459410ed ("json_writer: new > routines to create JSON data", 2018-07-13) assumed that a JSON boolean > value like "true" or "false" would be represented as "1" or "0" in > Perl. > > This

Re: [PATCH v3 3/5] tests: use shorter here-docs in chainlint.sed for AIX sed

2018-08-23 Thread Eric Sunshine
On Thu, Aug 23, 2018 at 4:36 PM Ævar Arnfjörð Bjarmason wrote: > As noted in [1] there's still a remaining recently introduced > portability issue also introduced in 878f988350 ("t/test-lib: teach > --chain-lint to detect broken &&-chains in subshells", 2018-07-11), so > under AIX the tests must

Re: [PATCH v2 01/10] t/test-lib: teach --chain-lint to detect broken &&-chains in subshells

2018-08-23 Thread Eric Sunshine
On Thu, Aug 23, 2018 at 2:02 PM Ævar Arnfjörð Bjarmason wrote: > Found in some 2.19 testing on AIX: Thanks for reporting these issues. > > + /^[ ]*EOF[ ]*$/!bhereslurp > > AIX sed doesn't like this, and will yell: > :hereslurp is greater than eight characters > This on top fixes

Re: worktree duplicates, was: [PATCH] SubmittingPatches: mention doc-diff

2018-08-23 Thread Eric Sunshine
On Tue, Aug 21, 2018 at 4:43 PM Jeff King wrote: > On Tue, Aug 21, 2018 at 04:22:08PM -0400, Eric Sunshine wrote: > > On Tue, Aug 21, 2018 at 3:36 PM Jeff King wrote: > > How about using "git clone --shared" instead? > > That seems even more dangerous to me, sin

Re: [PATCH] t6018-rev-list-glob: fix 'empty stdin' test

2018-08-22 Thread Eric Sunshine
On Wed, Aug 22, 2018 at 2:59 PM SZEDER Gábor wrote: > On Wed, Aug 22, 2018 at 7:53 PM Eric Sunshine wrote: > > Can you say a word or two (here in the email thread) about how you're > > finding these failures (across the various test fixes you've posted > > recently)?

Re: [PATCH] t6018-rev-list-glob: fix 'empty stdin' test

2018-08-22 Thread Eric Sunshine
On Wed, Aug 22, 2018 at 1:48 PM SZEDER Gábor wrote: > Prior to d3c6751b18 (tests: make use of the test_must_be_empty > function, 2018-07-27), in the test 'rev-list should succeed with empty > output on empty stdin' in 't6018-rev-list-glob' the empty 'expect' > file served dual purpose: besides

Re: worktree duplicates, was: [PATCH] SubmittingPatches: mention doc-diff

2018-08-21 Thread Eric Sunshine
On Tue, Aug 21, 2018 at 3:36 PM Jeff King wrote: > The script does basically this to set up the temporary tree: > > test -d $tmp || git worktree add $tmp ... > > The script never cleans up the worktree (since its results can often be > reused between runs), but you may do so with "rm" or "git

Re: [PATCH v2 2/2] commit-graph.txt: improve formatting for asciidoc

2018-08-21 Thread Eric Sunshine
On Tue, Aug 21, 2018 at 3:29 PM Derrick Stolee via GitGitGadget wrote: > When viewing commit-graph.txt as a plain-text document, it makes > sense to keep paragraphs left-padded between bullet points. > However, asciidoc converts these left-padded paragraphs as monospace > fonts, creating an

Re: [PATCH] mw-to-git/t9360: fix broken &&-chain

2018-08-21 Thread Eric Sunshine
On Tue, Aug 21, 2018 at 2:55 PM Antoine Beaupré wrote: > On 2018-08-08 18:10:22, Matthieu Moy wrote: > > "jrnieder" wrote: > >> (+cc: some folks interested in git-remote-mediawiki) > > > > In case it still matters, an obvious Acked-by: Matthieu Moy > > > > I seem to have lost context of the

Re: [PATCH/RFC] commit: new option to abort -a something is already staged

2018-08-20 Thread Eric Sunshine
On Mon, Aug 20, 2018 at 11:41 AM Nguyễn Thái Ngọc Duy wrote: > One way to deal with this is some form of `git undo` that allows me to > retrieve the old index. That's not a lot of work by itself. The problem > is designing that `git undo` interface because there are more undo > options that this.

Re: What's cooking in git.git (Aug 2018, #04; Fri, 17)

2018-08-20 Thread Eric Sunshine
On Mon, Aug 20, 2018 at 6:23 AM Phillip Wood wrote: > On 17/08/2018 23:44, Junio C Hamano wrote: > > * pw/rebase-i-author-script-fix (2018-08-07) 2 commits > > - sequencer: fix quoting in write_author_script > > - sequencer: handle errors from read_author_ident() > > > > Undecided. > > Is it

Re: [PATCH v2 01/11] t: add tool to translate hash-related values

2018-08-19 Thread Eric Sunshine
On Sun, Aug 19, 2018 at 5:50 PM brian m. carlson wrote: > On Sun, Aug 19, 2018 at 03:40:22PM -0400, Eric Sunshine wrote: > > On Sun, Aug 19, 2018 at 1:54 PM brian m. carlson > > wrote: > > > + test "$(test_oid hexsz)" -eq $(wc -c > > +

Re: [PATCH v2 05/11] t0027: make hash size independent'

2018-08-19 Thread Eric Sunshine
On Sun, Aug 19, 2018 at 5:57 PM brian m. carlson wrote: > On Sun, Aug 19, 2018 at 04:10:21PM -0400, Eric Sunshine wrote: > > On Sun, Aug 19, 2018 at 1:54 PM brian m. carlson > > > - tr '\015\000abcdef0123456789' QN0 <"$2" >"$exp" &

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