Re: Question about installing git from source

2014-12-23 Thread Alexander Kuleshov
Yeah, was wrong install script. thank you. 2014-12-23 23:53 GMT+06:00 Alexander Kuleshov : > I looked at Makefile, and seems that it occurs from here: > https://github.com/git/git/blob/master/Makefile#L2205 > > It tries to copy all files/folders from git root directory but > 'install' command pri

Re: [PATCH 1/7] receive-pack.c: add protocol support to negotiate atomic-push

2014-12-23 Thread Michael Haggerty
On 12/19/2014 08:38 PM, Stefan Beller wrote: > From: Ronnie Sahlberg > > This adds support to the protocol between send-pack and receive-pack to > * allow receive-pack to inform the client that it has atomic push capability > * allow send-pack to request atomic push back. > > There is currently

Re: [PATCH] git-log: added --invert-grep option

2014-12-23 Thread Christoph Junghans
Ok, I drafted a first version of the suggest --grep-begin ... --grep-end syntax. However, I could not find a good ways to invert the match on a commit basis instead of the normal line-wise version. Any suggestions? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of

[PATCH] git-log: added --grep-begin .. --grep-end syntax

2014-12-23 Thread Christoph Junghans
This is useful to specify more complicated pattern as with '--grep'. Signed-off-by: Christoph Junghans --- builtin/grep.c | 73 +- grep.c | 62 + grep.h | 10 revision

Re: [PATCH] merge: release strbuf after use in suggest_conflicts()

2014-12-23 Thread Jonathan Nieder
René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > builtin/merge.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/builtin/merge.c b/builtin/merge.c > index 215d485..d722889 100644 > --- a/builtin/merge.c > +++ b/builtin/merge.c > @@ -894,6 +894,7 @@ static int suggest_conflicts(

Re: git update-ref --stdin : too many open files

2014-12-23 Thread Stefan Beller
On 22.12.2014 13:22, Junio C Hamano wrote: > Loic Dachary writes: > >> Hi, >> >> Steps to reproduce: >> >> $ git --version >> git version 1.9.1 >> $ wc -l /tmp/1 >> 9090 /tmp/1 >> $ head /tmp/1 >> delete refs/pull/1/head >> create refs/heads/pull/1 86b715f346e52920ca7c9dfe65424eb9946ebd61 >> dele

Re: [PATCH] transport: simplify duplicating a substring in transport_get() using xmemdupz()

2014-12-23 Thread Jonathan Nieder
René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > transport.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Since external_specification_len(url) is defined to always be less than strlen(url) when is_url(url), this should be safe. Reviewed-by: Jonathan Nieder -- To unsubs

Re: [PATCH] commit-tree: simplify parsing of option -S using skip_prefix()

2014-12-23 Thread Jonathan Nieder
René Scharfe wrote: > Signed-off-by: Rene Scharfe > --- > builtin/commit-tree.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) Reviewed-by: Jonathan Nieder Thanks. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.o

GIT_PUSH_CERT* env vars and update/post-update hooks...

2014-12-23 Thread Sitaram Chamarty
Hi git core devs, Any chance I could persuade you to set the GIT_PUSH_CERT* environment variables for the update (and post-update) hooks also? Background: gitolite "takes over" the update hook [1] for authorisation and enforcement, and I want to avoid taking over the pre-receive hook also in orde

Re: [PATCH 5/7] receive-pack: move execute_commands_non_atomic before execute_commands

2014-12-23 Thread Stefan Beller
I tried all four diff options as listed in the man page of format-diff. I forget which one I used, but there was no large difference w.r.t. reviewability if I remember correctly. On Mon, Dec 22, 2014 at 10:19 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Notes: >> This patch is new

[PATCH] refs: release strbuf after use in check_refname_component()

2014-12-23 Thread René Scharfe
Signed-off-by: Rene Scharfe --- refs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refs.c b/refs.c index 5fcacc6..ed3b2cb 100644 --- a/refs.c +++ b/refs.c @@ -2334,7 +2334,7 @@ static struct ref_lock *lock_ref_sha1_basic(const char *refname, struct

[PATCH] commit-tree: simplify parsing of option -S using skip_prefix()

2014-12-23 Thread René Scharfe
Signed-off-by: Rene Scharfe --- builtin/commit-tree.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c index 8a66c74..25aa2cd 100644 --- a/builtin/commit-tree.c +++ b/builtin/commit-tree.c @@ -66,10 +66,8 @@ int cmd_commit_tree(i

[PATCH] transport: simplify duplicating a substring in transport_get() using xmemdupz()

2014-12-23 Thread René Scharfe
Signed-off-by: Rene Scharfe --- transport.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/transport.c b/transport.c index 70d38e4..08bcd3a 100644 --- a/transport.c +++ b/transport.c @@ -971,9 +971,7 @@ struct transport *transport_get(struct remote *remote, const char *ur

[PATCH] merge: release strbuf after use in suggest_conflicts()

2014-12-23 Thread René Scharfe
Signed-off-by: Rene Scharfe --- builtin/merge.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin/merge.c b/builtin/merge.c index 215d485..d722889 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -894,6 +894,7 @@ static int suggest_conflicts(void) append_conflicts_hint(&m

Re: mangled file names in git checkout-index --temp output when run in repo subdirectory

2014-12-23 Thread Eric Sunshine
On Tue, Dec 23, 2014 at 11:36 AM, Russ Cox wrote: > I am using git checkout-index --temp to obtain copies of files from > the index, but it does not always print valid file names unless run > from the repository root. > > git checkout-index --temp prints names of files in the index > interpreted r

Gitk Branch Ordering

2014-12-23 Thread Nathan Mascitelli
Hi, I have noticed that gitk does not order the branches it draws the same way as 'git log --graph' 'git log' seems to keep your current branch as the leftmost line. In the below screenshot here (https://drive.google.com/open?id=0B9b8DuGRceMSTHgzV3dBZkxiTVU&authuser=0) master is the current branc

Re: [PATCH] git-new-workdir: support submodules

2014-12-23 Thread Craig Silverstein
[Ack, I forgot to cc myself on the original patch so now I can't reply to it normally. Hopefully my workaround doesn't mess up the threading too badly.] Junio C Hamano pobox.com> writes: > > H, does that mean that the submodule S in the original > repository O's working tree and its checkout

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > Unfortunately, I will not be able to submit v2 of this patch series this > year, but I will do so in the second week of January (including the change > to the global array with the default severity levels because I do want to > see this feature integrated). Heh, we

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 01:02:23PM -0800, Junio C Hamano wrote: > Jonathan Nieder writes: > > >> +++ b/t/t1450-fsck.sh > > [...] > >> + git fsck 2>err && > >> + cat err && > >> + ! test -s err > > > > Nit: if this said > > > > test_line_count = 0 err > > >

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 09:31:10PM +0100, Johannes Sixt wrote: > Am 23.12.2014 um 09:45 schrieb Jeff King: > > @@ -606,7 +606,7 @@ static ucs_char_t next_hfs_char(const char **in) > > * but this is enough to catch anything that will convert > > * to ".git" > >

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 12:14:16PM -0800, Jonathan Nieder wrote: > > +++ b/t/t1450-fsck.sh > [...] > > + git fsck 2>err && > > + cat err && > > + ! test -s err > > Nit: if this said > > test_line_count = 0 err > > then the error message would be more

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Junio C Hamano
Jonathan Nieder writes: >> +++ b/t/t1450-fsck.sh > [...] >> +git fsck 2>err && >> +cat err && >> +! test -s err > > Nit: if this said > > test_line_count = 0 err > > then the error message would be more obvious when it fails with > --verbose. Tha

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Johannes Sixt
Am 23.12.2014 um 09:45 schrieb Jeff King: > @@ -606,7 +606,7 @@ static ucs_char_t next_hfs_char(const char **in) >* but this is enough to catch anything that will convert >* to ".git" >*/ > - return tolower(out); > + return out

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jonathan Nieder
Jeff King wrote: > Signed-off-by: Jeff King > --- > t/t1450-fsck.sh | 16 > utf8.c | 17 - > 2 files changed, 28 insertions(+), 5 deletions(-) Mph. Sorry I missed this before. Reviewed-by: Jonathan Nieder [...] > +++ b/t/t1450-fsck.sh [...] > +

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Tue, 23 Dec 2014, Junio C Hamano wrote: > > > >> Having said that, I think "missingTags" etc. should not be > >> configuration variable names (instead, they should be values). > >> > >> Because of that,

Re: [PATCH] git-new-workdir: support submodules

2014-12-23 Thread Junio C Hamano
Craig Silverstein writes: > The basic problem with submodules, from git-new-workdir's point of > view, is that instead of having a .git directory, they have a .git > file with contents `gitdir: `. This is a problem > because the submodule's config file has an entry like `worktree = > ../../../kh

Re: [PATCH v3 2/4] rev-list: add an option to mark fewer edges as uninteresting

2014-12-23 Thread Junio C Hamano
Jeff King writes: > On Tue, Dec 23, 2014 at 12:55:48PM -0500, Michael Blume wrote: > >> This patch causes an error on my mac, test 5500 fetch-pack errors on >> part 44 - fetch creating new shallow root. It looks for "remote: Total >> 1" in the fetch output and gets 3 instead. > > It fails for me

git: regression with mergetool and answering "n" (backport fix / add tests)

2014-12-23 Thread Daniel Hahler
Hi, this is in reply to the commits from David: commit 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 Refs: v2.2.0-60-g0ddedd4 Merge: e886efd 1e86d5b Author: Junio C Hamano AuthorDate: Fri Dec 12 14:31:39 2014 -0800 Commit: Junio C Hamano CommitDate: Fri Dec 12 14:

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > Hi Junio, > > On Tue, 23 Dec 2014, Junio C Hamano wrote: > >> Having said that, I think "missingTags" etc. should not be configuration >> variable names (instead, they should be values). >> >> Because of that, I do not think we need consistency between the way >> th

Re: [PATCH 1/2] git remote add: allow re-adding remotes with the same URL

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: >> > I hope v2 addresses your concerns. >> >> Unfortunately I am still confused. >> >> The way the overlong line is folded in the new version of the patch >> makes it easier to read, but I didn't find a reason why checking the >> number of fetch_refspec does not go a

[PATCH] git-new-workdir: support submodules

2014-12-23 Thread Craig Silverstein
The basic problem with submodules, from git-new-workdir's point of view, is that instead of having a .git directory, they have a .git file with contents `gitdir: `. This is a problem because the submodule's config file has an entry like `worktree = ../../../khan-exercises` which is relative to ""

Re: [PATCH v3 2/4] rev-list: add an option to mark fewer edges as uninteresting

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 12:55:48PM -0500, Michael Blume wrote: > This patch causes an error on my mac, test 5500 fetch-pack errors on > part 44 - fetch creating new shallow root. It looks for "remote: Total > 1" in the fetch output and gets 3 instead. It fails for me on Linux, too. Interestingly

Re: [PATCH v3 0/4] Improve push performance with lots of refs

2014-12-23 Thread Junio C Hamano
"brian m. carlson" writes: > The only change from v2 is the addition of a fourth patch, which fixes > t5500. It's necessary because the test wants packs for fetches to > shallow clones to be minimal. > > I'm not especially thrilled with having to provide a --shallow command > line argument, but

Re: [PATCH 1/2] git remote add: allow re-adding remotes with the same URL

2014-12-23 Thread Johannes Schindelin
Hi Junio, [re-Cc:ing the list] On Tue, 23 Dec 2014, Junio C Hamano wrote: > On Tue, Dec 23, 2014 at 5:25 AM, Johannes Schindelin > wrote: > > > > On Mon, 22 Dec 2014, Junio C Hamano wrote: > >> > >> So, it is an error if we have "remote" and if > >> > >> (1) URL for the remote is defined alrea

Re: [PATCH] Use wc instead of awk to count subtrees in t0090-cache-tree

2014-12-23 Thread Junio C Hamano
Jonathan Nieder writes: > With the updated subject, > > Reviewed-by: Jonathan Nieder Thanks. Here is what I tentatively queued for today's pushout. -- >8 -- From: Ben Walton Date: Mon, 22 Dec 2014 15:25:44 -0800 Subject: [PATCH] t0090: tweak awk statement for Solaris /usr/xpg4/bin/awk The a

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > On Tue, Dec 23, 2014 at 9:28 AM, Johannes Schindelin > wrote: > >> Johannes Schindelin writes: > >> > >> > And *still*, this is *just* a global table with defaults. I would *still* > >> > need to copy-on-write when the first customization o

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 04:24:57PM +0100, Torsten Bögershausen wrote: > Don't we have the same possible problem under NTFS? > Under Linux + VFAT ? > Under all OS + VFAT ? I'm not sure what you mean. This code path is _only_ about checking for HFS+-specific problems. We check general case-insensi

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Junio C Hamano
Torsten Bögershausen writes: > Don't we have the same possible problem under NTFS? > Under Linux + VFAT ? > Under all OS + VFAT ? I do not think so, as NTFS codepath does not use the (previouly too wide but now fixed) is_hfs_dotgit() in the first place, and is_ntfs_dotgit() does not read one uni

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Having said that, I think "missingTags" etc. should not be configuration > variable names (instead, they should be values). > > Because of that, I do not think we need consistency between the way > these "tokens that denote kinds of errors f

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Junio C Hamano
On Tue, Dec 23, 2014 at 9:28 AM, Johannes Schindelin wrote: >> Johannes Schindelin writes: >> >> > And *still*, this is *just* a global table with defaults. I would *still* >> > need to copy-on-write when the first customization of the severity level >> > takes place because I cannot allow the gl

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Junio C Hamano writes: > Johannes Schindelin writes: > >> Okay, so just to clarify: you want me to >> >> - split the parser into >> >> - a parser that accepts only camelCased variable names when they >>come from the config (for use in fsck and receive-pack), and > > OK. > >> -

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Okay, so just to clarify: you want me to > > > > - split the parser into > > > > - a parser that accepts only camelCased variable names when they > > come from the config (for use in fsck and receiv

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > Okay, so just to clarify: you want me to > > - split the parser into > > - a parser that accepts only camelCased variable names when they > come from the config (for use in fsck and receive-pack), and OK. > - another parser that rejects camelCas

Re: [PATCH v3 2/4] rev-list: add an option to mark fewer edges as uninteresting

2014-12-23 Thread Michael Blume
This patch causes an error on my mac, test 5500 fetch-pack errors on part 44 - fetch creating new shallow root. It looks for "remote: Total 1" in the fetch output and gets 3 instead. On Tue, Dec 23, 2014 at 7:01 AM, brian m. carlson wrote: > In commit fbd4a70 (list-objects: mark more commits as e

Re: Question about installing git from source

2014-12-23 Thread Alexander Kuleshov
I looked at Makefile, and seems that it occurs from here: https://github.com/git/git/blob/master/Makefile#L2205 It tries to copy all files/folders from git root directory but 'install' command prints this error. I tried to execute 'sudo install -d -m 755' in other directory and if there is directo

Re: Question about installing git from source

2014-12-23 Thread Junio C Hamano
Alexander Kuleshov writes: > install -d -m 755 '/usr/bin' > Copying scripts to /usr/bin As 'git grep "Copying scripts"' gives us nothing, the message is obviously not what we are giving. Perhaps you have a strange "install" in your path that does not understand "-d" is a way to tell it to make

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > The parser I wrote actually accepts both versions, allowing me to skip > > the tedious step to convert the camelCased config setting into a > > lower-case-dashed version to pass to `index-pack` or `unpack-o

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > And *still*, this is *just* a global table with defaults. I would *still* > > need to copy-on-write when the first customization of the severity level > > takes place because I cannot allow the global defau

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > And *still*, this is *just* a global table with defaults. I would *still* > need to copy-on-write when the first customization of the severity level > takes place because I cannot allow the global defaults to be modified by > one caller (that would defeat the whole p

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > The parser I wrote actually accepts both versions, allowing me to skip the > tedious step to convert the camelCased config setting into a > lower-case-dashed version to pass to `index-pack` or `unpack-objects`, > only to be parsed by the same parser as `fsck` would u

Re: Question about installing git from source

2014-12-23 Thread Alexander Kuleshov
Hell Junio, Look I download git from master, executed following: make configure make prefix=/usr all sudo make prefix=/usr install And got the same during installing: ~/dev/git $ sudo make prefix=/usr install GEN perl/PM.stamp SUBDIR perl /usr/bin/perl Makefile.PL PREFIX='/usr' INSTALL_

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Junio C Hamano writes: > I suspect that it would be much better if the configuration > variables were organized the other way around, e.g. > > $ git config fsck.warn missingTagger,someOtherKindOfError By the way, I think I like this organization is much better than the other way around, i.

Re: Question about installing git from source

2014-12-23 Thread Junio C Hamano
Alexander Kuleshov writes: > Trying to install git from source, executing: > > make configure > ./configure --prefix=/usr > make --prefix=/usr all > sudo make install DISTDIR=/usr That does not seem to match any of the ways how INSTALL tells us to build and install. Excerpts from INSTALL (

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > >> >> > Of course you can say that! ;-) The problem these ugly messages > >> >> > try to solve is to give the user a hint which setting to change > >> >> > if they want to override the default behavior, thoug

mangled file names in git checkout-index --temp output when run in repo subdirectory

2014-12-23 Thread Russ Cox
I am using git checkout-index --temp to obtain copies of files from the index, but it does not always print valid file names unless run from the repository root. git checkout-index --temp prints names of files in the index interpreted relative to the current directory below the repository root. I

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: >> >> > Of course you can say that! ;-) The problem these ugly messages try to >> >> > solve is to give the user a hint which setting to change if they want to >> >> > override the default behavior, though... >> >> >> >> Ahh, OK, then dashed form would not work as a c

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Tue, 23 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > However, if we had to change the lookup such that it uses an array > > always, we would have to introduce a function to initialize the > > struct, always, in particular we would have to find a place to call

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Junio C Hamano
Johannes Schindelin writes: > However, if we had to change the lookup such that it uses an array always, > we would have to introduce a function to initialize the struct, always, in > particular we would have to find a place to call that initialization > function in, say, builtin/fsck.c (actually

Re: git update-ref --stdin : too many open files

2014-12-23 Thread Junio C Hamano
Stefan Beller writes: > Sounds reasonable. Though by closing the file we're giving up again a > bit of safety. If we close the file everyone could tamper with the lock > file. (Sure they are not supposed to touch it, but they could) There are locking primitives (SysV mandatory locking) that requ

Re: [PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Torsten Bögershausen
On 2014-12-23 09.45, Jeff King wrote: > Our is_hfs_dotgit function relies on the hackily-implemented > next_hfs_char to give us the next character that an HFS+ > filename comparison would look at. It's hacky because it > doesn't implement the full case-folding table of HFS+; it > gives us just enou

Re: [PATCH 1/2] git remote add: allow re-adding remotes with the same URL

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Mon, 22 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > When adding a remote, we make sure that the remote does not exist > > already. > > > > For convenience, we allow re-adding remotes with the same URLs. > > This also handles the case that there is an "[url .

[PATCH v2 1/2] git remote: allow adding remotes agreeing with url.<...>.insteadOf

2014-12-23 Thread Johannes Schindelin
When adding a remote, we make sure that the remote does not exist already. However, this test was not quite correct: when the url.<...>.insteadOf config variable was set to the remote name to be added, the code would assume that the remote exists already. Let's allow adding remotes when there is a

[PATCH v2 0/2] Let `git remote add` play nicer with url..insteadOf

2014-12-23 Thread Johannes Schindelin
Anastas Dancha reported that it is not possible to add a remote when there is already a url..insteadOf = setting in $HOME/.gitconfig. While it makes sense to prevent surprises when a user adds a remote and it fetches from somewhere completely different, it makes less sense to prevent adding a rem

[PATCH v2 2/2] Add a regression test for 'git remote add '

2014-12-23 Thread Johannes Schindelin
Signed-off-by: Johannes Schindelin --- t/t5505-remote.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh index ac79dd9..17c6330 100755 --- a/t/t5505-remote.sh +++ b/t/t5505-remote.sh @@ -1113,4 +1113,9 @@ test_extra_arg set-url origin newurl oldurl

Re: [msysGit] Re: Announcing Git for Windows 1.9.5

2014-12-23 Thread Torsten Bögershausen
On 2014-12-23 10.48, Pat Tressel wrote: > > Bugfixes > - Safeguards against bogus file names on NTFS (CVE-2014-9390). > > > Apologies, but...is it possible to get back an old version? I installed this > version, and it no longer recognizes non-English characters that ap

[PATCH v3 0/4] Improve push performance with lots of refs

2014-12-23 Thread brian m. carlson
This series contains patches to address a significant push performance regression in repositories with large amounts of refs. It avoids performing expensive edge marking unless the repository is shallow. The first patch in the series is a fix for a minor typo I discovered when editing the documen

[PATCH v3 2/4] rev-list: add an option to mark fewer edges as uninteresting

2014-12-23 Thread brian m. carlson
In commit fbd4a70 (list-objects: mark more commits as edges in mark_edges_uninteresting - 2013-08-16), we marked an increasing number of edges uninteresting. This change, and the subsequent change to make this conditional on --objects-edge, are used by --thin to make much smaller packs for shallow

[PATCH v3 4/4] upload-pack: use --objects-edge-aggressive for shallow fetches

2014-12-23 Thread brian m. carlson
When fetching into a shallow repository, we want to aggressively mark edges as uninteresting, since this decreases the pack size. However, is_shallow_repository() returns false on the server side, since the server is not shallow. As the server, we get an indication of whether the client is shallo

[PATCH v3 3/4] pack-objects: use --objects-edge-aggressive only for shallow repos

2014-12-23 Thread brian m. carlson
Using --objects-edge-aggressive is important for shallow repos, as it can result in a much smaller pack (in some cases, 10% of the size). However, it performs poorly on large non-shallow repositories with many refs. Since shallow repositories are less likely to have many refs (due to having less h

[PATCH v3 1/4] Documentation: add missing article in rev-list-options.txt

2014-12-23 Thread brian m. carlson
Add the missing article "a". Signed-off-by: brian m. carlson --- Documentation/rev-list-options.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index afccfdc..2277fcb 100644 --- a/Documentation/rev-l

Re: [PATCH 04/18] Offer a function to demote fsck errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Mon, 22 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > For example, try to spot the error here: > > > > ... > > F(ALMOST_HAPPY, INFO) \ > > F(CANNOT_RECOVER, ERROR) \ > > F(COFFEE_IS_EMPTY, WARN) \ > > F(JUST_BEING_CHATTY, INFO) \ > > F(

Re: [PATCH 16/18] fsck: support demoting errors to warnings

2014-12-23 Thread Johannes Schindelin
Hi Junio, On Mon, 22 Dec 2014, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Mon, 22 Dec 2014, Junio C Hamano wrote: > > > >> Johannes Schindelin writes: > >> > >> > Of course you can say that! ;-) The problem these ugly messages try to > >> > solve is to give the user a hint w

Question about installing git from source

2014-12-23 Thread Alexander Kuleshov
Hello All, Trying to install git from source, executing: make configure ./configure --prefix=/usr make --prefix=/usr all sudo make install DISTDIR=/usr And getting following: install -d -m 755 '/usr/usr/bin' Copying scripts to /usr/bin cp: omitting directory ‘autom4te.cache’ cp: omitting direct

Re: Question on for-each-ref and --contains

2014-12-23 Thread Jeff King
On Tue, Dec 23, 2014 at 09:50:50AM +0200, St. Blind wrote: > In order to make some analyses here I had to build certain report > lists of our remote refs, based on various "containing" and "merged" > rules. We have more than hundred such refs at a time usually. So my > poor script which tries to m

[PATCH] is_hfs_dotgit: loosen over-eager match of \u{..47}

2014-12-23 Thread Jeff King
Our is_hfs_dotgit function relies on the hackily-implemented next_hfs_char to give us the next character that an HFS+ filename comparison would look at. It's hacky because it doesn't implement the full case-folding table of HFS+; it gives us just enough to see if the path matches ".git". At the en

Re: Question on for-each-ref and --contains

2014-12-23 Thread Øystein Walle
St. Blind gmail.com> writes: > > The > git-branch --contains and --merged are not very handy too, > because the> output is not really flexible, and the --merged works > on HEAD only. > `git branch --merged foo` will list branches that are merged in the history of 'foo'. And the equivalent is