Re: Regression: Ctrl-c from the pager in an alias exits it

On Fri, Jan 06, 2017 at 02:26:02AM -0500, Jeff King wrote: > You'll notice that it actually calls wait() on the pager. That's due to > a3da882120 (pager: do wait_for_pager on signal death, 2009-01-22), which > IIRC was addressing a very similar problem. We want to stop feeding the > pager when we

Re: Regression: Ctrl-c from the pager in an alias exits it

On Fri, Jan 06, 2017 at 01:47:52AM -0500, Jeff King wrote: > > > To reproduce, create e.g. the alias `l = log` and run `git l`. Then press > > > Ctrl-c. The expected behavior is that nothing happens. The actual > > > behavior is > > > that the pager exits. > > > > That's weird. I can't

Re: Regression: Ctrl-c from the pager in an alias exits it

On Fri, Jan 06, 2017 at 01:40:32AM -0500, Jeff King wrote: > On Thu, Jan 05, 2017 at 03:25:29PM +0100, Trygve Aaberge wrote: > > > I'm experiencing an issue when using aliases for commands that open the > > pager. > > When I press Ctrl-c from the pager, it exits. This does not happen when I > >

Re: Regression: Ctrl-c from the pager in an alias exits it

On Thu, Jan 05, 2017 at 03:25:29PM +0100, Trygve Aaberge wrote: > I'm experiencing an issue when using aliases for commands that open the pager. > When I press Ctrl-c from the pager, it exits. This does not happen when I > don't use an alias and did not happen before. It causes problems because >

Re: [PATCH] branch_get_push: do not segfault when HEAD is detached

On Thu, Jan 05, 2017 at 11:56:23PM -0500, Kyle Meyer wrote: > Move the detached HEAD check from branch_get_push_1() to > branch_get_push() to avoid setting branch->push_tracking_ref when > branch is NULL. Yep, I think this is the right fix. > diff --git a/t/t1514-rev-parse-push.sh

[PATCH] branch_get_push: do not segfault when HEAD is detached

Move the detached HEAD check from branch_get_push_1() to branch_get_push() to avoid setting branch->push_tracking_ref when branch is NULL. Signed-off-by: Kyle Meyer --- remote.c | 6 +++--- t/t1514-rev-parse-push.sh | 6 ++ 2 files changed, 9 insertions(+),

[PATCH 3/3] blame: output porcelain "previous" header for each file

It's possible for content currently found in one file to have originated in two separate files, each of which may have been modified in some single older commit. The --porcelain output generates an incorrect "previous" header in this case, whereas --line-porcelain gets it right. The problem is

[PATCH 1/3] blame: fix alignment with --abbrev=40

The blame command internally adds 1 to any requested sha1 abbreviation length, and then subtracts it when outputting a boundary commit. This lets regular and boundary sha1s line up visually, but it misses one corner case. When the requested length is 40, we bump the value to 41. But since we only

[PATCH 2/3] blame: handle --no-abbrev

You can already ask blame for full sha1s with "-l" or with "--abbrev=40". But for consistency with other parts of Git, we should support "--no-abbrev". Worse, blame already accepts --no-abbrev, but it's totally broken. When we see --no-abbrev, the abbrev variable is set to 0, which is then used

[PATCH 0/3] fixing some random blame corner cases

Here are three fixes for some fairly obscure corner cases. I haven't actually seen these in the wild. I came up with the final one while discussing a hypothetical with somebody, then ran across the middle one while trying to write a test for the third, which made me scratch my head enough to yield

Re: [PATCH v2 2/4] t7610: make tests more independent and debuggable

On Thu, Jan 5, 2017 at 5:09 PM, Richard Hansen wrote: > Reduce how much a test can interfere other tests: A bullet point list as an unordered list often indicates that you're doing multiple things at once, possibly unrelated, so they could go into different patches. ;) While

[PATCH v2 0/4] fix mergetool+rerere+subdir regression

If rerere is enabled, no pathnames are given, and mergetool is run from a subdirectory, mergetool always prints "No files need merging". Fix the bug. This regression was introduced in 57937f70a09c12ef484c290865dac4066d207c9c (v2.11.0). Changes since v1: * Patch 2/4 was reworked to improve the

[PATCH v2 2/4] t7610: make tests more independent and debuggable

Reduce how much a test can interfere other tests: * Move setup code that multiple tests depend on to the 'setup' test case. * Run 'git reset --hard' after every test (pass or fail) to clean up in case the test fails and leaves the repository in a strange state. * If the

[PATCH v2 4/4] mergetool: fix running in subdir when rerere enabled

If rerere is enabled and no pathnames are given, run cd_to_toplevel before running 'git diff --name-only' so that 'git diff --name-only' sees the pathnames emitted by 'git rerere remaining'. Also run cd_to_toplevel before running 'git rerere remaining' in case 'git rerere remaining' is ever

[PATCH v2 1/4] t7610: update branch names to match test number

Rename the testNN branches so that NN matches the test number. This should make it easier to troubleshoot test issues. Use $test_count to keep this future-proof. Signed-off-by: Richard Hansen --- t/t7610-mergetool.sh | 82

[PATCH v2 3/4] t7610: add test case for rerere+mergetool+subdir bug

If rerere is enabled and mergetool is run from a subdirectory, mergetool always prints "No files need merging". Add an expected failure test case for this situation. Signed-off-by: Richard Hansen --- t/t7610-mergetool.sh | 21 - 1 file changed, 20

[PATCHv6 1/2] submodule tests: don't use itself as a submodule

In reality nobody would run "git submodule add ./. " to add the repository to itself as a submodule as this comes with some nasty surprises, such as infinite recursion when cloning that repository. However we do this all the time in the test suite, because most of the time this was the most

[PATCHv6 0/2] pathspec: give better message for submodule related pathspec error

v6: * rebased on top of origin/bw/pathspec-cleanup, resolving conflicts. (Additionally needs merging with origin/sb/submodule-embed-gitdir to have 6f94351b0, test-lib-functions.sh: teach test_commit -C ) * reworded comments and commit message * do not reuse the strip_submodule_slash_expensive

[PATCHv6 2/2] pathspec: give better message for submodule related pathspec error

Every once in a while someone complains to the mailing list to have run into this weird assertion[1]. The usual response from the mailing list is link to old discussions[2], and acknowledging the problem stating it is known. This patch accomplishes two things: 1. Switch assert() to die("BUG")

Re: [PATCH 1/2] asciidoctor: fix user-manual to be built by `asciidoctor`

On Thu, Jan 05, 2017 at 11:05:29AM +0100, Lars Schneider wrote: > > The git-scm.com site uses asciidoctor, too, and I think I have seen some > > oddness with the rendering though. So in general I am in favor of making > > things work under both asciidoc and asciidoctor. > > I am not familiar

Re: core.sshCommand and url.*.insteadOf for submodules

On Thu, Jan 5, 2017 at 9:02 AM, Jeff King wrote: > On Thu, Jan 05, 2017 at 05:53:30AM -0800, Stefan Beller wrote: > >> > My scenario is as follows: I use 2 SSH keys for GitHub, for private and >> > work-related repositories. My default key is my private key. So when I >> > clone a

Re: core.sshCommand and url.*.insteadOf for submodules

On Thu, Jan 05, 2017 at 05:53:30AM -0800, Stefan Beller wrote: > > My scenario is as follows: I use 2 SSH keys for GitHub, for private and > > work-related repositories. My default key is my private key. So when I > > clone a work repository and try getting the submodules, `git submodule > >

Re: [PATCH 2/4] t7610: make tests more independent and debuggable

On 2017-01-04 15:27, Stefan Beller wrote: On Tue, Jan 3, 2017 at 4:50 PM, Richard Hansen wrote: If a test fails it might leave the repository in a strange state. Add 'git reset --hard' at the beginning of each test to increase the odds of passing when an earlier test

Re: [PATCH 2/4] t7610: make tests more independent and debuggable

On 2017-01-05 07:20, Simon Ruderich wrote: On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote: [snip] @@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' ' ' test_expect_success 'mergetool on file in parent dir' ' + git reset --hard && + git checkout -b

Re: [PATCH 2/4] t7610: make tests more independent and debuggable

On 2017-01-04 15:27, Stefan Beller wrote: On Tue, Jan 3, 2017 at 4:50 PM, Richard Hansen wrote: If a test fails it might leave the repository in a strange state. Add 'git reset --hard' at the beginning of each test to increase the odds of passing when an earlier test

Regression: Ctrl-c from the pager in an alias exits it

I'm experiencing an issue when using aliases for commands that open the pager. When I press Ctrl-c from the pager, it exits. This does not happen when I don't use an alias and did not happen before. It causes problems because Ctrl-c is also used for other things, such as canceling a search that

Re: git branch -D doesn't work with deleted worktree

On Thu, Jan 5, 2017 at 2:06 AM, Roland Illig wrote: > Git 2.11.0 gives a wrong error message after the following commands: > > $ git init > $ echo hello >file > $ git add file > $ git commit -m "message" > $ git worktree add ../worktree > $ rm -rf ../worktree > $ git br -D

Re: core.sshCommand and url.*.insteadOf for submodules

On Thu, Jan 5, 2017 at 2:09 AM, Stefan Schindler wrote: > Hello mailing list, > > it seems like that the `core.sshCommand` and `url.*.insteadOf` > configuration settings do not apply to `git submodule update --init` > (and probably related) calls. > > Is this intentional? The

Re: [PATCH 1/2] asciidoctor: fix user-manual to be built by `asciidoctor`

Hi Lars, On Thu, 5 Jan 2017, Lars Schneider wrote: > > On 04 Jan 2017, at 09:08, Jeff King wrote: > > > > On Mon, Jan 02, 2017 at 05:03:57PM +0100, Johannes Schindelin wrote: > > > >> From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= > >> > >> The

Re: [PATCH 2/4] t7610: make tests more independent and debuggable

On Tue, Jan 03, 2017 at 07:50:40PM -0500, Richard Hansen wrote: > [snip] > @@ -145,8 +148,13 @@ test_expect_success 'mergetool in subdir' ' > ' > > test_expect_success 'mergetool on file in parent dir' ' > + git reset --hard && > + git checkout -b test$test_count branch1 && > + git

Refreshing index timestamps without reading content

Hi guys, Apologies if this is documented somewhere, I have fairly bad search vudu skills. I'm looking for a way to cause a full refresh of the index without causing any read of the files, basically telling git "trust me, all worktree files are matching the index, but their stat information have

core.sshCommand and url.*.insteadOf for submodules

Hello mailing list, it seems like that the `core.sshCommand` and `url.*.insteadOf` configuration settings do not apply to `git submodule update --init` (and probably related) calls. Is this intentional? My scenario is as follows: I use 2 SSH keys for GitHub, for private and work-related

git branch -D doesn't work with deleted worktree

Git 2.11.0 gives a wrong error message after the following commands: $ git init $ echo hello >file $ git add file $ git commit -m "message" $ git worktree add ../worktree $ rm -rf ../worktree $ git br -D worktree error: Cannot delete branch 'worktree' checked out at '../worktree' Since

Re: [PATCH 1/2] asciidoctor: fix user-manual to be built by `asciidoctor`

> On 04 Jan 2017, at 09:08, Jeff King wrote: > > On Mon, Jan 02, 2017 at 05:03:57PM +0100, Johannes Schindelin wrote: > >> From: =?UTF-8?q?=EB=A7=88=EB=88=84=EC=97=98?= >> >> The `user-manual.txt` is designed as a `book` but the `Makefile` wants >> to

Re re between individual finance

Hello; Mr. I turn to you, I am an individual who provides loans of money to all people in need for financing of all people projects. For more information please contact me mail:lambackpas...@gmx.fr Hola; Señor. Me dirijo a usted, soy una persona que ofrece