[PATCH 1/2] git-svn: reduce scope of input record separator change

Reducing the scope of where we change the record separator ($/) avoids bugs in calls which rely on the input record separator further down, such as the 'chomp' usage in command_oneline. This is necessary for a future change to git-svn, but exists in Git.pm since it seems useful for gitweb and our

[PATCH 2/2] git-svn: "git worktree" awareness

git-svn internals were previously not aware of repository layout differences for users of the "git worktree" command. Introduce this awareness by using "git rev-parse --git-path" instead of relying on outdated uses of GIT_DIR and friends. Thanks-to: Duy Nguyen Reported-by:

[PATCH 0/2] git-svn: implement "git worktree" awareness

+Cc Jakub since gitweb could probably take advantage of get_record from the first patch, too. I'm not completely sure about the API for this, though. The following changes since commit 3cdd5d19178a54d2e51b5098d43b57571241d0ab: Sync with maint (2016-10-11 14:55:48 -0700) are available in the

Change Default merge strategy options

Hi, How to use 'git config --global' to set default strategy like recursive. Example: Currently , when we want to enforce a specific strategic we need to include  its reference on the command line :  git.exe merge --strategy=recursive --strategy-option=ignore-all-space dev-local we would

Re: [GIT GUI l18n 1/2] git-gui: Mark 'All' in remote.tcl for translation

Alexander Shopov writes: >Signed-off-by: Alexander Shopov >--- > lib/remote.tcl | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > >diff --git a/lib/remote.tcl b/lib/remote.tcl >index 4e5c784..26af8ae 100644 >--- a/lib/remote.tcl >+++

Schönen Tag

Schönen Tag Dies ist die Santander Consumer Finance wir Darlehen zu 3% für beide Unternehmen Darlehen und persönliche Darlehen bieten für Ihr Projekt und individuellen Anforderungen der Position Darlehen anbieten zu können. Füllen Sie das Formular aus, wenn interessiert Vor-und Nachname:

Re: [PATCHv3] attr: convert to new threadsafe API

> On Wed, Oct 12, 2016 at 4:33 PM, Junio C Hamano wrote: > so I am hoping that we won't have to do this uglier variant ---8<--- attr.h: ... struct git_attr_result { int check_nr; /* Whether is was statically allocated and cannot be resized. */ int static_alloc;

Talent Scout

Dear Concern, I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue sky Studio a Film Corporation Located in the United State, is Soliciting for the Right to use Your Photo/Face and Personality as One of the Semi -Major Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story of

Re: problem with git worktree and git svn

Duy Nguyen wrote: > On Thu, Oct 13, 2016 at 8:52 AM, Eric Wong wrote: > > +sub svn_dir { > > + my $git_dir = scalar @_ ? $_[0] : $ENV{GIT_DIR}; > > + my $common = $ENV{GIT_COMMON_DIR} || "$git_dir/commondir"; > > + $git_dir .=

Re: Huge performance bottleneck reading packs

On Thu, Oct 13, 2016 at 08:18:11PM +0200, Vegard Nossum wrote: > > My guess is that the number is relatively high. And that would explain > > why nobody else has really complained much; such a pattern is probably > > uncommon. > > I get ~3,700 objects "they are advertising that we don't have". >

Re: [PATCH v3 25/25] sequencer: mark all error messages for translation

Am 13.10.2016 um 16:56 schrieb Johannes Schindelin: On Wed, 12 Oct 2016, Junio C Hamano wrote: You have at least two independent changes relative to Dscho's version. (1) Show line breaks more prominently by avoiding "\n\n" and breaking the string at "\n"; this matches the way how the

Re: [PATCH] fetch: use "quick" has_sha1_file for tag following

On Thu, Oct 13, 2016 at 01:04:43PM -0400, Jeff King wrote: > > This patch teaches fetch to use HAS_SHA1_QUICK to sacrifice > > accuracy for speed, in cases where we might be racy with a > > simultaneous repack. This is similar to the fix in 0eeb077 > > (index-pack: avoid excessive re-reading of

Re: Uninitialized submodules as symlinks

On Thu, Oct 13, 2016 at 06:10:17PM +0200, Heiko Voigt wrote: > On Fri, Oct 07, 2016 at 06:17:05PM +, David Turner wrote: > > Presently, uninitialized submodules are materialized in the working > > tree as empty directories. We would like to consider having them be > > symlinks. Specifically,

[GIT GUI l18n 1/2] git-gui: Mark 'All' in remote.tcl for translation

Signed-off-by: Alexander Shopov --- lib/remote.tcl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/remote.tcl b/lib/remote.tcl index 4e5c784..26af8ae 100644 --- a/lib/remote.tcl +++ b/lib/remote.tcl @@ -250,12 +250,12 @@ proc

Re: [PATCHv3] attr: convert to new threadsafe API

On Wed, Oct 12, 2016 at 4:33 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> @@ -89,15 +114,20 @@ static void setup_check(void) >> >> >> const char *path; >> + struct git_attr_result *result; >> >> setup_check(); >> -

Re: Huge performance bottleneck reading packs

On 10/13/2016 05:26 PM, Jeff King wrote: On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote: Does the patch below help? Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other variation in time may be due to different CPU usage by other programs, but I ran

Re: [PATCH] fetch: use "quick" has_sha1_file for tag following

On Thu, Oct 13, 2016 at 12:53:44PM -0400, Jeff King wrote: > -- >8 -- > Subject: [PATCH] fetch: use "quick" has_sha1_file for tag following A few comments on my own patch... > This patch teaches fetch to use HAS_SHA1_QUICK to sacrifice > accuracy for speed, in cases where we might be racy with

[PATCH] fetch: use "quick" has_sha1_file for tag following

On Thu, Oct 13, 2016 at 11:26:32AM -0400, Jeff King wrote: > On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote: > > > > Does the patch below help? > > > > Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other > > variation in time may be due to different CPU usage by

Re: Huge performance bottleneck reading packs

On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote: > > Does the patch below help? > > Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other > variation in time may be due to different CPU usage by other programs, > but I ran with/without the patch multiple times and

Re: [PATCH v2 3/3] batch check whether submodule needs pushing into one call

On Wed, Oct 12, 2016 at 10:37:33AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > >> If we do not even have these commits locally, then there is no point > >> attempting to push, so returning 0 (i.e. it is not "needs pushing" > >> situation) is correct but it is a but

Re: Uninitialized submodules as symlinks

On Fri, Oct 07, 2016 at 06:17:05PM +, David Turner wrote: > Presently, uninitialized submodules are materialized in the working > tree as empty directories. We would like to consider having them be > symlinks. Specifically, we'd like them to be symlinks into a FUSE > filesystem which

Re: Formatting problem send_mail in version 2.10.0

Kevin Daudt writes: > On Wed, Oct 12, 2016 at 07:13:22PM -0400, Jeff King wrote: > >> I think the answer is pretty clearly no. It's just that historically we >> have auto-munged it into something useful. I think the viable options >> are basically: >> >> 1. Tell people not to

Re: 2 directories same spelling one directory is camel cased

On 12.10.16 18:05, David Brown wrote: > Howdy git gurus, > > I have the dubious distinction of working with a remote repo (master) that > has a class loader run-time error when cloned, built and executed. > > The reason for the runtime issue is a directory hierarchical path has to >

Re: git branches & merge

On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote: > Hi, > > > the IP will not be overwritten, you'll still have the new IP in > master. Nothing to worry about :) > > To expand on that, git does a so called 3-way merge. This means git will look for a common base commit, and

Re: Formatting problem send_mail in version 2.10.0

On Wed, Oct 12, 2016 at 07:13:22PM -0400, Jeff King wrote: > On Wed, Oct 12, 2016 at 01:53:52PM -0700, Junio C Hamano wrote: > > > Matthieu Moy writes: > > > > >>> If it's not in the body of the message, then where is it? > > >> > > >> This point is clarified in

Re: [PATCH v2 1/3] serialize collection of changed submodules

On Wed, Oct 12, 2016 at 10:18:28AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > Which seems quite extensively long for a static function so how about > > we shorten it a bit and add a comment: > > > > /* lookup or create commit object list for submodule */ > >

Re: [PATCH v3 25/25] sequencer: mark all error messages for translation

Hi, On Wed, 12 Oct 2016, Junio C Hamano wrote: > Johannes Sixt writes: > > > Can we please have the following change instead? I think it makes sense > > to deviate from the usual conventions in a case like this. > > You have at least two independent changes relative to Dscho's

Re: Huge performance bottleneck reading packs

On Thu, Oct 13, 2016 at 09:17:34AM +0200, Vegard Nossum wrote: > Oops. I disabled gc a while ago; one reason I did that is that it takes > a long time to run and it has a tendency to kick in at the worst time. I > guess I should really put it in cron then. > > I'm not sure if this is related,

RE: [External] Re: Fork Errors

Thanks, Khomoutov. I turned out that when I went back to version 2.7.0 of Git (as mentioned in this post https://github.com/git-for-windows/git/issues/776) that I no longer received the fork errors. However, then I received a Permission error and also wasn't thrilled that I had to use an old

Re: What's cooking in git.git (Oct 2016, #03; Tue, 11)

Hi, On Tue, 11 Oct 2016, Junio C Hamano wrote: > Stefan Beller writes: > > > On Tue, Oct 11, 2016 at 2:06 PM, Junio C Hamano wrote: > >> > >> * sb/submodule-ignore-trailing-slash (2016-10-10) 2 commits > >> (merged to 'next' on 2016-10-11 at

Re: [PATCH 1/2] submodule: ignore trailing slash on superproject URL

Hi Stefan, On Wed, 12 Oct 2016, Stefan Beller wrote: > On Wed, Oct 12, 2016 at 6:30 AM, Johannes Schindelin > wrote: > > > > On Mon, 10 Oct 2016, Stefan Beller wrote: > > > >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c > >> index

Re: Re* [PATCH v3 05/25] sequencer: eventually release memory allocated for the option values

Hi Junio, On Wed, 12 Oct 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Tue, 11 Oct 2016, Junio C Hamano wrote: > > > >> The only reason why the OPT_STRDUP appeared convenient was because > >> options[] element happened to use a field in the

Re: [PATCH v3 13/25] sequencer: prepare for rebase -i's commit functionality

Hi Junio, On Wed, 12 Oct 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> Hmph, didn't we recently add parse_key_value_squoted() to build > >> read_author_script() in builtin/am.c on top of it, so that this > >> piece of code can also take advantage

Re: [PATCH v3 12/25] sequencer: remember the onelines when parsing the todo file

Hi Junio, On Wed, 12 Oct 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> > +const char *arg; > >> > +int arg_len; > >> > size_t offset_in_buf; > >> > >> micronit: you can make it to size_t and lose the cast below, no? > > >

Re: interactive rebase should better highlight the not-applying commit

Hi Joshua, On Wed, 12 Oct 2016, Joshua N Pritikin wrote: > On Wed, Oct 12, 2016 at 06:24:37PM +0200, Johannes Schindelin wrote: > > > But maybe I read it all wrong and you do want to make this happen > > yourself, and you simply want a little advice how to go about it? > > Ugh, if you insist.

Re: problem with git worktree and git svn

On Thu, Oct 13, 2016 at 8:52 AM, Eric Wong wrote: > +sub svn_dir { > + my $git_dir = scalar @_ ? $_[0] : $ENV{GIT_DIR}; > + my $common = $ENV{GIT_COMMON_DIR} || "$git_dir/commondir"; > + $git_dir .= '/'.::file_to_s($common) if -e $common; > + my $svn_dir =

Re: [PATCH] worktree: allow the main brach of a bare repository to be checked out

On Thu, Oct 13, 2016 at 1:50 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Dennis Kaarsemaker writes: >> >>> OK, so here it is as a proper patch. > > Here is what I queued. Duy, what do you think? It seems OK to me. Ack.

Re: Huge performance bottleneck reading packs

On 10/13/2016 12:45 AM, Junio C Hamano wrote: > Vegard Nossum writes: > >> A closer inspection reveals the problem to really be that this is an >> extremely hot path with more than -- holy cow -- 4,106,756,451 >> iterations on the 'packed_git' list for a single 'git

Re: Huge performance bottleneck reading packs

On 10/13/2016 01:47 AM, Jeff King wrote: On Wed, Oct 12, 2016 at 07:18:07PM -0400, Jeff King wrote: Also, is it possible to make the repository in question available? I might be able to reproduce based on your description, but it would save time if I could directly run gdb on your example. I

Re: Huge performance bottleneck reading packs

On 10/13/2016 01:01 AM, Jeff King wrote: On Thu, Oct 13, 2016 at 12:30:52AM +0200, Vegard Nossum wrote: However, the commit found by 'git blame' above appears just fine to me, I haven't been able to spot a bug in it. A closer inspection reveals the problem to really be that this is an

Re: [PATCH] merge-base: handle --fork-point without reflog

Hello, thank you for this nice and quick fix of this corner case! Stepan