Re: [PATCH v2 1/9] perf/run: add '--config' option to the 'run' script

2017-11-16 Thread Christian Couder
On Mon, Oct 16, 2017 at 7:25 AM, Junio C Hamano wrote: > Christian Couder writes: > >> It is error prone and tiring to use many long environment >> variables to give parameters to the 'run' script. > > This topic has been sitting in the list archive

Re: What's cooking in git.git (Nov 2017, #05; Fri, 17)

2017-11-16 Thread Junio C Hamano
Junio C Hamano writes: > * av/fsmonitor (2017-11-13) 7 commits > (merged to 'next' on 2017-11-13 at db56ad7eef) > + fsmonitor: simplify determining the git worktree under Windows > ... > > Various fixes to bp/fsmonitor topic. > > Waiting for follow-on fixes to settle. >

Re: [PATCH v4 00/15] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-11-16 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > This part 3 of a 3 part sequence partial clone. It assumes > that part 1 and part 2 are in place. I couldn't figure out why 'pu' fails with this topic at t5500 (and others) so I dropped a merge

What's cooking in git.git (Nov 2017, #05; Fri, 17)

2017-11-16 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [PATCH 1/1] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2017-11-16 Thread Junio C Hamano
Dan Jacques writes: > Enable Git to resolve its own binary location using a variety of > OS-specific and generic methods, including: > > - procfs via "/proc/self/exe" (Linux) > - _NSGetExecutablePath (Darwin) > - argv0, if absolute (all, including Windows). > > This is used to

Re: Documentation of post-receive hook

2017-11-16 Thread Junio C Hamano
Junio C Hamano writes: >> This hook is invoked by 'git-receive-pack' on the remote repository, >> which happens when a 'git push' is done on a local repository and >> successfully transfers at least 1 commit. > > I am not sure "at least 1 commit" is a good phrase

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Junio C Hamano
Todd Zullinger writes: > Seeing that the error output when using it tells the user to "use > '--track' or '--set-upstream-to' instead," should we perhaps also > remove the --set-upstream entry entirely? That's reads: > >--set-upstream:: >As this option had

Re: [PATCH v4 5/6] rev-list: add list-objects filtering support

2017-11-16 Thread Junio C Hamano
Jonathan Tan writes: > If it were up to me, I would remove all existing mentions of "partial > clone" and explain the presence of the "--missing" argument as follows: > > In the future, we will introduce a "partial clone" mechanism wherein > an object in a repo,

Re: [PATCH v4 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Junio C Hamano
Jeff King writes: > Those encodings don't necessarily need to be the same, because they're > about transport. Inside each process we'd have the raw bytes, and encode > them as appropriate to whatever sub-program we're going to pass to (or > not at all if we skip the shell for

Re: [RFC 2/3] am: semi working --cover-at-tip

2017-11-16 Thread Junio C Hamano
Nicolas Morey-Chaisemartin writes: >> I thought about that. >> Is there a use case for cover after the last patch works and >> removes the need to touch am_next (can be done out of the loop in >> am_run). > > Do you have an opinion on that ? It has quite a big impact

Re: Documentation of post-receive hook

2017-11-16 Thread Junio C Hamano
Christoph Michelbach writes: > I think the documentation of the post-receive hook is misleading. When reading > it, it appears as though the post-receive hook is executed even when no > commits > are transferred by a git push because it isn't mentioned anywhere that this

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Todd Zullinger
Junio C Hamano wrote: Todd Zullinger writes: Support for the --set-upstream option was removed in 52668846ea (builtin/branch: stop supporting the "--set-upstream" option, 2017-08-17), after a long deprecation period. Remove the option from the command synopsis for consistency.

Re: [PATCH v3 1/1] Introduce git add --renormalize .

2017-11-16 Thread Junio C Hamano
tbo...@web.de writes: I'll retitle this to Subject: add: introduce "--renormalize" and will queue with s/$old/$new/ that you'll see below. > From: Torsten Bögershausen > > Make it safer to normalize the line endings in a repository: s/:$/./; > Files that had been

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Junio C Hamano
Todd Zullinger writes: > Support for the --set-upstream option was removed in 52668846ea > (builtin/branch: stop supporting the "--set-upstream" option, > 2017-08-17), after a long deprecation period. > > Remove the option from the command synopsis for consistency. Replace >

Re: [PATCH 1/5] connect: split git:// setup into a separate function

2017-11-16 Thread Junio C Hamano
Jonathan Nieder writes: >> Which means the defaulting of git_connect::conn to _fork is now >> unneeded. One of the things that made the original cascade a bit >> harder to follow than necessary, aside from the physical length of >> the PROTO_GIT part, was that the case where

Re: [PATCH] launch_editor(): indicate that Git waits for user input

2017-11-16 Thread Junio C Hamano
Lars Schneider writes: >> On 16 Nov 2017, at 15:58, Junio C Hamano wrote: >> >> Lars Schneider writes: >> On 16 Nov 2017, at 07:04, Junio C Hamano wrote: >>> >>> Wow. Thanks for the quick patch

Re: [PATCHv4 7/7] builtin/describe.c: describe a blob

2017-11-16 Thread Junio C Hamano
Junio C Hamano writes: > Stefan Beller writes: > >> grep "fatal: test-blob-1 is neither a commit nor blob" actual > > OK, that might be somewhat unsatisfying from end-user's point of > view (logically "test-blob-1" is already a name based on the 'graph

Documentation of post-receive hook

2017-11-16 Thread Christoph Michelbach
Hi, I think the documentation of the post-receive hook is misleading. When reading it, it appears as though the post-receive hook is executed even when no commits are transferred by a git push because it isn't mentioned anywhere that this is necessary for its execution. This can easily be fixed

Re: [PATCH v4 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jeff King
On Thu, Nov 16, 2017 at 04:49:08PM -0500, Jeff Hostetler wrote: > > First of all, about the injection problem, replying to your previous e-mail > > [1]: > > > > https://public-inbox.org/git/61855872-221b-0e97-abaa-24a011ad8...@jeffhostetler.com/ > > > > > I couldn't use quote.[ch] because it is

Re: [PATCH v4 00/10] Partial clone part 2: fsck and promisors

2017-11-16 Thread Jonathan Tan
I patched both this series and the first 9 patches of mine [1] on part 1 of the entire partial clone implementation [2], and then diffed them. I'll review just the differences between the two. You can see the entire diff below (minus means in my patch set but not in Jeff's, plus means the

Re: [PATCH v4 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jeff Hostetler
On 11/16/2017 3:21 PM, Jonathan Tan wrote: On Thu, 16 Nov 2017 18:07:41 + Jeff Hostetler wrote: +/* + * Return 1 if the given string needs armoring because of "special" + * characters that may cause injection problems when a command passes + * the argument to a

Re: [PATCH 12/30] directory rename detection: miscellaneous testcases to complete coverage

2017-11-16 Thread Elijah Newren
On Wed, Nov 15, 2017 at 12:03 PM, Stefan Beller wrote: > On Fri, Nov 10, 2017 at 11:05 AM, Elijah Newren wrote: > >> +# Testcase 9d, N-fold transitive rename? >> +# (Related to testcase 9c...and 1c and 7e) >> +# Commit A: z/a, y/b, x/c, w/d, v/e, u/f >>

Re: Git on Mac - Segmentation fault:11

2017-11-16 Thread Kevin
cc: mailinglist On Thu, Nov 16, 2017 at 9:40 PM, Frank Burkitt wrote: > Kevin - > > Thank you for getting back to me. > > The version of Git is 2.15.0 > I used Brew to install it > I am not getting any segfaults from other apps > When I do a ‘git init’ I get a Segmentation

Re: [PATCH v4 5/6] rev-list: add list-objects filtering support

2017-11-16 Thread Jonathan Tan
On Thu, 16 Nov 2017 18:07:42 + Jeff Hostetler wrote: > From: Jeff Hostetler > > Teach rev-list to use the filtering provided by the > traverse_commit_list_filtered() interface to omit > unwanted objects from the result. This feature is >

Re: Git on Mac - Segmentation fault:11

2017-11-16 Thread Kevin Daudt
On Wed, Nov 15, 2017 at 05:30:23PM -0700, Frank Burkitt wrote: > I am using Git on a Macbook pro with MacOS High Sierra version 10.13.1 > (17B48). I have been using it in a virtualenv with python 3. I have > begun to get "Segmentation fault: 11" with every git command. I have > been searching

Re: [PATCH v4 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jonathan Tan
On Thu, 16 Nov 2017 18:07:41 + Jeff Hostetler wrote: > +/* > + * Return 1 if the given string needs armoring because of "special" > + * characters that may cause injection problems when a command passes > + * the argument to a subordinate command (such as when

Re: [PATCH v4 07/10] introduce fetch-object: fetch one promisor object

2017-11-16 Thread Ramsay Jones
On 16/11/17 18:12, Jeff Hostetler wrote: > From: Jonathan Tan > > Introduce fetch-object, providing the ability to fetch one object from a > promisor remote. > > This uses fetch-pack. To do this, the transport mechanism has been > updated with 2 flags,

КЛИЕНТСКИЕ БАЗЫ!!! Подробнее: prodawez...@gmail.com Узнайте подробности!

2017-11-16 Thread uqbkcaqr...@vger.kernel.org
KLIENTSKIE BAZI!!! Podrobnee: prodawez...@gmail.com Uznaite podrobnosti!

Re: [PATCHv5 7/7] builtin/describe.c: describe a blob

2017-11-16 Thread Stefan Beller
On Wed, Nov 15, 2017 at 7:24 PM, Junio C Hamano wrote: > I am not sure if "And if there is ..." is adding much value here (I > do not think it is even technically correct for that matter). If > there are more than one tag that point at the commit the user is > interested in,

[PATCH] apply: update line lengths for --inaccurate-eof

2017-11-16 Thread René Scharfe
Some diff implementations don't report missing newlines at the end of files. Applying such a patch can cause a newline character to be added inadvertently. The option --inaccurate-eof of git apply can be used to remove trailing newlines if needed. apply_one_fragment() cuts it off from the

[PATCH v4 06/15] pack-objects: test support for blob filtering

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan As part of an effort to improve Git support for very large repositories in which clients typically have only a subset of all version-controlled blobs, test pack-objects support for --filter=blob:limit=, packing only blobs not exceeding that size

[PATCH v4 14/15] unpack-trees: batch fetching of missing blobs

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan When running checkout, first prefetch all blobs that are to be updated but are missing. This means that only one pack is downloaded during such operations, instead of one per missing blob. This operates only on the blob level - if a repository has a

[PATCH v4 12/15] t5601: test for partial clone

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- builtin/clone.c | 15 --- t/t5601-clone.sh | 49 + 2 files changed, 61

[PATCH v4 15/15] fetch-pack: restore save_commit_buffer after use

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan In fetch-pack, the global variable save_commit_buffer is set to 0, but not restored to its original value after use. In particular, if show_log() (in log-tree.c) is invoked after fetch_pack() in the same process, show_log() will return before

[PATCH v4 09/15] fetch-pack: test support excluding large blobs

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Created tests to verify fetch-pack and upload-pack support for excluding large blobs using --filter=blob:limit= parameter. Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler ---

[PATCH v4 08/15] partial-clone: define partial clone settings in config

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Create get and set routines for partial clone settings in the config. These will be used by partial clone and fetch to remember the promisor remote and the default filter-spec. Signed-off-by: Jeff Hostetler ---

[PATCH v4 13/15] t5500: more tests for partial clone and fetch

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- t/t5500-fetch-pack.sh | 60 +++ 1 file changed, 56 insertions(+), 4 deletions(-) diff

[PATCH v4 11/15] t5500: add fetch-pack tests for partial clone

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- t/t5500-fetch-pack.sh | 36 1 file changed, 36 insertions(+) diff --git a/t/t5500-fetch-pack.sh

[PATCH v4 10/15] fetch: add from_promisor and exclude-promisor-objects parameters

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach fetch to use from-promisor and exclude-promisor-objects parameters with sub-commands. Initialize fetch_if_missing global variable. Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler

[PATCH v4 03/15] fetch: refactor calculation of remote list

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Separate out the calculation of remotes to be fetched from and the actual fetching. This will allow us to include an additional step before the actual fetching in a subsequent commit. Signed-off-by: Jonathan Tan ---

[PATCH v4 00/15] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler This part 3 of a 3 part sequence partial clone. It assumes that part 1 and part 2 are in place. This patch series is labeled as V4 to keep it in sync with the corresponding V4 versions of parts 1 and 2. There was not a V3 version of this patch

[PATCH v4 04/15] fetch: add object filtering for partial fetch

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Teach fetch to use the list-objects filtering parameters to allow a "partial fetch" following a "partial clone". Signed-off-by: Jeff Hostetler --- builtin/fetch.c | 20 1 file changed, 20 insertions(+)

[PATCH v4 05/15] remote-curl: add object filtering for partial clone

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- Documentation/gitremote-helpers.txt | 4 remote-curl.c | 11 +++ 2 files changed, 15 insertions(+) diff --git a/Documentation/gitremote-helpers.txt

[PATCH v4 07/15] fetch-pack: test support excluding large blobs

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Created tests to verify fetch-pack and upload-pack support for excluding large blobs using --filter=blob:limit= parameter. Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- cache.h

[PATCH v4 02/15] clone, fetch-pack, index-pack, transport: partial clone

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/clone.c | 9 + builtin/fetch-pack.c | 4 fetch-pack.c | 13 + fetch-pack.h | 2 ++ transport-helper.c | 5 + transport.c

[PATCH v4 01/15] upload-pack: add object filtering for partial clone

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Teach upload-pack to negotiate object filtering over the protocol and to send filter parameters to pack-objects. This is intended for partial clone and fetch. The idea to make upload-pack configurable using uploadpack.allowFilter comes from Jonathan

[PATCH v4 01/10] extension.partialclone: introduce partial clone extension

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Introduce new repository extension option: `extensions.partialclone` See the update to Documentation/technical/repository-version.txt in this patch for more information. Signed-off-by: Jonathan Tan ---

[PATCH v4 00/10] Partial clone part 2: fsck and promisors

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler This is part 2 of a 3 part sequence for partial clone. Part 2 assumes part 1 is in place. This patch series is labeled V4 to keep it in sync with the V4 version of part 1. (There was no V3 of this part.) Part 2 is concerned with fsck, gc, initial

[PATCH v4 09/10] rev-list: support termination at promisor objects

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach rev-list to support termination of an object traversal at any object from a promisor remote (whether one that the local repo also has, or one that the local repo knows about because it has another promisor object that references it). This will

[PATCH v4 08/10] sha1_file: support lazily fetching missing objects

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach sha1_file to fetch objects from the remote configured in extensions.partialclone whenever an object is requested but missing. The fetching of objects can be suppressed through a global variable. This is used by fsck and index-pack. However, by

[PATCH v4 04/10] fsck: support referenced promisor objects

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects indirectly pointed to by refs as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 11 +++

[PATCH v4 10/10] gc: do not repack promisor packfiles

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach gc to stop traversal at promisor objects, and to leave promisor packfiles alone. This has the effect of only repacking non-promisor packfiles, and preserves the distinction between promisor packfiles and non-promisor packfiles. Signed-off-by:

[PATCH v4 07/10] introduce fetch-object: fetch one promisor object

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Introduce fetch-object, providing the ability to fetch one object from a promisor remote. This uses fetch-pack. To do this, the transport mechanism has been updated with 2 flags, "from-promisor" to indicate that the resulting pack comes from a

[PATCH v4 02/10] fsck: introduce partialclone extension

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Currently, Git does not support repos with very large numbers of objects or repos that wish to minimize manipulation of certain blobs (for example, because they are very large) very well, even if the user operates mostly on part of the repo, because

[PATCH v4 03/10] fsck: support refs pointing to promisor objects

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat refs referring to missing promisor objects as an error when extensions.partialclone is set. For the purposes of warning about no default refs, such refs are still treated as legitimate refs. Signed-off-by: Jonathan Tan

[PATCH v4 05/10] fsck: support promisor objects as CLI argument

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects provided on the CLI as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 2 ++ t/t0410-partial-clone.sh | 13

[PATCH v4 06/10] index-pack: refactor writing of .keep files

2017-11-16 Thread Jeff Hostetler
From: Jonathan Tan In a subsequent commit, index-pack will be taught to write ".promisor" files which are similar to the ".keep" files it knows how to write. Refactor the writing of ".keep" files, so that the implementation of writing ".promisor" files becomes easier.

[PATCH v4 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Create traverse_commit_list_filtered() and add filtering interface to allow certain objects to be omitted from the traversal. Update traverse_commit_list() to be a wrapper for the above with a null filter to minimize the number of callers that needed

[PATCH v4 0/6] Partial clone part 1: object filtering

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Here is V4 of the list-object filtering, rev-list, and pack-objects. This version addresses comments on the V3 version series. This version replaces the code to scan and reject the filter-spec for injection characters with a new hex-encoding

[PATCH v4 6/6] pack-objects: add list-objects filtering

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Teach pack-objects to use the filtering provided by the traverse_commit_list_filtered() interface to omit unwanted objects from the resulting packfile. This feature is intended for partial clone/fetch. Filtering requires the use of the "--stdout"

[PATCH v4 3/6] oidset: add iterator methods to oidset

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Add the usual iterator methods to oidset. Add oidset_remove(). Signed-off-by: Jeff Hostetler --- oidset.c | 10 ++ oidset.h | 36 2 files changed, 46 insertions(+) diff --git

[PATCH v4 1/6] dir: allow exclusions from blob in addition to file

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Refactor add_excludes() to separate the reading of the exclude file into a buffer and the parsing of the buffer into exclude_list items. Add add_excludes_from_blob_to_list() to allow an exclude file be specified with an OID without assuming a local

[PATCH v4 2/6] oidmap: add oidmap iterator methods

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Add the usual map iterator functions to oidmap. Signed-off-by: Jeff Hostetler --- oidmap.h | 22 ++ 1 file changed, 22 insertions(+) diff --git a/oidmap.h b/oidmap.h index 18f54cd..d3cd2bb 100644 ---

[PATCH v4 5/6] rev-list: add list-objects filtering support

2017-11-16 Thread Jeff Hostetler
From: Jeff Hostetler Teach rev-list to use the filtering provided by the traverse_commit_list_filtered() interface to omit unwanted objects from the result. This feature is intended to help with partial clone. Object filtering is only allowed when one of the

Re: [PATCH 04/14] fetch: add object filtering for partial fetch

2017-11-16 Thread Jeff Hostetler
On 11/3/2017 4:38 PM, Jonathan Tan wrote: @@ -1242,6 +1249,20 @@ static int fetch_multiple(struct string_list *list) int i, result = 0; struct argv_array argv = ARGV_ARRAY_INIT; + if (filter_options.choice) { + /* +* We currently only support

Re: [PATCH 02/14] clone, fetch-pack, index-pack, transport: partial clone

2017-11-16 Thread Jeff Hostetler
On 11/8/2017 1:01 PM, Adam Dinwoodie wrote: On Friday 03 November 2017 at 01:32 pm -0700, Jonathan Tan wrote: On Thu, 2 Nov 2017 20:31:17 + Jeff Hostetler wrote: diff --git a/builtin/index-pack.c b/builtin/index-pack.c index a0a35e6..31cd5ba 100644 ---

Re: [PATCH v3 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jeff Hostetler
On 11/8/2017 12:01 AM, Junio C Hamano wrote: Jonathan Tan writes: Having said that, though, it might be safer to still introduce one, and relax it later if necessary - it is much easier to relax a constraint than to increase one. It would also be more error prone

Re: [PATCH 1/9] extension.partialclone: introduce partial clone extension

2017-11-16 Thread Jeff Hostetler
On 11/8/2017 4:51 PM, Jonathan Tan wrote: On Wed, 8 Nov 2017 15:32:21 -0500 Jeff Hostetler wrote: Thanks Jonathan. I moved my version of part 2 on top of yesterday's part 1. There are a few changes between my version and yours. Could you take a quick look at them

Re: [PATCH v3 4/6] list-objects: filter objects in traverse_commit_list

2017-11-16 Thread Jeff Hostetler
On 11/7/2017 6:20 PM, Jonathan Tan wrote: On Tue, 7 Nov 2017 19:35:44 + Jeff Hostetler wrote: +/* + * Reject the arg if it contains any characters that might + * require quoting or escaping when handing to a sub-command. + */ +static int

[PATCH] completion: add '--copy' option to 'git branch'

2017-11-16 Thread Todd Zullinger
In 52d59cc645 (branch: add a --copy (-c) option to go with --move (-m), 2017-06-18), `git branch` learned a `--copy` option. Include it when providing command completions. Signed-off-by: Todd Zullinger --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1

[PATCH 1/1] exec_cmd: RUNTIME_PREFIX on some POSIX systems

2017-11-16 Thread Dan Jacques
Enable Git to resolve its own binary location using a variety of OS-specific and generic methods, including: - procfs via "/proc/self/exe" (Linux) - _NSGetExecutablePath (Darwin) - argv0, if absolute (all, including Windows). This is used to enable RUNTIME_PREFIX support for non-Windows systems,

[PATCH 0/1] RUNTIME_PREFIX on POSIX systems.

2017-11-16 Thread Dan Jacques
Hello! This would be my first contribution to the Git project, so please accept my apology in advance for any mistakes and let me know what I can do better. This patch expands support for the RUNTIME_PREFIX configuration flag, currently only used on Windows builds, to include Linux, Darwin, and

Re: [PATCH 3/4] branch: correctly reject refs/heads/{-dash,HEAD}

2017-11-16 Thread Kaartic Sivaraam
On Thursday 16 November 2017 08:27 PM, Junio C Hamano wrote: Kaartic Sivaraam writes: I guess this series is not yet ready for 'next'. When I tried to apply this patch it doesn't seem to be applying cleanly. I get some conflicts in 'sha1_name.c' possibly as a

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Todd Zullinger
Martin Ågren wrote: On 16 November 2017 at 08:46, Todd Zullinger wrote: I noticed that --set-upstream was still in the synopsis for git branch. I don't think it was left there intentionally. I looked through the thread where support for the option was removed and didn't

Re: [PATCH] git-send-email: fix get_maintainer.pl regression

2017-11-16 Thread Alex Bennée
Alex Bennée writes: > Getting rid of Mail::Address regressed behaviour with common > get_maintainer scripts such as the Linux kernel. Fix the missed corner > case and add a test for it. > > diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh > index

[PATCH v3 1/1] Introduce git add --renormalize .

2017-11-16 Thread tboegi
From: Torsten Bögershausen Make it safer to normalize the line endings in a repository: Files that had been commited with CRLF will be commited with LF. The old way to normalize a repo was like this: # Make sure that there are not untracked files $ echo "* text=auto"

Re: [RFC 2/3] am: semi working --cover-at-tip

2017-11-16 Thread Nicolas Morey-Chaisemartin
Le 14/11/2017 à 10:17, Nicolas Morey-Chaisemartin a écrit : > > Le 14/11/2017 à 07:00, Junio C Hamano a écrit : >> Nicolas Morey-Chaisemartin writes: >> >> By the way, don't we want to sanity check state->last (which we >> learn by running "git mailsplit" that splits

Re: Changing encoding of a file : What should happen to CRLF in file ?

2017-11-16 Thread Torsten Bögershausen
On Thu, Nov 16, 2017 at 12:35:33AM +0530, Ashish Negi wrote: > On windows : > > git --version > git version 2.14.2.windows.2 > > On linux : > > git --version > git version 2.7.4 > > I would like to understand the solution : > If i understood it correctly : it removes file_name.txt from index, so

[PATCH] git-send-email: fix get_maintainer.pl regression

2017-11-16 Thread Alex Bennée
Getting rid of Mail::Address regressed behaviour with common get_maintainer scripts such as the Linux kernel. Fix the missed corner case and add a test for it. Fixes: cc9075067776ebd34cc08f31bf78bb05f12fd879 Signed-off-by: Alex Bennée --- perl/Git.pm | 3 +++

Re: [PATCH] launch_editor(): indicate that Git waits for user input

2017-11-16 Thread Lars Schneider
> On 16 Nov 2017, at 15:58, Junio C Hamano wrote: > > Lars Schneider writes: > >>> On 16 Nov 2017, at 07:04, Junio C Hamano wrote: >> >> Wow. Thanks for the quick patch :-) > > Heh, this is not exactly my itch, so if you are

Re: [PATCH] launch_editor(): indicate that Git waits for user input

2017-11-16 Thread Junio C Hamano
Lars Schneider writes: >> On 16 Nov 2017, at 07:04, Junio C Hamano wrote: > > Wow. Thanks for the quick patch :-) Heh, this is not exactly my itch, so if you are inclined to, can you take it over from here on? Thanks.

Re: [PATCH 3/4] branch: correctly reject refs/heads/{-dash,HEAD}

2017-11-16 Thread Junio C Hamano
Kaartic Sivaraam writes: > I guess this series is not yet ready for 'next'. When I tried to apply > this patch it doesn't seem to be applying cleanly. I get some > conflicts in 'sha1_name.c' possibly as a consequence of the changes to > the file that aren't accounted

КЛИЕНТСКИЕ БАЗЫ!!! Подробнее: prodawez...@gmail.com Узнайте подробности!

2017-11-16 Thread lqerjanc...@vger.kernel.org
KLIENTSKIE BAZI!!! Podrobnee: prodawez...@gmail.com Uznaite podrobnosti!

Re: [PATCH v2] sequencer: reschedule pick if index can't be locked

2017-11-16 Thread Phillip Wood
On 16/11/17 05:22, Junio C Hamano wrote: > From: Phillip Wood > Date: Wed, 15 Nov 2017 10:41:25 + > > If the index cannot be locked in do_recursive_merge(), issue an > error message and go on to the error recovery codepath, instead of > dying. When the commit

Re: [PATCH 3/4] branch: correctly reject refs/heads/{-dash,HEAD}

2017-11-16 Thread Kaartic Sivaraam
On Thursday 16 November 2017 03:44 AM, Junio C Hamano wrote: Kaartic Sivaraam writes: >> Are these two patches follow-up fixes (replacement of 3/3 plus an >> extra patch) to jc/branch-name-sanity topic? > > Yes, that's right. > >>

RE: [Feature- Request] Option to commit after checking out branch command is made

2017-11-16 Thread Ninivaggi Mattia
I like the --autostash flag. But actually you just could write an alias co="git stash && git checkout" and use co dev for the same purpose, rendering the change irrelevant. -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Thursday, November 16, 2017 1:20 AM To:

I have a PRPSL for you, kindly contact me on j11...@outlook.kr for details

2017-11-16 Thread Nunez, Daniela
Daniela Nunez Adjunct Faculty daniela.nun...@tamiu.edu Tel. (956) 326-2647 Fax (956) 326- Department Of Humanities Texas A International University 5201 University Blvd Laredo, Texas 78041 As pursuant to Texas A International University rule 33.04.99.L2 concerning the Use and Disposition of

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Kaartic Sivaraam
On Thursday 16 November 2017 04:19 PM, Martin Ågren wrote: On 16 November 2017 at 08:46, Todd Zullinger wrote: diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index d6587c5e96..159ca388f1 100644 --- a/Documentation/git-branch.txt +++

Re: [PATCH] sequencer: reschedule pick if index can't be locked

2017-11-16 Thread Martin Ågren
On 16 November 2017 at 11:43, Phillip Wood wrote: > On 15/11/17 18:44, Martin Ågren wrote: >> >> On 15 November 2017 at 11:41, Phillip Wood >> wrote: >> >> From the commit message, I would have expected the flags to be zero. This >> patch >>

Re: [PATCH] branch doc: remove --set-upstream from synopsis

2017-11-16 Thread Martin Ågren
On 16 November 2017 at 08:46, Todd Zullinger wrote: > Support for the --set-upstream option was removed in 52668846ea > (builtin/branch: stop supporting the "--set-upstream" option, > 2017-08-17), after a long deprecation period. > > Remove the option from the command synopsis for

Re: [PATCH] sequencer: reschedule pick if index can't be locked

2017-11-16 Thread Phillip Wood
On 15/11/17 18:44, Martin Ågren wrote: On 15 November 2017 at 11:41, Phillip Wood wrote: From: Phillip Wood Return an error instead of dying if the index cannot be locked in do_recursive_merge() as if the commit cannot be picked it needs

Re: Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file())

2017-11-16 Thread Simon Ruderich
On Mon, Nov 06, 2017 at 05:13:15PM +0100, Simon Ruderich wrote: > On Sat, Nov 04, 2017 at 10:07:00PM -0400, Jeff King wrote: >> Yes, I think what you've written here (and below) is quite close to the >> error_context patches I linked elsewhere in the thread. In other >> words, I think it's a sane

Re: [PATCH] launch_editor(): indicate that Git waits for user input

2017-11-16 Thread Lars Schneider
> On 16 Nov 2017, at 07:04, Junio C Hamano wrote: Wow. Thanks for the quick patch :-) > When a graphical GIT_EDITOR is spawned by a Git command that opens > and waits for it for the user input (e.g. "git rebase -i") pops its > window elsewhere that is obscure, the user may

Hello Friend

2017-11-16 Thread Wang Jianlin
-- I intend to give you a portion of my wealth as a free-will financial donation to you, Respond to partake. Wang Jianlin Wanda Group