[PATCH v3 1/2] Fix misconversion of gitsubmodule.txt

2018-02-22 Thread marmot1123
In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions `submodule’s`. It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. Signed-off-by: Motoki Seki --- Documentation/gitsubmodules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2

[PATCH v3 2/2] Replace non-ASCII apostrophes to ASCII single quotes in gitsubmodules.txt

2018-02-22 Thread marmot1123
Before this patch, there are several non-ASCII apostrophes in gitsubmodules.txt, and misconverged at the https://git-scm.com/docs/gitsubmodules/ . To make codes consistent, these non-ASCII apostrophes are replaced with ASCII single quotes. This patch also makes the document readable on the

Re: [PATCH v3 06/42] completion: use __gitcomp_builtin in _git_am

2018-02-22 Thread Duy Nguyen
On Wed, Feb 14, 2018 at 7:53 PM, SZEDER Gábor wrote: > On Fri, Feb 9, 2018 at 12:01 PM, Nguyễn Thái Ngọc Duy > wrote: >> The new completable options are: >> >> --directory >> --exclude >> --gpg-sign >> --include >> --keep-cr >> --keep-non-patch >>

Re: [PATCH 1/2] parse-options: expand $HOME on filename options

2018-02-22 Thread Duy Nguyen
On Thu, Feb 15, 2018 at 5:46 AM, Ævar Arnfjörð Bjarmason wrote: > In general I'm mildly negative on adding this, for every user like Doron > who'll be less confused by a hack like this, you'll have other users > who'll be confused about git inexplicably working with ~ in the

[PATCH 1/1] git-p4: add unshelve command

2018-02-22 Thread Luke Diamand
This can be used to "unshelve" a shelved P4 commit into a git commit. For example: $ git p4 unshelve 12345 The resulting commit ends up in the branch: refs/remotes/p4/unshelved/12345 Signed-off-by: Luke Diamand --- Documentation/git-p4.txt | 22 git-p4.py

[PATCH 0/1] git-p4: add unshelve command

2018-02-22 Thread Luke Diamand
This is an initial attempt at adding an unshelve command to git-p4. For those not familiar with it, p4 shelve creates a "pending" changelist, which isn't committed into the central repo but is nonetheless visible to other develoeprs. The "unshelve" command takes one of these pending changelists

Re: bug in HTTP protocol spec

2018-02-22 Thread Jeff King
On Wed, Feb 21, 2018 at 11:23:52PM -0800, Dorian Taylor wrote: > diff --git a/Documentation/technical/http-protocol.txt > b/Documentation/technical/http-protocol.txt > index a0e45f2889e6e..19d73f7efb338 100644 > --- a/Documentation/technical/http-protocol.txt > +++

Re: [PATCH v3 13/35] ls-refs: introduce ls-refs server command

2018-02-22 Thread Jeff King
On Tue, Feb 06, 2018 at 05:12:50PM -0800, Brandon Williams wrote: > +ls-refs takes in the following parameters wrapped in packet-lines: > + > +symrefs > + In addition to the object pointed by it, show the underlying ref > + pointed by it when showing a symbolic ref. > +peel > +

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Wed, Feb 21, 2018 at 01:44:22PM -0800, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:41 -0800 > Brandon Williams wrote: > > > In order to allow for code sharing with the server-side of fetch in > > protocol-v2 convert upload-pack to be a builtin. > > > > Signed-off-by:

Re: [PATCH v3 12/35] serve: introduce git-serve

2018-02-22 Thread Jeff King
On Tue, Feb 06, 2018 at 05:12:49PM -0800, Brandon Williams wrote: > +In protocol v2 communication is command oriented. When first contacting a > +server a list of capabilities will advertised. Some of these capabilities > +will be commands which a client can request be executed. Once a command

HIII2

2018-02-22 Thread Lindsey
R Hey,i am Lindsey ,How's everything with you,I have interest on you after going through your profile I really want to have a good friendship with you.Beside i have something very vital to tell you

Re: [PATCH 1/2] parse-options: expand $HOME on filename options

2018-02-22 Thread Ævar Arnfjörð Bjarmason
On Thu, Feb 22 2018, Duy Nguyen jotted: > On Thu, Feb 15, 2018 at 5:46 AM, Ævar Arnfjörð Bjarmason > wrote: >> In general I'm mildly negative on adding this, for every user like Doron >> who'll be less confused by a hack like this, you'll have other users >> who'll be confused

Issue in switching branches with different submodules

2018-02-22 Thread Christian . Zitzmann
Hello, I've found an issue in git when working with submodules. My Project is set up using hundreds of components by submodules (and nested submodules), that are independent created in central development groups. Now it occurs that the structure of the submodules is changed over time. E.g.

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 10:07:15AM -0800, Brandon Williams wrote: > On 02/22, Jeff King wrote: > > On Wed, Feb 21, 2018 at 01:44:22PM -0800, Jonathan Tan wrote: > > > > > On Tue, 6 Feb 2018 17:12:41 -0800 > > > Brandon Williams wrote: > > > > > > > In order to allow for

Re: [PATCH v3 06/42] completion: use __gitcomp_builtin in _git_am

2018-02-22 Thread Junio C Hamano
Duy Nguyen writes: > Now that you mention it, the only command that completes > --rerere-autoupdate is git-merge. Since this is "auto" I don't think > people want to type manually. Sorry, but I do not quite get the connection between "since this is 'auto'" and the rest of the

Re: [PATCH v3 14/35] connect: request remote refs using v2

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:51 -0800 > Brandon Williams wrote: > > > +extern struct ref **get_remote_refs(int fd_out, struct packet_reader > > *reader, > > + struct ref **list, int for_push, > > +

Re: [PATCH v3 15/35] transport: convert get_refs_list to take a list of ref patterns

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:52 -0800 > Brandon Williams wrote: > > > @@ -21,7 +22,8 @@ struct transport_vtable { > > * the ref without a huge amount of effort, it should store it > > * in the ref's old_sha1 field; otherwise it should be

Re: [PATCH v3 16/35] transport: convert transport_get_remote_refs to take a list of ref patterns

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:53 -0800 > Brandon Williams wrote: > > > -const struct ref *transport_get_remote_refs(struct transport *transport) > > +const struct ref *transport_get_remote_refs(struct transport *transport, > > +

Re: [PATCH v3 08/35] connect: discover protocol version outside of get_remote_heads

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:45 -0800 > Brandon Williams wrote: > > > - get_remote_heads(fd[0], NULL, 0, , 0, NULL, ); > > + > > + packet_reader_init(, fd[0], NULL, 0, > > + PACKET_READ_CHOMP_NEWLINE | > > +

Re: [PATCH v4 06/13] commit-graph: implement git commit-graph read

2018-02-22 Thread Junio C Hamano
Junio C Hamano writes: > Derrick Stolee writes: > >> +'read':: >> + >> +Read a graph file given by the graph-head file and output basic >> +details about the graph file. >> ++ >> +With `--file=` option, consider the graph stored in the file at >> +the path

Re: [PATCH v4 08/13] commit-graph: implement --delete-expired

2018-02-22 Thread Junio C Hamano
Derrick Stolee writes: > Teach git-commit-graph to delete the .graph files that are siblings of a > newly-written graph file, except for the file referenced by 'graph-latest' > at the beginning of the process and the newly-written file. If we fail to > delete a graph file, only

Re: [PATCH] subtree: hide GPG signatures in calls to log

2018-02-22 Thread Stefan Beller
On Thu, Feb 22, 2018 at 5:37 AM, Stephen R Guglielmo wrote: > On Feb 15, 2018 10:34 PM, "Stephen R Guglielmo" > wrote: > > This fixes `add` and `pull` for GPG signed objects. > > Signed-off-by: Stephen R Guglielmo Yay! Thanks for

Re: bug in HTTP protocol spec

2018-02-22 Thread Brandon Williams
On 02/21, Dorian Taylor wrote: > > > On Feb 21, 2018, at 9:37 PM, Jonathan Nieder wrote: > > > > Thanks for writing it. > > > > Do you mind if we forge your sign-off? (See Documentation/SubmittingPatches > > item '(5) Certify your work' for details about what this means.)

Re: Bug Report: git status triggers a file change event

2018-02-22 Thread Stefan Beller
On Wed, Feb 21, 2018 at 9:22 PM, Jonathan Nieder wrote: > +git-for-windows > Hi, > > Raining Chain wrote: > >> On Windows 10, git version 2.16.2.windows.1, running the command >> >> git status >> >> will trigger a file change event to file C:\myPath\.git "Attributes >>

Re: bug in HTTP protocol spec

2018-02-22 Thread Dorian Taylor
> On Feb 22, 2018, at 2:08 AM, Jeff King wrote: > > > This indentation is funny. But I suspect it is because your whole patch > seems to have been whitespace-damaged (see the section on gmail in > "git help git-format-patch"). That is, bit-for-bit, what came out of that

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Brandon Williams
On 02/22, Jeff King wrote: > On Wed, Feb 21, 2018 at 01:44:22PM -0800, Jonathan Tan wrote: > > > On Tue, 6 Feb 2018 17:12:41 -0800 > > Brandon Williams wrote: > > > > > In order to allow for code sharing with the server-side of fetch in > > > protocol-v2 convert upload-pack

Re: What's cooking in git.git (Feb 2018, #03; Wed, 21)

2018-02-22 Thread Junio C Hamano
Brandon Williams writes: >> Is the 'fixup!' cleanly squashable to the problematic one, or does >> this series require another reroll to get it in a good enough shape? > > Yeah the fixup patch looks good to me. I don't think there was anything > else that needed attention so

Git "branch properties"-- thoughts?

2018-02-22 Thread Paul Smith
Hi all. I'm wondering if anyone has any thoughts about the best, or even any, way to have "branch properties": some extra information which is attached to a branch (that is, the actual branch name not the commit it currently points to). My requirements are that the information needs to be pushed

Re: [PATCH v3 14/35] connect: request remote refs using v2

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 10:19:22AM -0800, Brandon Williams wrote: > On 02/21, Jonathan Tan wrote: > > On Tue, 6 Feb 2018 17:12:51 -0800 > > Brandon Williams wrote: > > > > > +extern struct ref **get_remote_refs(int fd_out, struct packet_reader > > > *reader, > > > +

Re: [PATCH v3 1/2] Fix misconversion of gitsubmodule.txt

2018-02-22 Thread Stefan Beller
On Thu, Feb 22, 2018 at 12:52 AM, marmot1123 wrote: > In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions > `submodule’s`. > It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. > > Signed-off-by: Motoki Seki > ---

Re: [PATCH v4 07/13] commit-graph: implement --set-latest

2018-02-22 Thread Junio C Hamano
Derrick Stolee writes: > static struct opts_commit_graph { > const char *obj_dir; > const char *graph_file; > + int set_latest; > } opts; > ... > @@ -89,6 +106,8 @@ static int graph_write(int argc, const char **argv) > { OPTION_STRING, 'o',

Re: Bug: git log: boundary commits do not respect order (e.g. date-order, topo-order) 2

2018-02-22 Thread Derrick Stolee
On 2/21/2018 6:57 PM, Josh Tepper wrote: When using git log, boundary commits (ie, those commits added by specifying --boundary) do not respect the order (e.g., --date-order, --topo-order). Consider the following commit history, where number indicates the order of the commit timestamps:

Re: [PATCH] t: send verbose test-helper output to fd 4

2018-02-22 Thread Junio C Hamano
Jeff King writes: > This is a repost of the two patches from: > > https://public-inbox.org/git/20180209185710.ga23...@sigill.intra.peff.net/ > > (now just one patch, since sg/test-i18ngrep graduated and we can do it > all in one step). The idea got positive feedback, but nobody

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 03:19:40PM -0500, Jeff King wrote: > > To be clear, which of the following are you (most) worried about? > > > > 1. being invoked with --help and spawning a pager > > 2. receiving and acting on options between 'git' and 'upload-pack' > > 3. repository discovery > > 4.

Re: [PATCH v3 1/2] Fix misconversion of gitsubmodule.txt

2018-02-22 Thread Stefan Beller
On Thu, Feb 22, 2018 at 12:20 PM, Junio C Hamano wrote: > > Forgot to say something of your own? Perhaps wanted to (1) show a > sample of a better log message, (2) say "Acked-by", (3) re-raise the > point that the same "error" already appears in the same file and it > is

Re: [PATCH 1/1] git-p4: add unshelve command

2018-02-22 Thread Miguel Torroja
Hi Luke, I really like the idea of creating a branch based on a shelved CL (We particularly use shelves all the time), I tested your change and I have some comments. - I have some concerns about having the same "[git-p4...change = .]" as if it were a real submitted CL. One use case I

[PATCH] sequencer: factor out strbuf_read_file_or_whine()

2018-02-22 Thread René Scharfe
Reduce code duplication by factoring out a function that reads an entire file into a strbuf, or reports errors on stderr if something goes wrong. Signed-off-by: Rene Scharfe --- The difference to using strbuf_read_file() is more detailed error messages for open(2) failures. But I

Re: [PATCH v3 1/2] Fix misconversion of gitsubmodule.txt

2018-02-22 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Feb 22, 2018 at 12:20 PM, Junio C Hamano wrote: > >> >> Forgot to say something of your own? Perhaps wanted to (1) show a >> sample of a better log message, (2) say "Acked-by", (3) re-raise the >> point that the same

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 01:24:02PM -0800, Jonathan Nieder wrote: > > But my greater concern is that people who > > work on git.c should not have to worry about accidentally violating this > > principle when they add a new feature or config option. > > That sounds

Re: [PATCH v3 32/35] http: allow providing extra headers for http requests

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:13:09 -0800 > Brandon Williams wrote: > > > @@ -172,6 +172,8 @@ struct http_get_options { > > * for details. > > */ > > struct strbuf *base_url; > > + > > + struct string_list *extra_headers; > > Document

Re: [PATCH v3 05/35] upload-pack: factor out processing lines

2018-02-22 Thread Brandon Williams
On 02/22, Stefan Beller wrote: > On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > > Factor out the logic for processing shallow, deepen, deepen_since, and > > deepen_not lines into their own functions to simplify the > > 'receive_needs()' function in addition to making

Re: bug in HTTP protocol spec

2018-02-22 Thread Junio C Hamano
Jeff King writes: > This indentation is funny. But I suspect it is because your whole patch > seems to have been whitespace-damaged (see the section on gmail in > "git help git-format-patch"). I saw somewhere "Apple-Mail" and a phrase "repaste". So perhaps copy on the client is

Re: [PATCH v3 07/35] connect: convert get_remote_heads to use struct packet_reader

2018-02-22 Thread Stefan Beller
> +static enum protocol_version discover_version(struct packet_reader *reader) > +{ ... > + > + /* Maybe process capabilities here, at least for v2 */ > + switch (version) { > + case protocol_v1: > + /* Read the peeked version line */ > +

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jonathan Nieder
Jeff King wrote: > The current property is that it's safe to fetch from an > untrusted repository, even over ssh. If we're keeping that for protocol > v1, we'd want it to apply to protocol v2, as well. Ah, this is what I had been missing (the non-ssh case). I see your point. I

Re: [PATCH v3 28/35] transport-helper: introduce stateless-connect

2018-02-22 Thread Jonathan Tan
On Thu, 22 Feb 2018 10:53:53 -0800 Brandon Williams wrote: > > > @@ -612,6 +615,11 @@ static int process_connect_service(struct transport > > > *transport, > > > if (data->connect) { > > > strbuf_addf(, "connect %s\n", name); > > > ret =

Re: [PATCH v3 35/35] remote-curl: don't request v2 when pushing

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:13:12 -0800 > Brandon Williams wrote: > > > +test_expect_success 'push with http:// and a config of v2 does not request > > v2' ' > > + # Till v2 for push is designed, make sure that if a client has > > + #

Re: [PATCH v3 03/35] pkt-line: add delim packet support

2018-02-22 Thread Stefan Beller
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > One of the design goals of protocol-v2 is to improve the semantics of > flush packets. Currently in protocol-v1, flush packets are used both to > indicate a break in a list of packet lines as well as an indication that

Re: [PATCH v3 03/35] pkt-line: add delim packet support

2018-02-22 Thread Brandon Williams
On 02/22, Stefan Beller wrote: > On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > > One of the design goals of protocol-v2 is to improve the semantics of > > flush packets. Currently in protocol-v1, flush packets are used both to > > indicate a break in a list of

Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 09:00:45PM +0100, Lars Schneider wrote: > > If it was only about a diff of UTF-16 files, I may suggest a patch. > > I simply copy-paste it here for review, if someone thinks that it may > > be useful, I can send it as a real patch/RFC. > > That's a nice idea but I see two

Re: bug in HTTP protocol spec

2018-02-22 Thread Dorian Taylor
> On Feb 22, 2018, at 12:02 PM, Junio C Hamano wrote: > > I saw somewhere "Apple-Mail" and a phrase "repaste". So perhaps > copy on the client is involved in the whitespace damage (of > course the original could be broken, but I somehow doubt it).

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 11:38:14AM -0800, Jonathan Nieder wrote: > >>> And possibly respecting pager.upload-pack, which would violate our rule > >>> that it is safe to run upload-pack in untrusted repositories. > >> > >> And this isn't an issue with receive-pack because this same guarantee > >>

Re: [PATCH v3 11/35] test-pkt-line: introduce a packet-line test helper

2018-02-22 Thread Stefan Beller
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > +static void pack_line(const char *line) > +{ > + if (!strcmp(line, "") || !strcmp(line, "\n")) >From our in-office discussion: v1/v0 packs pktlines twice in http, which is not possible to construct using

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Thu, Feb 22, 2018 at 11:38:14AM -0800, Jonathan Nieder wrote: >> To be clear, which of the following are you (most) worried about? >> >> 1. being invoked with --help and spawning a pager >> 2. receiving and acting on options between 'git' and 'upload-pack' >> 3.

Re: [PATCH v3 14/35] connect: request remote refs using v2

2018-02-22 Thread Jonathan Tan
On Thu, 22 Feb 2018 13:26:58 -0500 Jeff King wrote: > On Thu, Feb 22, 2018 at 10:19:22AM -0800, Brandon Williams wrote: > > > On 02/21, Jonathan Tan wrote: > > > On Tue, 6 Feb 2018 17:12:51 -0800 > > > Brandon Williams wrote: > > > > > > > +extern struct ref

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 01:26:34PM -0800, Jonathan Nieder wrote: > Keep in mind that git upload-archive (a read-only command, just like > git upload-pack) also already has the same issues. Yuck. I don't think we've ever made a historical promise about that. But then, I don't think the promise

Re: [PATCH v3 30/35] remote-curl: create copy of the service name

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:13:07 -0800 > Brandon Williams wrote: > > > Make a copy of the service name being requested instead of relying on > > the buffer pointed to by the passed in 'const char *' to remain > > unchanged. > > > > Signed-off-by:

Re: [PATCH v3 20/35] upload-pack: introduce fetch server command

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:12:57 -0800 > Brandon Williams wrote: > > > +want > > + Indicates to the server an object which the client wants to > > + retrieve. > > Mention that the client can "want" anything even if not advertised by > the

Re: [PATCH v3 35/35] remote-curl: don't request v2 when pushing

2018-02-22 Thread Brandon Williams
On 02/22, Brandon Williams wrote: > On 02/21, Jonathan Tan wrote: > > On Tue, 6 Feb 2018 17:13:12 -0800 > > Brandon Williams wrote: > > > > > +test_expect_success 'push with http:// and a config of v2 does not > > > request v2' ' > > > + # Till v2 for push is designed, make

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jonathan Nieder
Hi, Jeff King wrote: > On Thu, Feb 22, 2018 at 10:07:15AM -0800, Brandon Williams wrote: >> On 02/22, Jeff King wrote: >>> On Wed, Feb 21, 2018 at 01:44:22PM -0800, Jonathan Tan wrote: On Tue, 6 Feb 2018 17:12:41 -0800 Brandon Williams wrote: > In order to

Re: [PATCH v3 16/35] transport: convert transport_get_remote_refs to take a list of ref patterns

2018-02-22 Thread Brandon Williams
On 02/22, Jonathan Tan wrote: > On Thu, 22 Feb 2018 10:26:47 -0800 > Brandon Williams wrote: > > > On 02/21, Jonathan Tan wrote: > > > On Tue, 6 Feb 2018 17:12:53 -0800 > > > Brandon Williams wrote: > > > > > > > -const struct ref

Re: [PATCH v3 2/2] Replace non-ASCII apostrophes to ASCII single quotes in gitsubmodules.txt

2018-02-22 Thread Junio C Hamano
marmot1123 writes: > Before this patch, there are several non-ASCII apostrophes in > gitsubmodules.txt, and misconverged at the > https://git-scm.com/docs/gitsubmodules/ . > To make codes consistent, these non-ASCII apostrophes are replaced > with ASCII single quotes.

Re: [PATCH] sequencer: factor out strbuf_read_file_or_whine()

2018-02-22 Thread Junio C Hamano
René Scharfe writes: > Reduce code duplication by factoring out a function that reads an entire > file into a strbuf, or reports errors on stderr if something goes wrong. > > Signed-off-by: Rene Scharfe > --- > The difference to using strbuf_read_file() is more

Re: [PATCH v3 28/35] transport-helper: introduce stateless-connect

2018-02-22 Thread Brandon Williams
On 02/21, Jonathan Tan wrote: > On Tue, 6 Feb 2018 17:13:05 -0800 > Brandon Williams wrote: > > > Introduce the transport-helper capability 'stateless-connect'. This > > capability indicates that the transport-helper can be requested to run > > the 'stateless-connect'

Your Consent

2018-02-22 Thread Mr.Lee
Important details to share with you, kindly email me for info: "peter.waddell...@gmail.com" Peter

Re: [PATCH v3 05/35] upload-pack: factor out processing lines

2018-02-22 Thread Stefan Beller
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > Factor out the logic for processing shallow, deepen, deepen_since, and > deepen_not lines into their own functions to simplify the > 'receive_needs()' function in addition to making it easier to reuse some > of this

Re: [PATCH v7 0/7] convert: add support for different encodings

2018-02-22 Thread Lars Schneider
> On 16 Feb 2018, at 17:58, Torsten Bögershausen wrote: > > On Fri, Feb 16, 2018 at 03:42:35PM +0100, Lars Schneider wrote: > [] >> >> Agreed. However, people using ShiftJIS are not my target audience. >> My target audience are: >> >> (1) People that have to encode their text

removed submodules shown as untracked when switching branches

2018-02-22 Thread Mike Friedrich
Hi, When switching clean branches I see untracked files appearing where I expect to see "nothing to commit, working tree clean". This happens when submodules get removed on one branch but its present in another. I expect git to either not mark the submodule in git status as untracked or git to

Re: [PATCH v3 08/35] connect: discover protocol version outside of get_remote_heads

2018-02-22 Thread Jonathan Tan
On Thu, 22 Feb 2018 10:17:39 -0800 Brandon Williams wrote: > > > diff --git a/remote.h b/remote.h > > > index 1f6611be2..2016461df 100644 > > > --- a/remote.h > > > +++ b/remote.h > > > @@ -150,10 +150,11 @@ int check_ref_type(const struct ref *ref, int > > > flags); > > >

Re: [PATCH v3 16/35] transport: convert transport_get_remote_refs to take a list of ref patterns

2018-02-22 Thread Jonathan Tan
On Thu, 22 Feb 2018 10:26:47 -0800 Brandon Williams wrote: > On 02/21, Jonathan Tan wrote: > > On Tue, 6 Feb 2018 17:12:53 -0800 > > Brandon Williams wrote: > > > > > -const struct ref *transport_get_remote_refs(struct transport *transport) > > > +const

Re: [PATCH v3 07/35] connect: convert get_remote_heads to use struct packet_reader

2018-02-22 Thread Stefan Beller
On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > @@ -56,6 +62,41 @@ static void die_initial_contact(int unexpected) > "and the repository exists.")); > } > > +static enum protocol_version discover_version(struct packet_reader *reader) > +{ > +

Re: [PATCH v5 00/17] document & test fetch pruning & add fetch.pruneTags

2018-02-22 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Thu, Feb 22 2018, Junio C. Hamano jotted: > >> Ævar Arnfjörð Bjarmason writes: >> >>> Here's a v5 (correct subject line this time!). Many thanks to Eric for >>> a thorough review. >> >> We haven't seen any comments on

Re: [PATCH v3 1/2] Fix misconversion of gitsubmodule.txt

2018-02-22 Thread Junio C Hamano
Stefan Beller writes: > On Thu, Feb 22, 2018 at 12:52 AM, marmot1123 wrote: >> In the 2nd and 4th paragraph of DESCRIPTION, there ware misconversions >> `submodule’s`. >> It seems non-ASCII apostrophes, so I rewrite ASCII apostrophes. >> >>

Re: [PATCH 1/1] git-p4: add unshelve command

2018-02-22 Thread Luke Diamand
On 22 February 2018 at 21:39, Miguel Torroja wrote: > Hi Luke, > > I really like the idea of creating a branch based on a shelved CL (We > particularly use shelves all the time), I tested your change and I > have some comments. > > - I have some concerns about having

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jonathan Nieder
Jeff King wrote: > All of that said, I think the current code is quite dangerous already, > and maybe even broken. upload-pack may run sub-commands like rev-list > or pack-objects, which are themselves builtins. Sounds like more commands to set the IGNORE_PAGER_CONFIG flag for in git.c. Thanks

RE: removed submodules shown as untracked when switching branches

2018-02-22 Thread Mike Friedrich
Thank You. This is interesting. There seems to be also a config option submodule.recurse. I did not know that these options have such an effect on the checkout command. Best Regards, Mike -Original Message- From: Stefan Beller [mailto:sbel...@google.com] Sent: Thursday, February 22,

Re: Git should preserve modification times at least on request

2018-02-22 Thread Derek Fawcus
On Wed, Feb 21, 2018 at 11:44:13PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Wed, Feb 21 2018, Peter Backes jotted: > > On Wed, Feb 21, 2018 at 10:33:05PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> This sounds like a sensible job for a git import tool, i.e. import a > >> target directory into

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 06:05:15PM -0500, Jeff King wrote: > On Thu, Feb 22, 2018 at 02:42:35PM -0800, Jonathan Nieder wrote: > > > > I couldn't quite get it to work, but I think it's because I'm doing > > > something wrong with the submodules. But I also think this attack would > > > _have_ to

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 04:44:02PM -0500, Jeff King wrote: > But I don't think it _is_ an accident waiting to happen for the rest of > the commands. upload-pack is special. The point is that people may touch > git.c thinking they are adding a nice new feature (like pager config, or > aliases, or

DEAR FRIEND.

2018-02-22 Thread Mr Daouda Ali
Dear Friend, I am Mr.Daouda Ali the head of file department of Bank of Africa(B.O.A) here in Burkina Faso / Ouagadougou. In my department we discover an abandoned sum of (US$18 million US Dollars) in an account that belongs to one of our foreign customer who died along with his family in plane

Re: removed submodules shown as untracked when switching branches

2018-02-22 Thread Stefan Beller
On Thu, Feb 22, 2018 at 12:26 PM, Mike Friedrich wrote: > git submodule add ../submodule sub > git add sub > git commit -m "submodule added" > > git checkout master The original behavior of checkout is to ignore submodules, hence it will be left alone. Can

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 02:42:35PM -0800, Jonathan Nieder wrote: > > I couldn't quite get it to work, but I think it's because I'm doing > > something wrong with the submodules. But I also think this attack would > > _have_ to be done over ssh, because on a local system the submodule > > clone

[BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

2018-02-22 Thread Marcel 'childNo͡.de' Trautwein
Hi, I think we have a problem … or at least I had and I’m not quite sure if this is „working as designed“ but I’m sure it „should not work as it did“. Because? It pruned a lot of files and even the local repository. by pull by giving another repository URL instead of a known remote While

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

2018-02-22 Thread Jonathan Nieder
Hi Marcel, Marcel 'childNo͡.de' Trautwein" wrote: > I think we have a problem … or at least I had > and I’m not quite sure if this is „working as designed“ > but I’m sure it „should not work as it did“. [...] > I wanted to clone another repository … but yeah … it’s late for me today and > I put

Re: [PATCH v3 13/35] ls-refs: introduce ls-refs server command

2018-02-22 Thread Brandon Williams
On 02/22, Jeff King wrote: > On Tue, Feb 06, 2018 at 05:12:50PM -0800, Brandon Williams wrote: > > > +ls-refs takes in the following parameters wrapped in packet-lines: > > + > > +symrefs > > + In addition to the object pointed by it, show the underlying ref > > + pointed by it when

FUSE with git

2018-02-22 Thread Duane Knesek
Disclaimer: I am not a git developer, nor have I ever written anything FUSE. So I apologize if the following is idiotic: I've been looking for a virtual file system (in Linux) that works with git to make huge working directories fast. I have found that Microsoft has written GVFS in Windows for

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

2018-02-22 Thread Marcel 'childNo͡.de' Trautwein
> Am 23.02.2018 um 00:20 schrieb Jonathan Nieder : > > Hi Marcel, > > … > Sorry, this is not the most helpful reply but: > > Can you describe a reproduction recipe so that I can experience the > same thing? > > That is: > > 1. steps to reproduce > 2. expected result > 3.

RFC: git squash

2018-02-22 Thread Julius Musseau
Hi, Git Developers, Thanks for your help regarding my earlier email (trying to break git pull --rebase). I just wanted to warn you all that my first attempt at a patch is imminent. I'm working on a "git squash" command. Here's a quick summary: -- git squash [] Squashes ..HEAD into a

F.LLI PISTOLESI Snc Company

2018-02-22 Thread .F.LLI PISTOLESI
Hello , I am looking for a reliable supplier /manufacturer of products for sell in Europe. I came across your listing and wanted to get some information regarding minimum Order Quantities, FOB pricing and also the possibility of packaging including payments terms. So could you please get

Re: RFC: git squash

2018-02-22 Thread Junio C Hamano
Julius Musseau writes: > git squash [] > > Squashes ..HEAD into a single commit. Replaces HEAD with the > result. If not specified, defaults to the current branch's > upstream (a.k.a. @{upstream}). > > Rationale: > > This command provides an intuitive mechanism for

[PATCH] strbuf_read_file(): preserve errno across close() call

2018-02-22 Thread Jeff King
On Fri, Feb 23, 2018 at 01:49:52AM -0500, Jeff King wrote: > > +static ssize_t strbuf_read_file_or_whine(struct strbuf *sb, const char > > *path) > > +{ > > + int fd; > > + ssize_t len; > > + > > + fd = open(path, O_RDONLY); > > + if (fd < 0) > > + return error_errno(_("could

Re: [BUG] [git 2.16.1] yeeek ... my files are gone .. by git pull

2018-02-22 Thread Jeff King
On Fri, Feb 23, 2018 at 06:29:55AM +0100, "Marcel 'childNo͡.de' Trautwein" wrote: > shows me a quite different behavior, so solely rebase not seems the full > problem > BUT > `--rebase=preserve` will .. o’man , really, is this intended? Yeah, the bug seems to be in --preserve-merges. Here's an

Re: [PATCH] sequencer: factor out strbuf_read_file_or_whine()

2018-02-22 Thread Jeff King
On Thu, Feb 22, 2018 at 08:29:25PM +0100, René Scharfe wrote: > Reduce code duplication by factoring out a function that reads an entire > file into a strbuf, or reports errors on stderr if something goes wrong. > > Signed-off-by: Rene Scharfe > --- > The difference to using

Re: [PATCH v5 00/17] document & test fetch pruning & add fetch.pruneTags

2018-02-22 Thread Ævar Arnfjörð Bjarmason
On Thu, Feb 22 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Here's a v5 (correct subject line this time!). Many thanks to Eric for >> a thorough review. > > We haven't seen any comments on this round. Is everybody happy? > > I do not have a strong