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
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 reproduce
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
> >
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
>
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 b/t/t1514-rev-
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(+), 3 deletions(-)
d
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 th
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 as
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
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
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 telling you to make
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 c
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 repositor
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 change
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 ++--
1 file changed, 41
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 insertions(+), 1 deletion(-
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 conveni
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
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") t
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 with
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 work repository
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
> > updat
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 fails.
So each test is c
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 te
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 fails.
So each test is
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 has
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 worktree
> error: Cannot
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 original design of s
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 `user-manual.txt` is designed as a `book` but th
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 su
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 c
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 reposito
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 ../worktr
> 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 build it as an `article`. This seems to b
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 prést
35 matches
Mail list logo
