Re: [PATCH 2/2] mingw: enable DEP and ASLR

2019-04-29 Thread Johannes Sixt
[had to add Dscho as recipient manually, mind you] Am 29.04.19 um 23:56 schrieb İsmail Dönmez via GitGitGadget: > From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= > > Enable DEP (Data Execution Prevention) and ASLR (Address Space Layout > Randomization) support. This applies to both 32bit and 64bit b

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread Johannes Sixt
Am 30.04.19 um 01:17 schrieb Johannes Schindelin: > On Mon, 29 Apr 2019, Eric Sunshine wrote: >> On Mon, Apr 29, 2019 at 6:04 PM Thomas Braun via GitGitGadget >>> diff --git a/Documentation/config/sendpack.txt >>> b/Documentation/config/sendpack.txt >>> @@ -0,0 +1,5 @@ >>> +sendpack.sideband:: >>>

[PATCH v2] status: add an empty line when there is no hint

2019-04-29 Thread John Lin
When typing "git status", there is an empty line between the "Changes not staged for commit:" block and the list of changed files. However, when typing "git commit" with no files added, there are no empty lines between them. This patch adds empty lines in the above case and some similar cases. Si

Re: [PATCH v2 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

2019-04-29 Thread Duy Nguyen
On Tue, Apr 30, 2019 at 8:02 AM Johannes Schindelin wrote: > > Hi Duy, > > On Sun, 24 Mar 2019, 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 than burying it in diff-no-index.c > > I just noticed that this commit message

Re: [PATCH] status: add an empty line when there is no hint

2019-04-29 Thread 林自均
Hi Phil, Thank you for the review! I will fix the test cases and submit a new version of my patch. Best, John Lin Phil Hord 於 2019年4月30日 週二 上午11:12寫道: > > You should probably add some test that demonstrates what your change > intends to do. For that matter, though, your test already breaks at

Re: [PATCH] status: add an empty line when there is no hint

2019-04-29 Thread Phil Hord
You should probably add some test that demonstrates what your change intends to do. For that matter, though, your test already breaks at least two tests in t7508-status.sh: not ok 14 - status (advice.statusHints false) not ok 23 - status -uno (advice.statusHints false) Phil On Tue, Apr 23, 2019

Re: [PATCH v2 19/20] diff --no-index: use parse_options() instead of diff_opt_parse()

2019-04-29 Thread Johannes Schindelin
Hi Duy, On Sun, 24 Mar 2019, 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 than burying it in diff-no-index.c I just noticed that this commit message is missing more than just a trailing period. It does not explain the change

Quick Response

2019-04-29 Thread Arthur Alan
I am writing you this email to seek your cooperation and partnership in a business that would benefit us immensely. I would like to name you as the beneficiary to my late client's fund who died along with his next-of-kin during a summer vacation in the Middle East. I shall offer you 50 percent of

Re: [PATCH 1/1] credential: do not mask the username

2019-04-29 Thread Jeff King
On Mon, Apr 29, 2019 at 03:06:11PM -0700, Jarosław Honkis via GitGitGadget wrote: > From: =?UTF-8?q?Jaros=C5=82aw=20Honkis?= > > When a user is asked for credentials there is no need to mask the > username, so the PROMPT_ASKPASS flag on calling credential_ask_one for > login is unnecessary. >

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread brian m. carlson
On Mon, Apr 29, 2019 at 03:04:36PM -0700, Thomas Braun via GitGitGadget wrote: > From: Thomas Braun > > Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with > status data, 2010-02-05) the built-in send-pack uses the side-band-64k > capability if advertised by the server. > > Un

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread Johannes Schindelin
Hi Eric, On Mon, 29 Apr 2019, Eric Sunshine wrote: > On Mon, Apr 29, 2019 at 6:04 PM Thomas Braun via GitGitGadget > wrote: > > Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with > > status data, 2010-02-05) the built-in send-pack uses the side-band-64k > > capability if adve

Re: [PATCH 1/1] credential: do not mask the username

2019-04-29 Thread Johannes Schindelin
Hi Eric, On Mon, 29 Apr 2019, Eric Sunshine wrote: > On Mon, Apr 29, 2019 at 6:06 PM Jarosław Honkis via GitGitGadget > wrote: > > When a user is asked for credentials there is no need to mask the > > username, so the PROMPT_ASKPASS flag on calling credential_ask_one for > > login is unnecessar

Re: [PATCH 1/1] mingw: remove obsolete IPv6-related code

2019-04-29 Thread Johannes Schindelin
Hi Junio, it looks as if this patch was not yet picked up? This is a straight-forward code removal in favor of dropping Windows XP support (which we officially did, quite some time ago). Is there anything you want me to do to get this at least into `pu`? Ciao, Dscho On Wed, 27 Feb 2019, Tanushr

Re: [PATCH 1/1] t5580: verify that alternates can be UNC paths

2019-04-29 Thread Johannes Schindelin
Hi Junio, gentle ping: this patch was not picked up yet, although it should be pretty uncontroversial. Ciao, Dscho On Mon, 25 Feb 2019, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > On Windows, UNC paths are a very convenient way to share data, and > alternates ar

js/macos-gettext-build, was Re: What's cooking in git.git (Apr 2019, #05; Thu, 25)

2019-04-29 Thread Johannes Schindelin
Hi Junio, On Thu, 25 Apr 2019, Junio C Hamano wrote: > * js/macos-gettext-build (2019-04-15) 1 commit > (merged to 'next' on 2019-04-22 at de4cbb1431) > + macOS: make sure that gettext is found > > Build with gettext breaks on recent macOS w/ Homebrew when > /usr/local/bin is not on PATH, wh

Re: [PATCH 1/1] credential: do not mask the username

2019-04-29 Thread Eric Sunshine
On Mon, Apr 29, 2019 at 6:06 PM Jarosław Honkis via GitGitGadget wrote: > When a user is asked for credentials there is no need to mask the > username, so the PROMPT_ASKPASS flag on calling credential_ask_one for > login is unnecessary. > > The `credential_ask_one()` function internally uses `git_

Re: [PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread Eric Sunshine
On Mon, Apr 29, 2019 at 6:04 PM Thomas Braun via GitGitGadget wrote: > Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with > status data, 2010-02-05) the built-in send-pack uses the side-band-64k > capability if advertised by the server. > > Unfortunately this breaks pushing ove

Do I need to create an issue before submitting a patch?

2019-04-29 Thread 林自均
Hi all, I submitted a patch on 2019/4/23 with the title "[PATCH] status: add an empty line when there is no hint". However, it didn't get any review. Should I create an issue somewhere before submitting it? What should I do to get my patch reviewed? Thanks. Best, John Lin

[PATCH 0/1] credential: do not mask the username

2019-04-29 Thread Johannes Schindelin via GitGitGadget
This is yet another patch that finally makes it from Git for Windows into core Git. Jarosław Honkis (1): credential: do not mask the username credential.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) base-commit: 8104ec994ea3849a968b4667d072fedd1e688642 Published-As: https://git

[PATCH 1/1] credential: do not mask the username

2019-04-29 Thread Jarosław Honkis via GitGitGadget
From: =?UTF-8?q?Jaros=C5=82aw=20Honkis?= When a user is asked for credentials there is no need to mask the username, so the PROMPT_ASKPASS flag on calling credential_ask_one for login is unnecessary. The `credential_ask_one()` function internally uses `git_prompt()` which in case it is given the

[PATCH 1/1] mingw: optionally disable side-band-64k for transport

2019-04-29 Thread Thomas Braun via GitGitGadget
From: Thomas Braun Since commit 0c499ea60f (send-pack: demultiplex a sideband stream with status data, 2010-02-05) the built-in send-pack uses the side-band-64k capability if advertised by the server. Unfortunately this breaks pushing over the dump git protocol if used over a network connection

[PATCH 0/1] Support git:// with old MinGW

2019-04-29 Thread Johannes Schindelin via GitGitGadget
The MinGW project (which can now be considered "old", as mingw-w64 is the standard thing to use nowadays, since it also supports 64-bit builds) had some problems with our sideband feature, and in Git for Windows <2.x, we introduced a config setting to still allow using the git:// protocol by forcin

[PATCH 0/1] Fix cvsexportcommit with CR/LF line endings

2019-04-29 Thread Johannes Schindelin via GitGitGadget
When using CVSNT, we need to be prepared to grok CVS output with CR/LF line endings. While we do not use CVSNT in Git for Windows, this patch made its way into Git's source code via the Git for Windows project (probably because of the ease of GitHub PRs), and we had not a single complaint for over

[PATCH 1/1] cvsexportcommit: force crlf translation

2019-04-29 Thread Dustin Spicuzza via GitGitGadget
From: Dustin Spicuzza When using cvsnt + msys + git, it seems like the output of cvs status had \r\n in it, and caused the command to fail. This fixes that. Signed-off-by: Dustin Spicuzza Signed-off-by: Johannes Schindelin --- git-cvsexportcommit.perl | 1 + 1 file changed, 1 insertion(+) d

[PATCH 2/2] mingw: enable DEP and ASLR

2019-04-29 Thread İsmail Dönmez via GitGitGadget
From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= Enable DEP (Data Execution Prevention) and ASLR (Address Space Layout Randomization) support. This applies to both 32bit and 64bit builds and makes it substantially harder to exploit security holes in Git by offering a much more unpredictable attack sur

[PATCH 0/2] Enable Data Execution Protection and Address Space Layout Randomization on Windows

2019-04-29 Thread Johannes Schindelin via GitGitGadget
These two techniques make it harder to come up with exploits, by reducing what is commonly called the "attack surface" in security circles: by making the addresses less predictable, and by making it harder to inject data that is then (mis-)interpreted as code, this hardens Git's executables on Wind

[PATCH 1/2] mingw: do not let ld strip relocations

2019-04-29 Thread İsmail Dönmez via GitGitGadget
From: =?UTF-8?q?=C4=B0smail=20D=C3=B6nmez?= This is the first step for enabling ASLR (Address Space Layout Randomization) support. We want to enable ASLR for better protection against exploiting security holes in Git: it makes it harder to attack software by making code addresses unpredictable.

Re: [PATCH v10 0/3]

2019-04-29 Thread Nickolai Belakovski
Sorry, I'm not very accustomed to mailing list development. I had assumed that this was being threaded with the other messages in the series, hence leaving the subject blank and only putting new info in the body. In the future I'll add in an appropriate subject and brief re-hash in the body. Thank

Re: [PATCH 1/2] archive: replace write_or_die() calls with write_block_or_die()

2019-04-29 Thread Johannes Schindelin
Hi Junio, On Sat, 27 Apr 2019, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> >> +/* writes out the whole block, or dies if fails */ > >> >> +static void write_block_or_die(const char *block) { > >> >> + if (gzip) { > >> >> + if (gzwrite(gzip, block, (unsigned) BL

Re: [PATCH 2/2] archive: avoid spawning `gzip`

2019-04-29 Thread Johannes Schindelin
Hi René, On Sat, 27 Apr 2019, René Scharfe wrote: > Am 27.04.19 um 11:59 schrieb René Scharfe:> Am 26.04.19 um 16:51 schrieb > Johannes Schindelin: > >> > >> On Mon, 15 Apr 2019, Jeff King wrote: > >> > >>> On Sun, Apr 14, 2019 at 12:01:10AM +0200, René Scharfe wrote: > >>> > Doing compress

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-29 Thread Johannes Schindelin
Hi Aleksey, On Mon, 29 Apr 2019, Aleksey Midenkov wrote: > git rebase -p -x /tmp/check.sh base > ``` > If the `base` is far away enough it fails with "fatal: Unable to > create '.../.git/index.lock': File exists." at an arbitrary commit. Does it work if you pass `-r` instead of `-p`? The latter

Re: [PATCH v10 0/3]

2019-04-29 Thread Johannes Schindelin
Hi, am I the only person who is puzzled every time this patch series with a completely empty subject and without any further explanation about the intent in the mail body is sent? Ciao, Johannes On Sun, 28 Apr 2019, nbelakov...@gmail.com wrote: > From: Nickolai Belakovski > > Added test_i18nc

Re: [PATCH v5 00/11] trace2: load trace2 settings from system config

2019-04-29 Thread Jeff Hostetler
I forgot to update the cover letter for V5. V5 adds a commit to fix the permission problem in /etc/gitconfig reported by SZEDER. This commit could/should be squashed into commit 5 if wanted. I left it on top for review purposes. Jeff On 4/29/2019 4:14 PM, Jeff Hostetler via GitGitGadget wrot

[PATCH v5 08/11] trace2: clarify UTC datetime formatting

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Update tr2_tbuf_utc_datetime to generate extended UTC format. Update tr2_tgt_event target to use extended format in 'time' columns. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-trace2.txt | 12 ++-- trace2/tr2_tbuf.c | 4 ++--

[PATCH v5 01/11] config: initialize opts structure in repo_read_config()

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Initialize opts structure in repo_read_config(). This change fixes a crash in later commit after a new field is added to the structure. In commit 3b256228a66f8587661481ef3e08259864f3ba2a, repo_read_config() was added. It only initializes 3 fields in the opts structure. It

[PATCH v5 02/11] trace2: refactor setting process starting time

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Create trace2_initialize_clock() and call from main() to capture process start time in isolation and before other sub-systems are ready. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-trace2.txt | 12 ++-- common-main.c | 2 ++

[PATCH v5 00/11] trace2: load trace2 settings from system config

2019-04-29 Thread Jeff Hostetler via GitGitGadget
Version 4 fixes a few clang-format warnings and simplifies the PID field in the SID. Jeff Hostetler (11): config: initialize opts structure in repo_read_config() trace2: refactor setting process starting time trace2: add absolute elapsed time to start event trace2: find exec-dir before tra

[PATCH v5 06/11] trace2: use system/global config for default trace2 settings

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Teach git to read the system and global config files for default Trace2 settings. This allows system-wide Trace2 settings to be installed and inherited to make it easier to manage a collection of systems. The original GIT_TR2* environment variables are loaded afterwards and

[PATCH v5 11/11] trace2: fixup access problem on /etc/gitconfig in read_very_early_config

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Teach do_git_config_sequence() to optionally gently check for access to the system config. Use this option in read_very_early_config() when initializing trace2. In [1] SZEDER Gábor reported that my changes in [2] introduced a regression when the user does not have permissio

[PATCH v5 03/11] trace2: add absolute elapsed time to start event

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Add elapsed process time to "start" event to measure the performance of early process startup. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-trace2.txt | 11 ++- t/t0211-trace2-perf.sh | 12 ++-- trace2.c

[PATCH v5 04/11] trace2: find exec-dir before trace2 initialization

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Teach Git to resolve the executable directory before initializing Trace2. This allows the system configuration directory to be discovered earlier (because it is sometimes relative to the prefix or runtime-prefix). This will be used by the next commit to allow trace2 setting

[PATCH v5 05/11] config: add read_very_early_config()

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Created an even lighter version of read_early_config() that only looks at system and global config settings. It omits repo-local, worktree-local, and command-line settings. Signed-off-by: Jeff Hostetler --- config.c | 23 --- config.h | 4 2 file

[PATCH v5 07/11] trace2: report peak memory usage of the process

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Teach Windows version of git to report peak memory usage during exit() processing. Signed-off-by: Jeff Hostetler --- common-main.c| 2 +- compat/win32/trace2_win32_process_info.c | 50 ++-- trace2.c

[PATCH v5 09/11] trace2: make SIDs more unique

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Update SID component construction to use the current UTC datetime and a portion of the SHA1 of the hostname. Use an simplified date/time format to make it easier to use the SID component as a logfile filename. Signed-off-by: Jeff Hostetler --- Documentation/technical/api-

[PATCH v5 10/11] trace2: update docs to describe system/global config settings

2019-04-29 Thread Jeff Hostetler via GitGitGadget
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- Documentation/config.txt | 2 + Documentation/config/trace2.txt| 56 + Documentation/technical/api-trace2.txt | 151 ++--- Documentation/trace2-target-values.txt | 10 ++ 4 files changed

Re: [PATCH v10 0/3]

2019-04-29 Thread Nickolai Belakovski
> Testing with GETTEXT_POISON was broken since 6cdccfce (i18n: make > GETTEXT_POISON a runtime option, 2018-11-08), and didn't catch any of > these issues. See: > > > https://public-inbox.org/git/xmqqlg0bvppc.fsf...@gitster-ct.c.googlers.com/T/#u > > The fix f88b9cb603 (gettext tests: export th

Re: [PATCH v4 06/10] trace2: use system/global config for default trace2 settings

2019-04-29 Thread Jeff Hostetler
On 4/27/2019 9:43 AM, SZEDER Gábor wrote: On Mon, Apr 15, 2019 at 01:39:47PM -0700, Jeff Hostetler via GitGitGadget wrote: From: Jeff Hostetler Teach git to read the system and global config files for default Trace2 settings. This allows system-wide Trace2 settings to be installed and inhe

[PATCH 0/2] Multi-pack-index: Fix "too many file descriptors" bug

2019-04-29 Thread Derrick Stolee via GitGitGadget
Thanks to Jeff H for finding the problem with the multi-pack-index regarding many packs. Specifically: if we open too many packs, the close_one_pack() method cannot find the packs from the multi-pack-index to close. Jeff already fixed the problem explicitly in 'git multi-pack-index verify' which w

[PATCH 1/2] midx: pass a repository pointer

2019-04-29 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee Much of the multi-pack-index code focuses on the multi_pack_index struct, and so we only pass a pointer to the current one. However, we will insert a dependency on the packed_git linked list in a future change, so we will need a repository reference. Inserting these parameter

[PATCH 2/2] midx: add packs to packed_git linked list

2019-04-29 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The multi-pack-index allows searching for objects across multiple packs using one object list. The original design gains many of these performance benefits by keeping the packs in the multi-pack-index out of the packed_git list. Unfortunately, this has one major drawback. If

Re: [PATCH] rebase -r: always reword merge -c

2019-04-29 Thread Johannes Schindelin
Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: > From: Phillip Wood > > If a merge can be fast-forwarded then make sure that we still edit the > commit message if the user specifies -c. The implementation follows the > same pattern that is used for ordinary rewords that are fast-forwarded.

Re: [PATCH] rebase --abort: cleanup refs/rewritten

2019-04-29 Thread Johannes Schindelin
Hi Phillip, On Fri, 26 Apr 2019, Phillip Wood wrote: > From: Phillip Wood > > When `rebase -r` finishes it removes any refs under refs/rewritten > that it has created. However if the rebase is aborted these refs are > not removed. This can cause problems for future rebases. For example I > recen

Re: [PATCH v6 15/27] switch: add --discard-changes

2019-04-29 Thread Phillip Wood
On 25/04/2019 11:12, Duy Nguyen wrote: On Thu, Apr 25, 2019 at 5:02 PM Phillip Wood wrote: On 29/03/2019 10:39, Nguyễn Thái Ngọc Duy wrote: --discard-changes is a better name than --force for this option since it's what really happens. I didn't realize when I suggested the name that --force

Re: [PATCH v6 23/27] switch: reject if some operation is in progress

2019-04-29 Thread Phillip Wood
On 29/04/2019 10:16, Duy Nguyen wrote: On Thu, Apr 25, 2019 at 5:33 PM Phillip Wood wrote: On 29/03/2019 10:39, Nguyễn Thái Ngọc Duy wrote: Unless you know what you're doing, switching to another branch to do something then switching back could be confusing. Worse, you may even forget that yo

Re: [PATCH v3 4/8] commit-graph: don't early exit(1) on e.g. "git status"

2019-04-29 Thread Ævar Arnfjörð Bjarmason
On Mon, Apr 29 2019, Derrick Stolee wrote: > On 4/27/2019 9:06 AM, Ævar Arnfjörð Bjarmason wrote: >> >> There's still cases left where we'll exit early, e.g. if you do: >> >> $ git diff -U1 >> diff --git a/commit-graph.c b/commit-graph.c >> index 66865acbd7..63773764ce 100644 >>

Re: [PATCH v10 0/3]

2019-04-29 Thread SZEDER Gábor
On Sun, Apr 28, 2019 at 10:19:41PM -0700, nbelakov...@gmail.com wrote: > From: Nickolai Belakovski > > Added test_i18ncmp per instructions from Szeder > > Is there some other part of the infrastructure that's testing for this? > Because it did not fail in any of my Travis CI builds. > > Travis

Re: do people find t5504.8 flaky?

2019-04-29 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Apr 2019, Junio C Hamano wrote: > I have been seeing occasional failures of t5504-fetch-receive-strict > test on the cc/replace-graft-peel-tags topic, but it seems that the > fork point of that topic from the mainline already fails the same > step #8, only less frequently. S

Re: [PATCH] trace2: fix incorrect function pointer check

2019-04-29 Thread Jeff Hostetler
On 4/25/2019 1:08 PM, Josh Steadmon wrote: Fix trace2_data_json_fl() to check for the presence of pfn_data_json_fl in its targets, rather than pfn_data_fl, which is not actually called. Signed-off-by: Josh Steadmon --- trace2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -

Re: [PATCH v3 4/8] commit-graph: don't early exit(1) on e.g. "git status"

2019-04-29 Thread Derrick Stolee
On 4/27/2019 9:06 AM, Ævar Arnfjörð Bjarmason wrote: > > There's still cases left where we'll exit early, e.g. if you do: > > $ git diff -U1 > diff --git a/commit-graph.c b/commit-graph.c > index 66865acbd7..63773764ce 100644 > --- a/commit-graph.c > +++ b/commit-graph.c >

Re: [PATCH v2 5/8] docs: exclude documentation for commands that have been excluded

2019-04-29 Thread Johannes Schindelin
Hi Junio, On Fri, 19 Apr 2019, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > From: Johannes Schindelin > > > > When building with certain build options, some commands are excluded > > from the build. For example, `git-credential-cache` is skipped when > > buildi

Re: Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-29 Thread Duy Nguyen
On Mon, Apr 29, 2019 at 6:03 PM Aleksey Midenkov wrote: > > Reproduce: > ``` > cat << EOF >> /tmp/check.sh > #!/bin/sh > git log HEAD~..HEAD | cat > # sleep 1 > EOF > chmod +x /tmp/check.sh > git rebase -p -x /tmp/check.sh base > ``` > If the `base` is far away enough it fails with "fatal: Unable

Bug: fatal: Unable to create '.../.git/index.lock': File exists.

2019-04-29 Thread Aleksey Midenkov
Reproduce: ``` cat << EOF >> /tmp/check.sh #!/bin/sh git log HEAD~..HEAD | cat # sleep 1 EOF chmod +x /tmp/check.sh git rebase -p -x /tmp/check.sh base ``` If the `base` is far away enough it fails with "fatal: Unable to create '.../.git/index.lock': File exists." at an arbitrary commit. Abort cur

[PATCH v2] parse-options: don't emit "ambiguous option" for aliases

2019-04-29 Thread Nguyễn Thái Ngọc Duy
Change the option parsing machinery so that e.g. "clone --recurs ..." doesn't error out because "clone" understands both "--recursive" and "--recurse-submodules" to mean the same thing. Initially "clone" just understood --recursive until the --recurses-submodules alias was added in ccdd3da652 ("cl

Re: [PATCH v6 23/27] switch: reject if some operation is in progress

2019-04-29 Thread Duy Nguyen
On Thu, Apr 25, 2019 at 5:33 PM Phillip Wood wrote: > > On 29/03/2019 10:39, Nguyễn Thái Ngọc Duy wrote: > > Unless you know what you're doing, switching to another branch to do > > something then switching back could be confusing. Worse, you may even > > forget that you're in the middle of someth

Re: [PATCH v5 0/3] *** SUBJECT HERE ***

2019-04-29 Thread Denton Liu
> Subject: [PATCH v5 0/3] *** SUBJECT HERE *** I forgot to change the subject... Embarassing. On Mon, Apr 29, 2019 at 04:28:09AM -0400, Denton Liu wrote: > Hi Junio, > > Since you mentioned you prefer wholesale replacement patches, here's a > reroll. > > I dropped the trailing '\' in the log me

[PATCH v5 3/3] *.[ch]: manually align parameter lists

2019-04-29 Thread Denton Liu
In previous patches, extern was mechanically removed from function declarations without care to formatting, causing parameter lists to be misaligned. Manually format changed sections such that the parameter lists should be realigned. Viewing this patch with 'git diff -w' should produce no output.

[PATCH v5 2/3] *.[ch]: remove extern from function declarations using sed

2019-04-29 Thread Denton Liu
There has been a push to remove extern from function declarations. Finish the job by removing all instances of "extern" for function declarations in headers using sed. This was done by running the following on my system with sed 4.2.2: $ git ls-files \*.{c,h} | grep -v ^compat/ |

[PATCH v5 0/3] *** SUBJECT HERE ***

2019-04-29 Thread Denton Liu
Hi Junio, Since you mentioned you prefer wholesale replacement patches, here's a reroll. I dropped the trailing '\' in the log messages and we also drop the 4th patch since Szeder reported that it was causing problems for the CI. --- Changes since v1: * Used spatch with sed instead of sed alon