Re: [PATCH] am: terminate state files with a newline

2015-08-23 Thread Jeff King
On Sun, Aug 23, 2015 at 11:48:44PM -0700, Junio C Hamano wrote: > > I think the "if" here is redundant; strbuf_complete_line already handles > > it. > > True. And I like your write_state_bool() wrapper (which should be > "static void" to the builtin/am.c) very much. > > On top of that, I think

Re: [PATCH] am: terminate state files with a newline

2015-08-23 Thread Junio C Hamano
Jeff King writes: > FWIW, I had a similar thought when reading the original thread. I also > noted that all of the callers here pass "1" for the "fatal" parameter, > and that they are either bools or single strings. I wonder if: > > void write_state_bool(struct am_state *state, const char *name

Re: Minor bug with help.autocorrect.

2015-08-23 Thread Junio C Hamano
Jeff King writes: > Yeah, I agree these are the only two sane fixes. Plumbing the quiet flag > through does seem really invasive; every "git_config_get_foo" variant > would have to learn it. Probably it's too gross to have a global like: > > config_lax_mode = 1; > git_config_get_string(key.bu

Re: [PATCH v4] git-p4: fix faulty paths for case insensitive systems

2015-08-23 Thread Junio C Hamano
Lars Schneider writes: >> - Have you checked "git log" on our history and notice how nobody >> says "PROBLEM:" and "SOLUTION:" in capital letters? Don't try to >> be original in the form; your contributions are already original >> and valuable in the substance ;-) > haha ok. I will make th

Re: Minor bug with help.autocorrect.

2015-08-23 Thread Jeff King
On Mon, Aug 24, 2015 at 01:43:27AM -0400, Jeff King wrote: > > I wonder if alias_lookup() and check_pager_config(), two functions > > that *know* that the string they have, cmd, could be invalid and > > unusable key to give to the config API, should be doing an extra > > effort (e.g. call parse_ke

Re: Minor bug with help.autocorrect.

2015-08-23 Thread Jeff King
On Fri, Aug 21, 2015 at 03:13:38PM -0700, Junio C Hamano wrote: > > diff --git a/config.c b/config.c > > index 9fd275f..dd0cb52 100644 > > --- a/config.c > > +++ b/config.c > > @@ -1314,7 +1314,7 @@ static struct config_set_element > > *configset_find_element(struct config_set *cs, > > * `ke

Re: [BUG/PATCH] t9350-fast-export: Add failing test for symlink-to-directory

2015-08-23 Thread Jeff King
On Fri, Aug 21, 2015 at 12:47:30PM -0400, Anders Kaseorg wrote: > On Fri, 21 Aug 2015, Jeff King wrote: > > - we may still have the opposite problem with renames. That is, a > > rename is _also_ a deletion, but will go to the end. So I would > > expect renaming the symlink "foo" to "bar"

Re: [PATCH] am: terminate state files with a newline

2015-08-23 Thread Jeff King
On Sun, Aug 23, 2015 at 12:05:32PM -0700, Junio C Hamano wrote: > > - write_file(am_path(state, "threeway"), 1, state->threeway ? "t" : "f"); > > + write_file(am_path(state, "threeway"), 1, "%s\n", state->threeway ? "t" > > : "f"); > > Stepping back a bit, after realizing that "write_file()"

Re: Where to report security vulnerabilities in git?

2015-08-23 Thread Sitaram Chamarty
On 08/22/2015 04:25 AM, Guido Vranken wrote: > List, > > I would like to report security vulnerabilities in git. Due to the > sensitive nature of security-impacting bugs I would like to know if > there's a dedicated e-mail address for this, so that the issues at > play can be patched prior to a co

Doc, git-svn, added mention of config key: svn-remote..include-paths

2015-08-23 Thread Brett Randall
I send this small doc-patch back in June[1], but it may not have come through properly, or may have been lost, so I'm resending it. Thanks Brett [1] http://marc.info/?l=git&m=143313445425214&w=2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord

[PATCH] Doc, git-svn, added mention of config key: svn-remote..include-paths

2015-08-23 Thread Brett Randall
Signed-off-by: Brett Randall --- Documentation/git-svn.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 11d1e2f..0c0f60b 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -174,6 +174,9 @@ Skip "branches"

[PATCH v2] generate-cmdlist: re-implement as shell script

2015-08-23 Thread Eric Sunshine
527ec39 (generate-cmdlist: parse common group commands, 2015-05-21) replaced generate-cmdlist.sh with a more functional Perl version, generate-cmdlist.perl. The Perl version gleans named tags from a new "common groups" section in command-list.txt and recognizes those tags in "command list" section

Re: [PATCH v13 00/12] port tag.c to use ref-filter APIs

2015-08-23 Thread Matthieu Moy
Karthik Nayak writes: > diff --git a/Documentation/git-for-each-ref.txt > b/Documentation/git-for-each-ref.txt > index 1997657..06d468e 100644 > --- a/Documentation/git-for-each-ref.txt > +++ b/Documentation/git-for-each-ref.txt > @@ -133,7 +133,8 @@ align:: > `` is either left, right or m

Re: [PATCH v13 11/12] tag.c: implement '--format' option

2015-08-23 Thread Matthieu Moy
Karthik Nayak writes: > --- a/Documentation/git-tag.txt > +++ b/Documentation/git-tag.txt > @@ -13,7 +13,8 @@ SYNOPSIS >[ | ] > 'git tag' -d ... > 'git tag' [-n[]] -l [--contains ] [--points-at ] > - [--column[=] | --no-column] [--create-reflog] [--sort=] > [...] > + [--column[

Re: [PATCH] am: terminate state files with a newline

2015-08-23 Thread Junio C Hamano
Paul Tan writes: > Did we ever explictly allow external programs to poke around the > contents of the .git/rebase-apply directory? We tell users to take a peek into it when "am" fails, don't we, by naming $GIT_DIR/rebase-apply/patch? > - write_file(am_path(state, "threeway"), 1, state->thre

Re: List tags for a certain branch

2015-08-23 Thread Jeff King
On Sun, Aug 23, 2015 at 08:06:39PM +0200, CoDEmanX wrote: > > in a future version of git you should be able to do "git tag > --merged" to get the tags that are "merged" to a particular branch. > > Would it return every tag in the branch, even if it was created in > that branch, and not merged f

Re: Eric Sunshine mail delivery failure

2015-08-23 Thread Eric Sunshine
On Sun, Aug 23, 2015 at 2:48 PM, Eric Sunshine wrote: > On Sun, Aug 23, 2015 at 2:36 PM, Elia Pinto wrote: >> Il 23/Ago/2015 20:26, "Eric Sunshine" ha scritto: >>> I did change the CNAME to an A just in case, though who knows how long >>> it will take for the change to propagate over to web.de's

Re: Eric Sunshine mail delivery failure

2015-08-23 Thread Eric Sunshine
On Sun, Aug 23, 2015 at 2:36 PM, Elia Pinto wrote: > Il 23/Ago/2015 20:26, "Eric Sunshine" ha scritto: >> On Sun, Aug 23, 2015 at 1:16 PM, Johannes Löthberg >> wrote: >> > Just an A record would be enough. The issue is that mail.sunshineco.com >> > has >> > neither an A nor an record, it is

git-remote-helper behavior on Windows, not recognizing blank line as terminator

2015-08-23 Thread Anish Athalye
Hello, I'm having some issues with git remote helper behavior on Windows. According to the protocol (https://www.kernel.org/pub/software/scm/git/docs/gitremote-helpers.html), when doing things like listing capabilities, git expects the remote helper to send back a blank line when it's done. I'm

Re: Eric Sunshine mail delivery failure

2015-08-23 Thread Eric Sunshine
On Sun, Aug 23, 2015 at 1:16 PM, Johannes Löthberg wrote: > On 23/08, René Scharfe wrote: >> Eric, hope you see this reply on the list. Direct replies to >> sunsh...@sunshineco.com are rejected by my mail provider on submit in >> Thunderbird with the following message: >> >>Requested action no

Re: List tags for a certain branch

2015-08-23 Thread CoDEmanX
> in a future version of git you should be able to do "git tag --merged" to get the tags that are "merged" to a particular branch. Would it return every tag in the branch, even if it was created in that branch, and not merged from somewhere else? If no, than it's not what I am looking for. (O

[PATCH] rev-list: make it obvious that we do not support notes

2015-08-23 Thread Jeff King
On Sun, Aug 23, 2015 at 01:43:09PM -0400, Jeff King wrote: > I don't know how deeply anybody _cares_ about showing notes via > rev-list. It has clearly never worked. But rather than silently > accepting --show-notes (and not showing any notes!), perhaps we should > tell the user that it does not w

Re: [PATCH 1/3] t5004: test ZIP archives with many entries

2015-08-23 Thread Eric Sunshine
On Sun, Aug 23, 2015 at 5:29 AM, "René Scharfe" wrote: > Am 23.08.2015 um 07:54 schrieb Eric Sunshine: >> On Sat, Aug 22, 2015 at 3:06 PM, René Scharfe wrote: >>> +test_lazy_prereq ZIPINFO ' >>> + n=$("$ZIPINFO" "$TEST_DIRECTORY"/t5004/empty.zip | sed -n "2s/.* >>> //p") >>> + test "

Re: [PATCH] Fix `git rev-list --show-notes HEAD` when there are no notes

2015-08-23 Thread Jeff King
On Sat, Aug 22, 2015 at 05:14:39PM +0200, Johannes Schindelin wrote: > The `format_display_notes()` function clearly assumes that the data > structure holding the notes has been initialized already, i.e. that the > `display_notes_trees` variable is no longer `NULL`. > > However, when there are no

Re: Eric Sunshine mail delivery failure

2015-08-23 Thread Johannes Löthberg
On 23/08, René Scharfe wrote: Eric, hope you see this reply on the list. Direct replies to sunsh...@sunshineco.com are rejected by my mail provider on submit in Thunderbird with the following message: Requested action not taken: mailbox unavailable invalid DNS MX or A/ resource recor

Re: [PATCH v4] git-p4: fix faulty paths for case insensitive systems

2015-08-23 Thread Lars Schneider
On 21 Aug 2015, at 20:01, Junio C Hamano wrote: > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> PROBLEM: >> We run P4 servers on Linux and P4 clients on Windows. For an unknown >> reason the file path for a number of files in P4 does not match the >> directory path with res

Re: List tags for a certain branch

2015-08-23 Thread Jeff King
On Sun, Aug 23, 2015 at 05:27:46PM +0200, CoDEmanX wrote: > the question how to list tags, that point to commits contained in a certain > branch came up on StackOverflow couple times, and this appears to be the > only fast solution (example for local devel branch): > > git log --simplify-by-d

List tags for a certain branch

2015-08-23 Thread CoDEmanX
Hi everyone, the question how to list tags, that point to commits contained in a certain branch came up on StackOverflow couple times, and this appears to be the only fast solution (example for local devel branch): git log --simplify-by-decoration --decorate --pretty=%d "refs/heads/devel

Re: Submodule, subtree, or something else?

2015-08-23 Thread Jānis Rukšāns
On Pk, 2015-08-21 at 17:07 -0700, Stefan Beller wrote: > On Fri, Aug 21, 2015 at 3:47 PM, Jānis Rukšāns > wrote: > > > > A major drawback of submodules in my opinion is the > > inability to make a full clone from an existing one without having > > access to the central repository, which is somet

[PATCH 1/2] dir.c: make last_exclude_matching_from_list() run til the end

2015-08-23 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dir.c b/dir.c index c00c7e2..3a7630a 100644 --- a/dir.c +++ b/dir.c @@ -901,6 +901,7 @@ static struct exclude *last_exclude_matching_from_list(const char *pathname,

[PATCH 2/2] dir.c: don't exclude whole dir prematurely if neg pattern may match

2015-08-23 Thread Nguyễn Thái Ngọc Duy
If there is a pattern "!foo/bar", this patch makes it not exclude "foo" right away. This gives us a chance to examine "foo" and re-include "foo/bar". In order for it to detect that the directory under examination should not be excluded right away, in other words it is a parent directory of a negat

[PATCH 0/2] gitignore, re-inclusion fix

2015-08-23 Thread Nguyễn Thái Ngọc Duy
This is an old problem. I attempted once [1] and then was reminded [2] with some more comments on the original patch. Let's try again. The problem is this .gitignore currently does not work, but it should: /abc !/abc/def/ghi This patch fixes that by realizing that the last rule may re-include so

Re: [PATCH] am: terminate state files with a newline

2015-08-23 Thread SZEDER Gábor
Hi, Quoting Paul Tan : Did we ever explictly allow external programs to poke around the contents of the .git/rebase-apply directory? I think it may not be so good, as it means that it may not be possible to switch the storage format in the future (e.g. to allow atomic modifications, maybe?) :-/

Eric Sunshine mail delivery failure

2015-08-23 Thread René Scharfe
Eric, hope you see this reply on the list. Direct replies to sunsh...@sunshineco.com are rejected by my mail provider on submit in Thunderbird with the following message: Requested action not taken: mailbox unavailable invalid DNS MX or A/ resource record. And with this one when us

Re: [PATCH 1/3] t5004: test ZIP archives with many entries

2015-08-23 Thread René Scharfe
Am 23.08.2015 um 07:54 schrieb Eric Sunshine: > On Sat, Aug 22, 2015 at 3:06 PM, René Scharfe wrote: >> diff --git a/t/t5004-archive-corner-cases.sh >> b/t/t5004-archive-corner-cases.sh >> index 654adda..c6bd729 100755 >> --- a/t/t5004-archive-corner-cases.sh >> +++ b/t/t5004-archive-corner-cases