Re: [PATCH] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Kevin Daudt
Thanks for the review On Fri, Sep 16, 2016 at 03:22:06PM -0700, Jeff King wrote: > On Fri, Sep 16, 2016 at 11:02:04PM +0200, Kevin Daudt wrote: > > > mailinfo.c | 54 > > ++ > > t/t5100-mailinfo.sh| 6 ++ > >

RE: [PATCH v3] checkout: eliminate unnecessary merge for trivial checkout

2016-09-19 Thread Ben Peart
Let me see if I can better explain what I’m trying to accomplish with this patch.     "git checkout -b foo" (without -f -m or ) is defined in the manual as being a shortcut for/equivalent to:       (1a) "git branch foo"     (1b) "git checkout foo"   However, it has been our experience in

[PATCH 6/6] i18n: stash: mark messages for translation

2016-09-19 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- git-stash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index 826af18..90d63f2 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -100,7 +100,7 @@ create_stash () {

[PATCH 5/6] i18n: notes-merge: mark die messages for translation

2016-09-19 Thread Vasco Almeida
Update test to reflect changes. Signed-off-by: Vasco Almeida --- notes-merge.c | 8 t/t3310-notes-merge-manual-resolve.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/notes-merge.c b/notes-merge.c index

Re: [PATCH 09/11] path: add resumable marker

2016-09-19 Thread Duy Nguyen
On Fri, Sep 16, 2016 at 7:12 AM, Kevin Wern wrote: > Create function to get gitdir file RESUMABLE. A very good opportunity to explain what this file is or will be (and whether its content matters or just its existence). Either as commit message, or even better in

Re: Two bugs in --pretty with %C(auto)

2016-09-19 Thread Duy Nguyen
On Sun, Sep 18, 2016 at 1:25 AM, René Scharfe wrote: > Am 17.09.2016 um 14:51 schrieb Anatoly Borodin: >> Hi All! >> >> First bug: >> >> git log -3 --pretty='%C(cyan)%C(auto)%h%C(auto)%d %s' >> >> prints %h with the default color (normal yellow), but >> >> git log -3

[PATCH 1/6] i18n: commit: mark message for translation

2016-09-19 Thread Vasco Almeida
Mark message commit_utf8_warn for translation. Update tests to reflect changes. Signed-off-by: Vasco Almeida --- commit.c | 8 t/t3900-i18n-commit.sh | 8 t/t3901-i18n-patch.sh | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-)

[PATCH 4/6] i18n: ident: mark hint for translation

2016-09-19 Thread Vasco Almeida
Mark env_hint for translation. Signed-off-by: Vasco Almeida --- ident.c | 32 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ident.c b/ident.c index e20a772..92c3cca 100644 --- a/ident.c +++ b/ident.c @@ -331,17 +331,17 @@

[PATCH 3/6] i18n: diff: mark die errors for translation

2016-09-19 Thread Vasco Almeida
Signed-off-by: Vasco Almeida --- diff.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/diff.c b/diff.c index b4310f8..d82ad79 100644 --- a/diff.c +++ b/diff.c @@ -3325,7 +3325,7 @@ void diff_setup_done(struct diff_options *options)

[PATCH 2/6] i18n: connect: mark die messages for translation

2016-09-19 Thread Vasco Almeida
Mark messages passed to die() in die_initial_contact(). Update test to reflect changes. Signed-off-by: Vasco Almeida --- connect.c| 8 t/t5512-ls-remote.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/connect.c b/connect.c

Re: [PATCH v3 0/8] Better heuristics make prettier diffs

2016-09-19 Thread Michael Haggerty
On 09/08/2016 01:25 AM, Junio C Hamano wrote: > Michael Haggerty writes: > >> * Add test t4059 as part of this commit, not as part of its >> successor. > > Which needs to be moved to somewhere else, as another topics that > has already been in 'next' uses t4059. > >

Switching branches not working in a cloned repo

2016-09-19 Thread Paul Williamson
Hi, We use git extensively on a number of repos. Recently, we have had a problem with one of them. This repo has a 'web_dev' branch. For copies of the repo cloned before a certain (recent but unidentified) time, we could 'git checkout' between master and web_dev and everything would be normal.

Re: Bug: pager. doesn't work well with editors

2016-09-19 Thread Junio C Hamano
Anatoly Borodin writes: >> I think, the pagination should be turned off when the editor is being >> called. This is a fun one. IIRC, we decide to spawn a pager and run our output via pipe thru it fairly early, even before we figure out which subcommand is being run

Re: Why are there multiple ways to get the manual in Git?

2016-09-19 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: The `git revisions --help` does work ;-) Not anymore ;-) I think Ralf Thielow fixed it recently. hmm, I sort of though it would still work with a valid guide. I'd only checked with my last GfW

clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Philip Oakley
A question came up on the Git user list regarding cherry-pick that got me reading the manual (again), in this case regarding --no-walk ranges. Essentially my question is: If --no-walk is given to rev-list (e.g. via charry-pick), and the user includes a caret prefixed rev, when does that range

Re: git add --intent-to-add silently creates empty commits

2016-09-19 Thread Duy Nguyen
On Fri, Sep 16, 2016 at 12:48 AM, Junio C Hamano wrote: > Aviv Eyal writes: > >> Using `git add -N` allows creating of empty commits: >> >> git init test && cd test >> echo text > file >> git add --intent-to-add file >> git commit -m 'Empty commit' >> echo $?

Re: [PATCH 02/11] Resumable clone: add prime-clone endpoints

2016-09-19 Thread Duy Nguyen
On Fri, Sep 16, 2016 at 7:12 AM, Kevin Wern wrote: > static struct daemon_service daemon_service[] = { > { "upload-archive", "uploadarch", upload_archive, 0, 1 }, > { "upload-pack", "uploadpack", upload_pack, 1, 1 }, > { "receive-pack",

Re: [PATCH v3] checkout: eliminate unnecessary merge for trivial checkout

2016-09-19 Thread Junio C Hamano
"Ben Peart" writes: > Let me see if I can better explain what I’m trying to accomplish with this > patch. > > "git checkout -b foo" (without -f -m or ) is defined in the > manual as being a shortcut for/equivalent to: > > (1a) "git branch foo" > (1b)

Re: Why are there multiple ways to get the manual in Git?

2016-09-19 Thread Junio C Hamano
"Philip Oakley" writes: > The `git revisions --help` does work ;-) Not anymore ;-) I think Ralf Thielow fixed it recently.

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Junio C Hamano
"Philip Oakley" writes: > At the moment the cherry-pick man page's example implies that > --do-walk is applied from the beginning, rather from the point given > on the command line. > > I had a very quick search of the *.c code for the options but didn't > get any further.

Re: [PATCH v3 0/8] Better heuristics make prettier diffs

2016-09-19 Thread Junio C Hamano
Michael Haggerty writes: > On 09/08/2016 01:25 AM, Junio C Hamano wrote: >> Michael Haggerty writes: >> >>> * Add test t4059 as part of this commit, not as part of its >>> successor. >> >> Which needs to be moved to somewhere else, as another

Re: Switching branches not working in a cloned repo

2016-09-19 Thread Philip Oakley
From: "Paul Williamson" Hi, We use git extensively on a number of repos. Recently, we have had a problem with one of them. This repo has a 'web_dev' branch. For copies of the repo cloned before a certain (recent but unidentified) time, we could 'git checkout'

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Junio C Hamano
Michael J Gruber writes: >> It can be read that >> >> $ git cherry-pick maint next >> >> would pick two single commits, while >> >> $ git cherry-pick maint next ^master >> >> could implicitly be read as >> >> $ git cherry-pick maint next --do-walk ^master You can

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 04:40:22PM -0700, Josh Triplett wrote: > > - there are a non-trivial number of patches for other projects (JGIT, > > EGIT, StGit, etc). This is somewhat unique to git, where we discuss > > a lot of related projects on the list. But I wonder if other > >

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 04:55:50PM -0700, Josh Triplett wrote: > On Mon, Sep 19, 2016 at 04:46:06PM -0700, Jacob Keller wrote: > > On Mon, Sep 19, 2016 at 4:40 PM, Josh Triplett > > wrote: > > > On Mon, Sep 19, 2016 at 04:34:35PM -0700, Jeff King wrote: > > >> As far as

Re: Bug: pager. doesn't work well with editors

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 09:03:05AM -0700, Junio C Hamano wrote: > Anatoly Borodin writes: > > >> I think, the pagination should be turned off when the editor is being > >> called. > > This is a fun one. IIRC, we decide to spawn a pager and run our > output via pipe

[PATCH v3] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Josh Triplett
This provides a shorter and more convenient alias for --subject-prefix='RFC PATCH'. Includes documentation in the format-patch manpage, and a new test covering --rfc. Signed-off-by: Josh Triplett --- v3: - Fix an error message referring to --subject-prefix - Expand the

Re: [PATCH v3] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 09:23:25PM -0700, Josh Triplett wrote: > This provides a shorter and more convenient alias for > --subject-prefix='RFC PATCH'. > > Includes documentation in the format-patch manpage, and a new test > covering --rfc. > > Signed-off-by: Josh Triplett

Re: [PATCH] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 12:51:33PM +0200, Kevin Daudt wrote: > > I didn't look in the RFC. Is: > > > > From: my \"name\" > > > > really the same as: > > > > From: "my \\\"name\\\"" > > > > ? That seems weird, but I think it may be that the former is

Re: [PATCH v2 2/2] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 08:54:40PM +0200, Kevin Daudt wrote: > diff --git a/t/t5100/comment.expect b/t/t5100/comment.expect > new file mode 100644 > index 000..1197e76 > --- /dev/null > +++ b/t/t5100/comment.expect > @@ -0,0 +1,5 @@ > +Author: A U Thor (this is a comment (really)) Hmm. I

Re: [PATCH v2 1/2] t5100-mailinfo: replace common path prefix with variable

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 02:16:23PM -0700, Junio C Hamano wrote: > Kevin Daudt writes: > > > Many tests need to store data in a file, and repeat the same pattern to > > refer to that path: > > > > "$TEST_DATA"/t5100/ > > That obviously is a typo of > >

[Bug] Custom git-dir directory shouldn't be listed as “untracked”

2016-09-19 Thread Nicolas Cuillery
Hi, I want to create a local repository with a custom dir name instead of ".git", I used the env vars GIT_DIR and WORK_TREE: >export GIT_DIR=".customgitdir" >export GIT_WORK_TREE="." Then I created a repo in an empty directory: >$ git init >Initialized empty Git repository in

Re: [PATCH 11/11] Resumable clone: implement primer logic in git-clone

2016-09-19 Thread Duy Nguyen
On Fri, Sep 16, 2016 at 7:12 AM, Kevin Wern wrote: > builtin/clone.c | 590 > +--- Argh.. this is too big for my brain at this hour. It might be easier to follow if you separate out some code move (I think I've seen

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Michael J Gruber
Philip Oakley venit, vidit, dixit 19.09.2016 12:56: > A question came up on the Git user list regarding cherry-pick that got me > reading the manual (again), in this case regarding --no-walk ranges. > > Essentially my question is: If --no-walk is given to rev-list (e.g. via > charry-pick), and

Re: [PATCH 04/11] Resumable clone: add prime-clone to remote-curl

2016-09-19 Thread Duy Nguyen
On Fri, Sep 16, 2016 at 7:12 AM, Kevin Wern wrote: > +static void prime_clone(void) > +{ > + char *result, *result_full, *line; > + size_t result_len; > + int err = 0, one_successful = 0; > + > + if (request_service("git-prime-clone", _full, , > +

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Philip Oakley
From: "Michael J Gruber" Philip Oakley venit, vidit, dixit 19.09.2016 12:56: A question came up on the Git user list regarding cherry-pick that got me reading the manual (again), in this case regarding --no-walk ranges. Essentially my question is: If --no-walk is

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Brandon Williams
On Mon, Sep 19, 2016 at 10:00 AM, Junio C Hamano wrote: > > I think you were clear enough. > > Don't read everything other people say in their reviews as pointing > out issues. Often trying to rephrase what they read in the code in > their own words is a good way to make sure

Re: [PATCH v3 0/8] Better heuristics make prettier diffs

2016-09-19 Thread Junio C Hamano
Junio C Hamano writes: > Michael Haggerty writes: > >> On 09/08/2016 01:25 AM, Junio C Hamano wrote: >>> I'd move it temporarily to t4061 with a separate SQUASH??? at the >>> tip for now, as I am running out of time today. >> >> I didn't realize you were

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Brandon Williams
On Mon, Sep 19, 2016 at 11:04 AM, Junio C Hamano wrote: > Brandon Williams writes: > >>> Again, what do we have in "name" and "item" at this point? If we >>> have a submodule at "sub/" and we are checking a pathspec element >>> "sub/dir1/*", what is the

Re: [PATCH v3] checkout: eliminate unnecessary merge for trivial checkout

2016-09-19 Thread Junio C Hamano
Junio C Hamano writes: >> "git checkout -b foo" (without -f -m or ) is defined in the >> manual as being a shortcut for/equivalent to: >> >> (1a) "git branch foo" >> (1b) "git checkout foo" >> >> However, it has been our experience in our observed use cases

Re: [PATCH 1/6] i18n: commit: mark message for translation

2016-09-19 Thread Junio C Hamano
I am responding to 1/6, as the series lacked a cover letter, but all of them looked good. Thanks.

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: > static void show_ce_entry(const char *tag, const struct cache_entry *ce) > { > + struct strbuf name = STRBUF_INIT; > int len = max_prefix_len; > + if (submodule_prefix) > + strbuf_addstr(, submodule_prefix); > +

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Junio C Hamano
Andrew Donnellan writes: > Sounds good to me. Agreed that "RFC" is essentially the only prefix > other than "PATCH" that I see, at least in the kernel. Around here I think we saw WIP too, and that makes me lean towards Peff's earlier suggestion to allow an end-user

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: >> Again, what do we have in "name" and "item" at this point? If we >> have a submodule at "sub/" and we are checking a pathspec element >> "sub/dir1/*", what is the non-wildcard part of the pathspec and what >> is the "string"? Aren't they

Re: [PATCH 11/11] Resumable clone: implement primer logic in git-clone

2016-09-19 Thread Junio C Hamano
Duy Nguyen writes: > On Fri, Sep 16, 2016 at 7:12 AM, Kevin Wern wrote: >> builtin/clone.c | 590 >> +--- > > Argh.. this is too big for my brain at this hour. It might be easier > to follow if you

RE: Switching branches not working in a cloned repo

2016-09-19 Thread Paul Williamson
-Original Message- From: Philip Oakley [mailto:philipoak...@iee.org] >Have you tried `git ls-remote` ? >The `branch -r` just lists the local 'rtb's (IIUC). Nice, I didn't know about that command - I tried it though and it does list the remote branches correctly. I checked the commit

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: >> OK, so as discussed previously with Heiko and Stefan, the idea is to >> >> - pass the original pathspec as-is, >> >> - when --submodule-prefix is given, a path discovered in a >>submodule repository is first prefixed with that string before >>

Re: [Bug] Custom git-dir directory shouldn't be listed as “untracked”

2016-09-19 Thread Junio C Hamano
Nicolas Cuillery writes: > When using the default directory ".git", it logically doesn't appear > in the "git status" command's output. Don't you think it should be the > same when using a custom dir name ? Not really. GIT_DIR= mechanism was never meant to be used

[PATCH v2] ls-files: add pathspec matching for submodules

2016-09-19 Thread Brandon Williams
Pathspecs can be a bit tricky when trying to apply them to submodules. The main challenge is that the pathspecs will be with respect to the super module and not with respect to paths in the submodule. The approach this patch takes is to pass in the identical pathspec from the super module to the

[PATCH v2 2/2] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Kevin Daudt
rfc2822 has provisions for quoted strings in structured header fields, but also allows for escaping these with so-called quoted-pairs. The only thing git currently does is removing exterior quotes, but quotes within are left alone. Remove exterior quotes and remove escape characters so that they

[PATCH v2 0/2] Handle escape characters in From field.

2016-09-19 Thread Kevin Daudt
Changes since v2: - detach from input parameter to reuse it as an output buffer - don't return error when encountering another open bracket in a comment - test escaping in comments Kevin Daudt (2): t5100-mailinfo: replace common path prefix with variable mailinfo: unescape quoted-pair in

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Junio C Hamano
"Philip Oakley" writes: >> Philip probably has a >> confused notion that "rev-list A..B C..D" is somehow a union of set >> A..B and C..D? > > That wasn't the issue. Though it does beg the question that it's the > same as "rev-list D B ^A ^C" isn't it? If you think it

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

2016-09-19 Thread Heiko Voigt
On Fri, Sep 16, 2016 at 10:59:37AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > +static void check_has_hash(const unsigned char sha1[20], void *data) > > +{ > > + int *has_hash = (int *) data; > > + > > + if (!lookup_commit_reference(sha1)) > > +

Re: [PATCH 2/2] serialize collection of refs that contain submodule changes

2016-09-19 Thread Junio C Hamano
Heiko Voigt writes: > I am not sure if I understand you correctly here. With the "ref cache layer" > you are referring to add_submodule_odb() which is called indirectly from > submodule_needs_pushing()? Those revs are only used to check whether the hash > we need on the remote

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: > side question if the answer is short: Any reason as to why all of the > pathspec matching code lives inside of dir.c and not pathspec.c? Hysterical Raisins. A pathspec used to be just a "const char **" in simpler times, which was no more elaborate

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

2016-09-19 Thread Heiko Voigt
On Fri, Sep 16, 2016 at 11:13:09AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > The most exact solution would be to use all actual remote refs available > > (not sure if we have them at this point in the process?) another > > solution would be to still append the

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: > Yes in that case it wouldn't have passed ps_strncmp()...but we should have > never > made it there in the first place due to a piece of logic in > match_pathspec_item: Ah, OK. Thanks for clarifying.

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Brandon Williams
I thought as much. Thanks for the quick explanation :) On Mon, Sep 19, 2016 at 11:34 AM, Junio C Hamano wrote: > Brandon Williams writes: > >> side question if the answer is short: Any reason as to why all of the >> pathspec matching code lives inside of

[PATCH v2 1/2] t5100-mailinfo: replace common path prefix with variable

2016-09-19 Thread Kevin Daudt
Many tests need to store data in a file, and repeat the same pattern to refer to that path: "$TEST_DATA"/t5100/ Create a variable that contains this path, and use that instead. Signed-off-by: Kevin Daudt --- t/t5100-mailinfo.sh | 56

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

2016-09-19 Thread Heiko Voigt
On Fri, Sep 16, 2016 at 10:27:04AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > +static struct sha1_array *get_sha1s_from_list(struct string_list > > *submodules, > > + const char *path) > > +{ > > + struct string_list_item *item; > > + struct

Re: Switching branches not working in a cloned repo

2016-09-19 Thread Jacob Keller
On Mon, Sep 19, 2016 at 6:58 AM, Paul Williamson wrote: > Hi, > > We use git extensively on a number of repos. Recently, we have had a problem > with one of them. This repo has a 'web_dev' branch. For copies of the repo > cloned before a certain (recent but

Re: [PATCH 2/2] serialize collection of refs that contain submodule changes

2016-09-19 Thread Heiko Voigt
Hi, On Fri, Sep 16, 2016 at 10:47:46AM -0700, Junio C Hamano wrote: > One thing that makes me worried is how the ref cache layer interacts > with this. I see you first call push_unpushed_submodules() when > ON_DEMAND is set, which would result in pushes in submodule > repositories, updating

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: Philip probably has a confused notion Hi Junio, Could you clarify a particular point from here.. The "--no-walk" tells the rev-list machinery "I have only positives; do not traverse from them AT

Re: [PATCH v2 0/4] handle multiline in-body headers

2016-09-19 Thread Junio C Hamano
Jonathan Tan writes: > This is an iteration of the patch set after the discussion in > . > > Changes: > o largely rewritten to follow Junio's suggested design (refactor of > check_header to separate out ">From" and

Re: [PATCH v2 2/2] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Junio C Hamano
Junio C Hamano writes: > Kevin Daudt writes: > >> +static void unquote_quoted_string(struct strbuf *line) >> +{ >> +const char *in = strbuf_detach(line, NULL); >> +int c, take_next_literally = 0; >> +int found_error = 0; > ... >> +} >> +} > >

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Josh Triplett
On Mon, Sep 19, 2016 at 10:49:17AM -0700, Junio C Hamano wrote: > Andrew Donnellan writes: > > > Sounds good to me. Agreed that "RFC" is essentially the only prefix > > other than "PATCH" that I see, at least in the kernel. > > Around here I think we saw WIP too,

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Philip Oakley
From: "Junio C Hamano" "Philip Oakley" writes: Philip probably has a confused notion that "rev-list A..B C..D" is somehow a union of set A..B and C..D? That wasn't the issue. Though it does beg the question that it's the same as "rev-list D B ^A

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Andrew Donnellan
On 17/09/16 17:21, Josh Triplett wrote: This provides a shorter and more convenient alias for --subject-prefix='RFC PATCH'. Includes documentation in the format-patch manpage, and a new test covering --rfc. Signed-off-by: Josh Triplett Sounds good to me. Agreed that

What's cooking in git.git (Sep 2016, #05; Mon, 19)

2016-09-19 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 v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jeff King
On Mon, Sep 19, 2016 at 01:44:08PM -0700, Josh Triplett wrote: > On Mon, Sep 19, 2016 at 10:49:17AM -0700, Junio C Hamano wrote: > > Andrew Donnellan writes: > > > > > Sounds good to me. Agreed that "RFC" is essentially the only prefix > > > other than "PATCH" that

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Josh Triplett
On Mon, Sep 19, 2016 at 04:34:35PM -0700, Jeff King wrote: > On Mon, Sep 19, 2016 at 01:44:08PM -0700, Josh Triplett wrote: > > > On Mon, Sep 19, 2016 at 10:49:17AM -0700, Junio C Hamano wrote: > > > Andrew Donnellan writes: > > > > > > > Sounds good to me. Agreed

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jacob Keller
On Mon, Sep 19, 2016 at 4:34 PM, Jeff King wrote: > - there are a non-trivial number of patches for other projects (JGIT, > EGIT, StGit, etc). This is somewhat unique to git, where we discuss > a lot of related projects on the list. But I wonder if other > projects

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jacob Keller
On Mon, Sep 19, 2016 at 4:40 PM, Josh Triplett wrote: > On Mon, Sep 19, 2016 at 04:34:35PM -0700, Jeff King wrote: >> As far as your patch goes, I'd be OK with defining: >> >> --rfc:: >> Pretend as if `--subject-prefix='RFC PATCH'` was given. >> Would: Shorthand

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Josh Triplett
On Mon, Sep 19, 2016 at 04:46:06PM -0700, Jacob Keller wrote: > On Mon, Sep 19, 2016 at 4:40 PM, Josh Triplett wrote: > > On Mon, Sep 19, 2016 at 04:34:35PM -0700, Jeff King wrote: > >> As far as your patch goes, I'd be OK with defining: > >> > >> --rfc:: > >>

Re: [PATCH v2] format-patch: Add --rfc for the common case of [RFC PATCH]

2016-09-19 Thread Jacob Keller
On Mon, Sep 19, 2016 at 4:55 PM, Josh Triplett wrote: > On Mon, Sep 19, 2016 at 04:46:06PM -0700, Jacob Keller wrote: >> On Mon, Sep 19, 2016 at 4:40 PM, Josh Triplett wrote: >> > On Mon, Sep 19, 2016 at 04:34:35PM -0700, Jeff King wrote: >> >> As

Re: [PATCH] ls-files: add pathspec matching for submodules

2016-09-19 Thread Brandon Williams
side question if the answer is short: Any reason as to why all of the pathspec matching code lives inside of dir.c and not pathspec.c? On Mon, Sep 19, 2016 at 11:22 AM, Junio C Hamano wrote: > Brandon Williams writes: > >> Yes in that case it wouldn't have

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Philip Oakley
From: "Junio C Hamano" Michael J Gruber writes: It can be read that $ git cherry-pick maint next would pick two single commits, while $ git cherry-pick maint next ^master could implicitly be read as $ git cherry-pick maint next --do-walk

Re: [PATCH v2] ls-files: add pathspec matching for submodules

2016-09-19 Thread Junio C Hamano
Brandon Williams writes: > diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt > index a623ebf..09e4449 100644 > --- a/Documentation/git-ls-files.txt > +++ b/Documentation/git-ls-files.txt > @@ -19,7 +19,7 @@ SYNOPSIS > -

Re: [PATCH 1/6] i18n: commit: mark message for translation

2016-09-19 Thread Jean-Noël AVILA
On lundi 19 septembre 2016 10:54:37 CEST Junio C Hamano wrote: > I am responding to 1/6, as the series lacked a cover letter, but all > of them looked good. > > Thanks. Maybe 3/6 would have benefited from some code factorization. But that's ok for a few more sentences. Thanks.

Re: .git directory tree as tar-file

2016-09-19 Thread Jacob Keller
On Mon, Sep 19, 2016 at 1:31 PM, Martin Bammer wrote: > Hi, > > it would be nice to have an option to have a .git.tar instead of the .git > directory tree. This tree quickly gets very big and copy and compare actions > take very long. I've observed that even in small projects

RE: Switching branches not working in a cloned repo

2016-09-19 Thread Paul Williamson
-Original Message- From: Jacob Keller [mailto:jacob.kel...@gmail.com] >Try a fresh clone with "git checkout --track origin/web_dev" and then a "git >status -v" and let us know what happens. I suspect that older clones have the >correct branches already setup for tracking, but the new

.git directory tree as tar-file

2016-09-19 Thread Martin Bammer
Hi, it would be nice to have an option to have a .git.tar instead of the .git directory tree. This tree quickly gets very big and copy and compare actions take very long. I've observed that even in small projects with only a few files the .git tree can contain several thousand entries. Especially

Re: clarification of `rev-list --no-walk ^`?

2016-09-19 Thread Junio C Hamano
"Philip Oakley" writes: >> The "--no-walk" tells the rev-list machinery "I have only positives; >> do not traverse from them AT ALL but just use these positives". >> Only under that condition, the order of the positive ends you list >> on the command line matters. > > What

Re: [PATCH 1/6] i18n: commit: mark message for translation

2016-09-19 Thread Junio C Hamano
Jean-Noël AVILA writes: > Maybe 3/6 would have benefited from some code factorization. But that's ok > for > a few more sentences. Ah, let me see I understood what you mean. Adding something like this static NORETURN void die_want_option(const char *option_name)

[PATCH v2 3/4] mailinfo: make is_scissors_line take plain char *

2016-09-19 Thread Jonathan Tan
The is_scissors_line takes a struct strbuf * when a char * would suffice. Make it take char *. Signed-off-by: Jonathan Tan --- mailinfo.c | 35 ++- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/mailinfo.c b/mailinfo.c

[PATCH v2 0/4] handle multiline in-body headers

2016-09-19 Thread Jonathan Tan
This is an iteration of the patch set after the discussion in . Changes: o largely rewritten to follow Junio's suggested design (refactor of check_header to separate out ">From" and "[PATCH]", and an is_inbody_header function performing an

[PATCH v2 4/4] mailinfo: handle in-body header continuations

2016-09-19 Thread Jonathan Tan
Mailinfo currently handles multi-line headers, but it does not handle multi-line in-body headers. Teach it to handle such headers, for example, for this input: From: author Date: Fri, 9 Jun 2006 00:44:16 -0700 Subject: a very long broken line Subject: another very

[PATCH v2 1/4] mailinfo: separate in-body header processing

2016-09-19 Thread Jonathan Tan
The check_header function contains logic specific to in-body headers, although it is invoked during both the processing of actual headers and in-body headers. Separate out the in-body header part into its own function. Signed-off-by: Jonathan Tan --- mailinfo.c | 33

[PATCH v2 2/4] mailinfo: refactor to support utf8 decode attempts

2016-09-19 Thread Jonathan Tan
mailinfo.c currently has a convert_to_utf8 function that overrides its argument and prints an error message when the decoding fails. Refactor it, creating another function that does not override anything and does not print an error message when the decoding fails. This is to be used by a

Re: [PATCH v2 1/2] t5100-mailinfo: replace common path prefix with variable

2016-09-19 Thread Junio C Hamano
Kevin Daudt writes: > Many tests need to store data in a file, and repeat the same pattern to > refer to that path: > > "$TEST_DATA"/t5100/ That obviously is a typo of "$TEST_DIRECTORY/t5100" It is a good change, even though I would have chosen a name that is a bit

Re: [PATCH v2 2/2] mailinfo: unescape quoted-pair in header fields

2016-09-19 Thread Junio C Hamano
Kevin Daudt writes: > +static void unquote_quoted_string(struct strbuf *line) > +{ > + const char *in = strbuf_detach(line, NULL); > + int c, take_next_literally = 0; > + int found_error = 0; > + > + /* > + * Stores the character that started the escape mode

How can I make a best dissertation paper?

2016-09-19 Thread elizabethgillespe
Dissertation writing is not a difficult task. You can make a best dissertation paper by practicing with the dissertation writing task. The format of the dissertation writing is same as the essay writing with the headers dissertation introduction, body and conclusion. You can get best sample papers

Re: .git directory tree as tar-file

2016-09-19 Thread Anatoly Borodin
Hi Martin, if multiple small loose files are the problem, this could be interesting for you: https://git-scm.com/docs/git-gc This command is run automatically from time to time, and you can configure it or run manually. PS To see how bad the situation is, you can use