Re: [PATCH] ref-filter: fallback on alphabetical comparison

On Sun, Oct 25, 2015 at 5:48 AM, Eric Sunshine wrote: > On Sat, Oct 24, 2015 at 10:42 AM, Karthik Nayak wrote: >> In ref-filter.c the comparison of refs while sorting is handled by >> cmp_ref_sorting() function. When sorting as per numerical values

Re: [RFC] t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" flaky?

I think the following happens: 1. The remote upload-pack finds out "not our ref" 2. The remote send a response and close the pipe 3. fetch-pack still tries to write commands to the remote upload-pack 4. Because the connection has already been closed, writing will fail with EPIPE which is detected

Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

From: "Johannes Schindelin" This is the correct thing to do, really: we already specify LF as field separator. Incidentally, this fixes the problem interactive rebase has when the editor wants to save text with CR/LF line endings, as WordPad does in Windows 10.

[PATCH 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a 100755 ---

fetch unshallow fails to honor dry-run

Hey all, git fetch --dry-run modifies the repository if --unshallow is passed: $ git --version git version 2.1.4 $ git fetch --dry-run --unshallow remote: Counting objects: 30603, done. remote: Compressing objects: 100% (6843/6843), done. remote: Total 30603 (delta 24564), reused 29164 (delta

Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Philip, On Sun, 25 Oct 2015, Philip Oakley wrote: > From: "Johannes Schindelin" > > @@ -13,7 +13,7 @@ unset CDPATH > > # do not equate an unset IFS with IFS with the default, so here is > > # an explicit SP HT LF. > > Doesn't this comment also need an update,

Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Brian, re-Cc:ing the Git mailing list. On Sun, 25 Oct 2015, brian m. carlson wrote: > On Sun, Oct 25, 2015 at 01:50:32PM +0100, Johannes Schindelin wrote: > > This is the correct thing to do, really: we already specify LF as > > field separator. > > > > Incidentally, this fixes the problem

Re: [RFC] t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" flaky?

Thanks for your explanation Fredrik! However, I believe your 4. step is not what happens in the current implementation as the write call in wrapper.c dies directly. I see three ways to fix the problem: (1) Make upload-pack wait for a response (with timeout) before it closes the pipe. However,

Re: [PATCH v2 2/2] blame: allow blame --reverse --first-parent when it makes sense

On Thu, Oct 22, 2015 at 12:11:23PM -0700, Junio C Hamano wrote: > Max Kirillov writes: >> On Wed, Oct 21, 2015 at 09:25:37PM -0700, Junio C Hamano wrote: >> >>> The logic you implemented feels solid to me, at least at a first >>> glance. What kind of gotchas are you worried

[PATCH 2/2] sh-setup: explicitly mark CR as a field separator

This is the correct thing to do, really: we already specify LF as field separator. Incidentally, this fixes the problem interactive rebase has when the editor wants to save text with CR/LF line endings, as WordPad does in Windows 10. Signed-off-by: Johannes Schindelin

[PATCH 0/2] Fix interactive rebase when the editor saves with CR/LF

Chad Boles reported that `git rebase -I` recently started producing errors when the editor saves files with DOS line endings. The symptom is: Warning: the command isn't recognized in the following line: - You can fix this with 'git rebase --edit-todo'. Or you can

Re: [PATCH] fetch: only show "Fetching remote" when verbose mode is enabled

On Sun, 2015-10-25 at 11:34 -0700, Junio C Hamano wrote: > I ignored your patch when you sent it the first time the last week, > due to the same issues I had with this round (see below) and forgot > about it. Thanks for the feedback this round. > I cannot tell if you are trying to say if that

Why are submodules not automatically handled by default or at least configurable to do so?

I found that I use submodules much, much more often in my git projects than I used externals in Subversion and the reason is that git encourages/forces to organize large projects into smaller repositories, one reason for this being that subversion allows to check out parts of a repository

Re: [PATCH] fetch: only show "Fetching remote" when verbose mode is enabled

Paul Wise writes: > It definitely wouldn't be appropriate to add screen scraping and > parsing of different version control systems to myrepos. Huh? If the tool claims to support VCS X and Y and Z, it needs to know how to cause X and Y and Z to "fetch" in their own ways,

Re: [PATCH v2] ref-filter: fallback on alphabetical comparison

On Sun, Oct 25, 2015 at 12:29 PM, Karthik Nayak wrote: > In ref-filter.c the comparison of refs while sorting is handled by > cmp_ref_sorting() function. When sorting as per numerical values > (e.g. --sort=objectsize) there is no fallback comparison when both > refs hold

Re: Why are submodules not automatically handled by default or at least configurable to do so?

On Mon, Oct 26, 2015 at 12:10 PM, John Smith wrote: > I found that I use submodules much, much more often in my git projects than I > used externals > in Subversion and the reason is that git encourages/forces to organize large > projects into > smaller repositories, one

Re: Why are submodules not automatically handled by default or at least configurable to do so?

On Mon, Oct 26, 2015 at 7:10 AM, John Smith wrote: > When would people routinely check out a branch and want to stay with the > submodules as > the have been checked out for the old branch? I do this a lot. At my $dayjob we have a super project with bunch of sub projects.

[PATCH] blame: fix option name in error message

The option name used in blame's UI is `--reverse`. Signed-off-by: Max Kirillov --- builtin/blame.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/blame.c b/builtin/blame.c index 98b1810..f89bc9e 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@

[PATCH v4 0/4] blame: allow blame --reverse --first-parent when it makes sense

Change aproach - instead of assuming children content build them explicitly, also accurately verifying that the specified range is along the first-parent chain Max Kirillov (3): Add test to describe expectation of blame --reverse with branched history blame: extract find_single_final

[PATCH v4 2/3] blame: extract find_single_final

Signed-off-by: Max Kirillov --- builtin/blame.c | 29 + 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/builtin/blame.c b/builtin/blame.c index 295ce92..38f6267 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -2401,16 +2401,11 @@

[PATCH v4 1/3] Add test to describe expectation of blame --reverse with branched history

If history contains merges from feature branches, `blame --reverse` reports not the commit when the line was actually edited, but head of the last merged branch which was created before the edit. As a workaround, `blame --reverse --first-parent` could be used to find the merge of branch

[PATCH v4 3/3] blame: allow blame --reverse --first-parent when it makes sense

Allow combining --reverse and --first-parent if initial commit of specified range is at the first-parent chain starting from the final commit. Disable the prepare_revision_walk()'s builtin children collection, instead picking only the ones which are along the first parent chain. Signed-off-by:

[PATCH v4 0/4] blame: allow blame --reverse --first-parent when it makes sense

* Change aproach - instead of assuming children content build them explicitly, also accurately verifying that the specified range is along the first-parent chain * Fix error message Max Kirillov (4): Add test to describe expectation of blame --reverse with branched history blame:

Re: [PATCH v4 0/4] blame: allow blame --reverse --first-parent when it makes sense

On Mon, Oct 26, 2015 at 07:26:54AM +0200, Max Kirillov wrote: > * Change aproach - instead of assuming children content build them explicitly, > also accurately verifying that the specified range is along the > first-parent chain > * Fix error message Sent by mistake, ignore this, please -- To

Re: [PATCH v4 1/3] Add test to describe expectation of blame --reverse with branched history

Sorry, forgot to fix the tests. Will send another batch some later. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

shell scripting woes, was Re: [PATCH 2/2] sh-setup: explicitly mark CR as a field separator

Hi Brian, On Sun, 25 Oct 2015, Johannes Schindelin wrote: > On Sun, 25 Oct 2015, brian m. carlson wrote: > > > On Sun, Oct 25, 2015 at 01:50:32PM +0100, Johannes Schindelin wrote: > > > This is the correct thing to do, really: we already specify LF as > > > field separator. > > > > > >

[PATCH v2 1/2] Demonstrate rebase fails when the editor saves with CR/LF

Based on a bug report by Chad Boles. Signed-off-by: Johannes Schindelin --- t/t3404-rebase-interactive.sh | 12 1 file changed, 12 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 3de0b1d..5dfa16a 100755 ---

[PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Chad Boles reported that `git rebase -i` recently started producing errors when the editor saves files with DOS line endings. The symptom is: Warning: the command isn't recognized in the following line: - You can fix this with 'git rebase --edit-todo'. Or you can

Re: git svn clone clone php/pear/Net_LDAP2 misses tags and branches

Using -r single-revision-number (against tha same repo), I was not able to pull much (on that revision only the standard layout was set up so nothing would come out for git) Did you try with -r revision-number:HEAD? . . . r255572 = 73d7692d844ee6baae8b4b2e5fc0f07a4118d09e

Re: [PATCH v2 2/2] blame: allow blame --reverse --first-parent when it makes sense

Max Kirillov writes: > This additionally forbids having several end commits > (git blame --reverse --first-parent ^A B C ...), but > this does not seem to have much practical use. Even if there were practical uses for a request with multiple end points, a solution that (1)

Re: git-credential-cache--daemon quits on SIGHUP, can we change it to ignore instead?

Noam Postavsky writes: > On Tue, Oct 20, 2015 at 10:35 PM, Noam Postavsky > wrote: >> On Sun, Oct 18, 2015 at 1:58 PM, Junio C Hamano wrote: >>> I cannot speak for the person who was primarily responsible for

Re: [RFC] t5516 "75 - deny fetch unreachable SHA1, allowtipsha1inwant=true" flaky?

Lars Schneider writes: > (1) Make upload-pack wait for a response (with timeout) before it > closes the pipe. However, I believe this would not be in line with > the general Git philosophy stated in "git.c" (added in 7559a1be): > "Many parts of Git have subprograms

Re: [RFC] URL rewrite in .gitmodules

On 20 Oct 2015, at 00:07, Stefan Beller wrote: > On Mon, Oct 19, 2015 at 12:28 PM, Lars Schneider > wrote: >> Hi, >> >> I have a closed source Git repo which references an Open Source Git repo as >> Submodule. The Open Source Git repo references

Re: [RFC] URL rewrite in .gitmodules

On 20 Oct 2015, at 19:33, Junio C Hamano wrote: > Lars Schneider writes: > >> If not, what do you think about a patch that adds a "url" section >> similar to the one in git config to a .gitmodules file? >> >> Example: >> -- >> [submodule

Re: git svn clone clone php/pear/Net_LDAP2 misses tags and branches

Hello Edmundo, > Using -r single-revision-number (against tha same repo), I was not > able to pull much (on that revision only the standard layout was set > up so nothing would come out for git) It's actually the standard layout here; I only used the single parameters to rule out problems with

[PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

This is the correct thing to do, really: we already specify LF as field separator. Incidentally, this fixes the problem interactive rebase has when the editor wants to save text with CR/LF line endings, as WordPad does in Windows 10. Signed-off-by: Johannes Schindelin

git svn clone clone php/pear/Net_LDAP2 misses tags and branches

Hi, Using git 2.6.2 to clone an SVN repository misses out branches and tags. The clone command: $ git svn clone --trunk=trunk --tags=tags --branches=branches --prefix=origin/ https://svn.php.net/repository/pear/packages/Net_LDAP2 -r 255346 The final repository's tag and branch list is

[PATCH v2] ref-filter: fallback on alphabetical comparison

In ref-filter.c the comparison of refs while sorting is handled by cmp_ref_sorting() function. When sorting as per numerical values (e.g. --sort=objectsize) there is no fallback comparison when both refs hold the same value. This can cause unexpected results (i.e. the order of listting refs with

Re: [PATCH] fetch: only show "Fetching remote" when verbose mode is enabled

Paul Wise writes: I ignored your patch when you sent it the first time the last week, due to the same issues I had with this round (see below) and forgot about it. > By default when fetching one remote nothing is printed unless there > are changes that need fetching. This

Re: git svn clone clone php/pear/Net_LDAP2 misses tags and branches

Hello Christian, > > Did you try with -r revision-number:HEAD? > > Good idea. I tried it, and now I have the tags and branches: Unfortunately, the tag branches only have a single commit and have no relation to the trunk branch: $ git log --oneline origin/tags/Net_LDAP2-2.0.12 0bc9db1 Tagging

Re: [PATCH v2 0/2] Fix interactive rebase when the editor saves with CR/LF

Johannes Schindelin writes: > Chad Boles reported that `git rebase -i` recently started producing > errors when the editor saves files with DOS line endings. The symptom > is: > > Warning: the command isn't recognized in the following line: >- > >

Re: git svn clone clone php/pear/Net_LDAP2 misses tags and branches

I think there's something "odd" in the way that branch was created. If I take a look at another branch: $ svn log -v --stop-on-copy https://svn.php.net/repository/pear/packages/Net_LDAP2/tags/RELEASE_2_0_0RC2 r255575 |