Re: git 2.11.0 error when pushing to remote located on a windows share

On 2016-12-05 12:05, thomas.attw...@stfc.ac.uk wrote: > On Sun, 4 Dec 2016 08:09:14 +, Torsten Bögershausen wrote: >> There seems to be another issue, which may or may not being related: >> https://github.com/git-for-windows/git/issues/979 > > I think this is the same issue. I've posted my

[PATCH] git-p4: add p4 shelf support

Extends the submit command to support shelving a commit instead of submitting it to p4 (similar to --prepare-p4-only). Signed-off-by: Nuno Subtil --- git-p4.py | 36 ++-- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/git-p4.py

[PATCH v3] diff: handle --no-abbrev in no-index case

There are two different places where the --no-abbrev option is parsed, and two different places where SHA-1s are abbreviated. We normally parse --no-abbrev with setup_revisions(), but in the no-index case, "git diff" calls diff_opt_parse() directly, and diff_opt_parse() didn't handle --no-abbrev

I want to present you as the owner of funds In my Bank.which will be Invested in your Country with your help, Kindly Get back to me with your Phone number

information

Re: [RFC PATCHv2 09/17] update submodules: add scheduling to update submodules

On Mon, Dec 5, 2016 at 3:37 PM, David Turner wrote: > This patch confuses me -- see below. > >> -Original Message- >> From: Stefan Beller [mailto:sbel...@google.com] >> Sent: Friday, December 02, 2016 7:30 PM >> To: bmw...@google.com; David Turner >> Cc:

RE: [RFC PATCHv2 14/17] submodule: teach unpack_trees() to update submodules

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, December 02, 2016 7:30 PM > To: bmw...@google.com; David Turner > Cc: git@vger.kernel.org; sand...@crustytoothpaste.net; hvo...@hvoigt.net; > gits...@pobox.com; Stefan Beller > Subject: [RFC PATCHv2

RE: [RFC PATCHv2 08/17] update submodules: add depopulate_submodule

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, December 02, 2016 7:30 PM > To: bmw...@google.com; David Turner > Cc: git@vger.kernel.org; sand...@crustytoothpaste.net; hvo...@hvoigt.net; > gits...@pobox.com; Stefan Beller > Subject: [RFC PATCHv2

RE: [RFC PATCHv2 09/17] update submodules: add scheduling to update submodules

This patch confuses me -- see below. > -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, December 02, 2016 7:30 PM > To: bmw...@google.com; David Turner > Cc: git@vger.kernel.org; sand...@crustytoothpaste.net; hvo...@hvoigt.net; > gits...@pobox.com;

Re: git describe number of commits different from git log count

At 12:17 +0100 05 Feb 2016, Jan Hudec wrote: I have a repository with following situation: $ git describe next v4.1-2196-g5a414d7 $ git describe next --match=v4.2 v4.2-4757-g5a414d7 Since the tag with fewest commits since is selected, it appears logical. However, v4.2

RE: [RFC PATCHv2 15/17] checkout: recurse into submodules if asked to

> -Original Message- > From: Stefan Beller [mailto:sbel...@google.com] > Sent: Friday, December 02, 2016 7:30 PM > To: bmw...@google.com; David Turner > Cc: git@vger.kernel.org; sand...@crustytoothpaste.net; hvo...@hvoigt.net; > gits...@pobox.com; Stefan Beller > Subject: [RFC PATCHv2

Re: [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed

On 12/05, Junio C Hamano wrote: > Brandon Williams writes: > > > I just took Jeff's series and applied it on top of mine (and fixed the > > small problem causing t5812 to fail) and then rebased it to v2.9.0. > > There were a few issues that needed to be resolved but nothing

Re: [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed

Brandon Williams writes: > I just took Jeff's series and applied it on top of mine (and fixed the > small problem causing t5812 to fail) and then rebased it to v2.9.0. > There were a few issues that needed to be resolved but nothing too > hairy. So it would definitely be

Re: [PATCHv1 1/2] git-p4: support git-workspaces

Luke Diamand writes: >> What I am trying to get at is if we want to use a single command >> that can be given a path and answer "Yes, that is a repository" >> here, and that single command should know how the repository should >> look like. I offhand do not know we already

Re: Feature request: Set git svn options in .git/config file

Juergen Kosel wrote: > Therefore I believe, that it would be the best solution to store the > settings of --add-author-from, --use-log-author and maybe > --authors-prog in the .git/config file. Actually, "svn.authorsProg" is already documented as a config option for

Re: [PATCH] diff: fix up SHA-1 abbreviations outside of repository

Jeff King writes: > I agree that it may be an accident waiting to happen, though, as soon as > some buried sub-function needs to care about the distinction. Yes to that. >> I wonder if we're better off if we made sure that diff_no_index() >> works the same way regardless of the

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

On 05/12/16 22:24, Junio C Hamano wrote: > Ramsay Jones writes: > >> As I said, the original version of the patch just removed the >> --abbrev=7, but then I started to think about why you might have >> used --abbrev in the first place (first in commit 9b88fcef7 and

Re: [RFC PATCHv2 17/17] checkout: add config option to recurse into submodules by default

On 12/05, Stefan Beller wrote: > On Mon, Dec 5, 2016 at 11:29 AM, Brandon Williams wrote: > > On 12/02, Stefan Beller wrote: > >> +test_expect_success 'option checkout.recurseSubmodules updates submodule' > >> ' > >> + test_config checkout.recurseSubmodules 1 && > >> +

[PATCH] difftool: fix dir-diff index creation when in a subdirectory

9ec26e797781239b36ebccb87c590e5778358007 corrected how path arguments are handled in a subdirectory, but it introduced a regression in how entries outside of the subdirectory are handled by dir-diff. When preparing the right-side of the diff we only include the changed paths in the temporary

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

Ramsay Jones writes: > As I said, the original version of the patch just removed the > --abbrev=7, but then I started to think about why you might have > used --abbrev in the first place (first in commit 9b88fcef7 and > again in commit bf505158d). Making sure to

Re: [RFC PATCHv2 17/17] checkout: add config option to recurse into submodules by default

On Mon, Dec 5, 2016 at 11:29 AM, Brandon Williams wrote: > On 12/02, Stefan Beller wrote: >> +test_expect_success 'option checkout.recurseSubmodules updates submodule' ' >> + test_config checkout.recurseSubmodules 1 && >> + git checkout base && >> + git checkout -b

Re: [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed

On 12/05, Junio C Hamano wrote: > Brandon Williams writes: > > > On 12/01, Junio C Hamano wrote: > >> Brandon Williams writes: > >> > >> > I started taking a look at your http redirect series (I really should > >> > have taking a look at it sooner) and I

Re: git repo vs project level authorization

ken edward writes: > I am currently using svn with apache+mod_dav_svn to have a single > repository with multiple projects. Each of the projects is controlled > by an access control file that lists the project path and the allowed > usernames. > > Does git have this also?

Re: git repo vs project level authorization

On Mon, Dec 05, 2016 at 03:33:51PM -0500, ken edward wrote: > I am currently using svn with apache+mod_dav_svn to have a single > repository with multiple projects. Each of the projects is controlled > by an access control file that lists the project path and the allowed > usernames. > > Does git

Re: [PATCHv1 1/2] git-p4: support git-workspaces

On 5 December 2016 at 21:24, Junio C Hamano wrote: > Luke Diamand writes: > >> On 5 December 2016 at 20:53, Junio C Hamano wrote: >>> Luke Diamand writes: >>> Teach git-p4 about git-workspaces. >>> >>> Is this what

Re: [PATCHv1 1/2] git-p4: support git-workspaces

Junio C Hamano writes: > Luke Diamand writes: > ... > if (os.path.exists(path + "/HEAD") > and os.path.exists(path + "/refs") and os.path.exists(path + > "/objects")): > return True; > + > +# secondary working tree managed by "git

Re: [PATCHv1 1/2] git-p4: support git-workspaces

On 5 December 2016 at 20:53, Junio C Hamano wrote: > Luke Diamand writes: > >> Teach git-p4 about git-workspaces. > > Is this what we call "git worktree", or something else? Ah, I think you're right! > >> >> Signed-off-by: Luke Diamand >>

Re: [PATCHv1 1/2] git-p4: support git-workspaces

Luke Diamand writes: > On 5 December 2016 at 20:53, Junio C Hamano wrote: >> Luke Diamand writes: >> >>> Teach git-p4 about git-workspaces. >> >> Is this what we call "git worktree", or something else? > > Ah, I think you're right! Then

Re: [PATCH v1] git-p4: add config to retry p4 commands; retry 3 times by default

Looks good to me, too. -r flag seems to be supported as far back as I can search in the Helix release notes. Ori Rawlings

Re: [PATCHv1 1/2] git-p4: support git-workspaces

Luke Diamand writes: > Teach git-p4 about git-workspaces. Is this what we call "git worktree", or something else? > > Signed-off-by: Luke Diamand > --- > git-p4.py | 6 ++ > 1 file changed, 6 insertions(+) > > diff --git a/git-p4.py b/git-p4.py > index

Re: [PATCH] commit: make --only --allow-empty work without paths

Jeff King writes: > On Fri, Dec 02, 2016 at 11:15:13PM +0100, Andreas Krey wrote: > >> --only is implied when paths are present, and required >> them unless --amend. But with --allow-empty it should >> be allowed as well - it is the only way to create an >> empty commit in the

Re: [PATCH] real_path: make real_path thread-safe

On Mon, Dec 5, 2016 at 12:12 PM, Brandon Williams wrote: >> > + if (path->len > 1) { >> > + char *last_slash = find_last_dir_sep(path->buf); >> >> What happens when there is no dir_sep? > > There should always be a dir_sep since that only gets run if the

Re: [PATCH] commit: make --only --allow-empty work without paths

Jeff King writes: > On Sat, Dec 03, 2016 at 07:59:49AM +0100, Andreas Krey wrote: > >> > OK. I'm not sure why you would want to create an empty commit in such a >> > case. >> >> User: Ok tool, make me a pullreq. >> >> Tool: But you haven't mentioned any issue >> in your

git repo vs project level authorization

I am currently using svn with apache+mod_dav_svn to have a single repository with multiple projects. Each of the projects is controlled by an access control file that lists the project path and the allowed usernames. Does git have this also? where is the doc? Ken

Re: [PATCH v4 1/3] update-unicode.sh: automatically download newer definition files

Torsten Bögershausen writes: > On Sat, Dec 03, 2016 at 10:00:47PM +0100, Beat Bolli wrote: >> Checking just for the unicode data files' existence is not sufficient; >> we should also download them if a newer version exists on the Unicode >> consortium's servers. Option -N of wget

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

On 05/12/16 18:10, Junio C Hamano wrote: > Ramsay Jones writes: > >> Heh, that was the first version of the patch. However, I got to thinking >> about why --abbrev=7 was there in the first place; the only reason I >> could think of was to defeat local configuration

Re: [PATCH] real_path: make real_path thread-safe

On 12/05, Stefan Beller wrote: > > +/* removes the last path component from 'path' except if 'path' is root */ > > +static void strip_last_component(struct strbuf *path) > > +{ > > + if (path->len > 1) { > > + char *last_slash = find_last_dir_sep(path->buf); > > What happens

Re: [PATCH] real_path: make real_path thread-safe

On 12/05, Stefan Beller wrote: > > static const char *real_path_internal(const char *path, int die_on_error) > > { > > - static struct strbuf sb = STRBUF_INIT; > > + static struct strbuf resolved = STRBUF_INIT; > > Also by having this static here, it is not quite thread safe, yet. >

Re: [PATCH] real_path: make real_path thread-safe

> static const char *real_path_internal(const char *path, int die_on_error) > { > - static struct strbuf sb = STRBUF_INIT; > + static struct strbuf resolved = STRBUF_INIT; Also by having this static here, it is not quite thread safe, yet. By removing the static here we cannot do

Re: [PATCH v7 4/4] transport: add from_user parameter to is_transport_allowed

Brandon Williams writes: > On 12/01, Junio C Hamano wrote: >> Brandon Williams writes: >> >> > I started taking a look at your http redirect series (I really should >> > have taking a look at it sooner) and I see exactly what you're talking >> > about. We

Re: [PATCH] real_path: make real_path thread-safe

On Mon, Dec 5, 2016 at 10:58 AM, Brandon Williams wrote: > The current implementation of real_path uses chdir() in order to resolve > symlinks. Unfortunately this isn't thread-safe as chdir() affects a > process as a whole and not just an individual thread. Instead perform >

Re: [RFC PATCHv2 15/17] checkout: recurse into submodules if asked to

On 12/05, Stefan Beller wrote: > On Mon, Dec 5, 2016 at 11:25 AM, Brandon Williams wrote: > > On 12/02, Stefan Beller wrote: > >> > >> test_expect_success '"checkout " honors diff.ignoreSubmodules' > >> ' > >> @@ -63,6 +70,260 @@ test_expect_success '"checkout " honors > >>

Re: [RFC PATCHv2 15/17] checkout: recurse into submodules if asked to

On Mon, Dec 5, 2016 at 11:25 AM, Brandon Williams wrote: > On 12/02, Stefan Beller wrote: >> >> test_expect_success '"checkout " honors diff.ignoreSubmodules' ' >> @@ -63,6 +70,260 @@ test_expect_success '"checkout " honors >> submodule.*.ignore from .git/ >> ! test -s

Re: [RFC PATCHv2 17/17] checkout: add config option to recurse into submodules by default

On 12/02, Stefan Beller wrote: > +test_expect_success 'option checkout.recurseSubmodules updates submodule' ' > + test_config checkout.recurseSubmodules 1 && > + git checkout base && > + git checkout -b advanced-base && > + git -C submodule commit --allow-empty -m "empty commit" &&

Re: [RFC PATCHv2 15/17] checkout: recurse into submodules if asked to

On 12/02, Stefan Beller wrote: > > test_expect_success '"checkout " honors diff.ignoreSubmodules' ' > @@ -63,6 +70,260 @@ test_expect_success '"checkout " honors > submodule.*.ignore from .git/ > ! test -s actual > ' Should you use test_must_fail and not '!'? -- Brandon Williams

[PATCH] real_path: make real_path thread-safe

The current implementation of real_path uses chdir() in order to resolve symlinks. Unfortunately this isn't thread-safe as chdir() affects a process as a whole and not just an individual thread. Instead perform the symlink resolution by hand so that the calls to chdir() can be removed, making

[PATCH] making real_path thread-safe

The goal of this patch is to make the function real_path thread-safe. To do, the current logic which uses chdir() to do the symlink resolution needed to be rewritten to perform the symlink resolution by hand. I wanted to get the bulk of the work out there for review quickly so technically this

Re: [BUG] git gui can't commit multiple files

On 12/4/16, David Aguilar wrote: > On Sun, Dec 04, 2016 at 05:36:46PM +0100, Timon wrote: >> This is a regression in git 2.11.0 (version 2.10.2 is fine). >> >> In git-gui I select multiple files in the Unstaged Changes (using >> shift+click) and press ctrl+t to stage them. Then

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

Johannes Schindelin writes: > Seriously, do you really think it is a good idea to have > git_config_get_value() *ignore* any value in .git/config? When we do not know ".git/" directory we see is the repository we were told to work on, then we should ignore

Re: [PATCH] clone,fetch: explain the shallow-clone option a little more clearly

Alex Henrie writes: > "deepen by excluding" does not make sense because excluding a revision > does not deepen a repository; it makes the repository more shallow. I think that an intuitive way the feature should work may be: - You started with "git fetch --depth=20"

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

Ramsay Jones writes: > Heh, that was the first version of the patch. However, I got to thinking > about why --abbrev=7 was there in the first place; the only reason I > could think of was to defeat local configuration to get a measure of > reproducibility. > >

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

Jeff King writes: > On Sun, Dec 04, 2016 at 08:45:59PM +, Ramsay Jones wrote: > >> >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Junio, >> >> I recently noticed that: >> >> $ make >pout 2>&1 >> $ ./git version >> git version

Re: [PATCH] docs: warn about possible '=' in clean/smudge filter process values

Jeff King writes: > On Sat, Dec 03, 2016 at 08:45:16PM +0100, larsxschnei...@gmail.com wrote: > >> From: Lars Schneider >> >> A pathname value in a clean/smudge filter process "key=value" pair can >> contain the '=' character (introduced in edcc858).

Re: [PATCH] diff: fix up SHA-1 abbreviations outside of repository

On 05/12/16 12:26 AM, Jeff King wrote: On Sun, Dec 04, 2016 at 11:19:46PM -0800, Junio C Hamano wrote: - if (no_index) + if (no_index) { /* If this is a no-index diff, just run it and exit there. */ + startup_info->have_repository = 0;

Feature request: Set git svn options in .git/config file

Hello, while working with a git-svn repository, I like to use the command line options --use-log-author and --add-author-from for all calls of git svn fetch, git svn rebase, git svn dcommit, ... Doing so consequently, the commit-ids of each git repository, which has been cloned from the same

Dearestone,

Hello My Dear, My name is Magret Williams, i am (24yrs) but age doesn't matter in a real relationship,so i am comfortable with your age,I am from COTE D'IVOIRE in Africa,5.4ft tall, fair in complexion, single,(never married ) and presently i am living in the Refugee Camp here in Togo as a result

Bug: stash staged file move loses original file deletion

Git version 2.8.0 (sorry can't update to more recent on my machine) on Ubuntu. After moving a file, if the new file is in the index but the deletion of the old file is not staged, git stash loses the deletion operation. Repro: 1. git mv a b This will have both the "deletion" and the "file added"

[ANNOUNCE] Git Merge Contributor's Summit Feb 2, 2017, Brussels

Git Merge 2017 is happening on Feb 3rd; there will be a Contributor's Summit the day before. The details are largely what I wrote earlier in [1], but here's a recap: When: Thursday, Feb 2, 2017. 10am-3pm. Where: The Egg[2], Brussels, Belgium What: Git nerds having a round-table discussion

Re: [RFC/PATCH v3 00/16] Add initial experimental external ODB support

On Sat, Dec 03, 2016 at 07:47:51PM +0100, Lars Schneider wrote: > > - " have": the command should output the sha1, size and > > type of all the objects the external ODB contains, one object per > > line. > > This looks impractical. If a repo has 10k external files with > 100 versions each then

Re: [PATCH] docs: warn about possible '=' in clean/smudge filter process values

On Sat, Dec 03, 2016 at 08:45:16PM +0100, larsxschnei...@gmail.com wrote: > From: Lars Schneider > > A pathname value in a clean/smudge filter process "key=value" pair can > contain the '=' character (introduced in edcc858). Make the user aware > of this issue in the

Re: [PATCH 0/6] restricting http redirects

On Thu, Dec 01, 2016 at 04:03:37AM -0500, Jeff King wrote: > Jann Horn brought up on the git-security list some interesting > social-engineering attacks around the way Git handles HTTP redirects. > These patches are my attempt to harden our redirect handling against > these attacks. There's one

Re: Git v2.11.0 breaks max depth nested alternates

From: "Jeff King" On Sun, Dec 04, 2016 at 11:22:52AM -, Philip Oakley wrote: > Ever since 722ff7f876 (receive-pack: quarantine objects until > pre-receive accepts, 2016-10-03, v2.11.0), Git has been quarantining > objects and packs received during an incoming push into a

Re: [PATCH 4/4] shallow.c: remove useless test

On Sat, Dec 3, 2016 at 12:24 PM, Jeff King wrote: > On Fri, Dec 02, 2016 at 09:31:04PM +0100, Rasmus Villemoes wrote: > >> It seems to be odd to do x=y if x==y. Maybe there's a bug somewhere near >> this, but as is this is somewhat confusing. > > Yeah, this code is definitely

Re: difftool -d not populating left correctly when not in git root

Hi David, On Sun, 4 Dec 2016, David Aguilar wrote: > Date: Sun, 4 Dec 2016 14:27:17 -0800 > Subject: [PATCH] difftool: properly handle being launched from a subdirectory > > 9ec26e797781239b36ebccb87c590e5778358007 corrected how path arguments > are handled in a subdirectory, but it introduced

Re: [RFC PATCH] GIT-VERSION-GEN: set --abbrev=9 to match auto-scaling

On 05/12/16 05:32, Jeff King wrote: > On Sun, Dec 04, 2016 at 08:45:59PM +, Ramsay Jones wrote: >> I recently noticed that: >> >> $ make >pout 2>&1 >> $ ./git version >> git version 2.11.0.286.g109e8a9 >> $ git describe >> v2.11.0-286-g109e8a99d >> $ >> >> ... for

RE: git 2.11.0 error when pushing to remote located on a windows share

On Sun, 4 Dec 2016 08:09:14 +, Torsten Bögershausen wrote: > There seems to be another issue, which may or may not being related: > https://github.com/git-for-windows/git/issues/979 I think this is the same issue. I've posted my trace command output there as It might be more appropriate:

Re: [PATCH v1] git-p4: add config to retry p4 commands; retry 3 times by default

On 4 December 2016 at 14:03, wrote: > From: Lars Schneider > > P4 commands can fail due to random network issues. P4 users can counter > these issues by using a retry flag supported by all p4 commands [1]. > > Add an integer Git config

Re: Error after calling git difftool -d with

Hi Peter, On Mon, 5 Dec 2016, P. Duijst wrote: > On 12/5/2016 06:15, David Aguilar wrote: > > On Fri, Dec 02, 2016 at 05:05:06PM +0100, Johannes Schindelin wrote: > > > > > > On Fri, 2 Dec 2016, P. Duijst wrote: > > > > > > > Incase filenames are used with a quote ' or a bracket [ (and > > > >

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

Hi Junio, On Thu, 1 Dec 2016, Junio C Hamano wrote: > As to "I have to spawn config", I think it is sensible to start the > cmd_difftool() wrapper without adding RUN_SETUP to the command table, > then call git_config_get_bool() to check the configuration only from > system and per-user files,

Re: [PATCH 1/4] shallow.c: make paint_alloc slightly more robust

On Sat, Dec 3, 2016 at 12:14 PM, Jeff King wrote: > On Fri, Dec 02, 2016 at 09:31:01PM +0100, Rasmus Villemoes wrote: > >> I have no idea if this is a real issue, but it's not obvious to me that >> paint_alloc cannot be called with info->nr_bits greater than about >> 4M (\approx

Re: [PATCH v1] git-p4: add config to retry p4 commands; retry 3 times by default

> On 04 Dec 2016, at 15:03, larsxschnei...@gmail.com wrote: > > From: Lars Schneider Hi Junio, if you decide to queue this patch and/or the "git-p4: fix empty file processing for large file system backend GitLFS", please use my signed-off address. I accidentally