Re: [PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-15 Thread Jonathan Nieder
Michael Haggerty wrote: Add a notice to the top of post-receive-email explaining that the script is no longer under active development and pointing the user to git-multimail. I think the spirit of this patch is sane. Some thoughts on wording: [...] --- a/contrib/hooks/post-receive-email

Re: [PATCH] .mailmap: Combine more (email, name) to individual persons

2013-07-15 Thread Jonathan Nieder
Stefan Beller wrote: Signed-off-by: Stefan Beller stefanbel...@googlemail.com Markup and methodology look correct. Fwiw, Reviewed-by: Jonathan Nieder jrnie...@gmail.com Is this meant to be squashed with 94b410bb (.mailmap: Map email addresses to names, 2013-07-12)? Ciao, Jonathan -- To

Re: [PATCH] git-clone.txt: remove the restriction on pushing from a shallow clone

2013-07-15 Thread Duy Nguyen
On Mon, Jul 15, 2013 at 8:01 AM, Duy Nguyen pclo...@gmail.com wrote: Also, the sender may have cloned from the receiver (fully) and then fetched a different history shallowly from elsewhere. The receiver may have no commit on that history, including the shallow-bottom. Hmm.. right. And the

[PATCH v2 1/9] t4203: demonstrate loss of single-character name in mailmap entry

2013-07-15 Thread Eric Sunshine
A bug in mailmap.c:parse_name_and_email() causes it to overlook the single-character name in A user@host and parse it only as user@host. Demonstrate this problem. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- t/t4203-mailmap.sh | 9 + 1 file changed, 9 insertions(+) diff

[PATCH v2 7/9] mailmap: debug: eliminate -Wformat field precision type warning

2013-07-15 Thread Eric Sunshine
The compiler complains that '*' in fprintf() format directive %.*s should have type int, but we pass size_t. Fix this. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- mailmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mailmap.c b/mailmap.c index

[PATCH v2 9/9] mailmap: style fixes

2013-07-15 Thread Eric Sunshine
From: Junio C Hamano gits...@pobox.com Wrap overlong lines and format the multi-line comments to match our coding style. Signed-off-by: Junio C Hamano gits...@pobox.com Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- mailmap.c | 42 +++--- 1 file

[PATCH v2 6/9] mailmap: debug: fix malformed fprintf() format directive

2013-07-15 Thread Eric Sunshine
Resolve segmentation fault due to size_t variable being consumed by '%s'. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailmap.c b/mailmap.c index 0516354..62d998a 100644 --- a/mailmap.c +++ b/mailmap.c @@

[PATCH v2 2/9] mailmap: do not lose single-letter names

2013-07-15 Thread Eric Sunshine
From: Junio C Hamano gits...@pobox.com In parse_name_and_email() function, there is this line: *name = (nstart nend ? nstart : NULL); When the function is given a buffer A a...@example.org old@x.z, nstart scans from the beginning of the buffer, skipping whitespaces (there isn't any, so

[PATCH v2 4/9] mailmap: do not downcase mailmap entries

2013-07-15 Thread Eric Sunshine
From: Junio C Hamano gits...@pobox.com The email addresses in the records read from the .mailmap file are downcased very early, and then used to match against e-mail addresses in the input. Because we do use case insensitive version of string list to manage these entries, there is no need to do

[PATCH v2 5/9] mailmap: debug: fix out-of-order fprintf() arguments

2013-07-15 Thread Eric Sunshine
Resolve segmentation fault due to arguments passed in wrong order. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- mailmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mailmap.c b/mailmap.c index a7e92db..0516354 100644 --- a/mailmap.c +++ b/mailmap.c @@ -309,7

Re: [PATCH] t4203: fix checks for email address remapping

2013-07-15 Thread Eric Sunshine
On Sat, Jul 13, 2013 at 2:29 AM, Stefan Beller stefanbel...@googlemail.com wrote: On 07/13/2013 02:35 AM, Eric Sunshine wrote: Two tests in t4203-mailmap.sh set up the mapping b...@company.xx = b...@company.xy in an apparent attempt to check that email address remapping works as expected (in

Re: [PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-15 Thread Matthieu Moy
Jonathan Nieder jrnie...@gmail.com writes: (3) # An example hook ... # # Warning: this script is no longer actively maintained. Consider # switching to ... I prefer (2), which makes it clear to the reader that it is dangerous to keep using the script (since no one

Re: What's cooking in git.git (Jul 2013, #05; Fri, 12)

2013-07-15 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: * bp/mediawiki-preview (2013-07-08) 7 commits (merged to 'next' on 2013-07-12 at 870890a) + git-remote-mediawiki: add preview subcommand into git mw + git-remote-mediawiki: add git-mw command + git-remote-mediawiki: factoring code between

Re: ANNOUNCE: git-imerge -- Incremental merge and rebase for git

2013-07-15 Thread Matthieu Moy
Michael Haggerty mhag...@alum.mit.edu writes: I've alluded to this little project of mine on the mailing list before, but I've never really announced it properly. So here we go... git-imerge [1] is an open-source tool that helps you perform difficult Git merges and rebases by allowing

Re: [PATCH] gitweb: Ensure OPML text fits inside its box.

2013-07-15 Thread Tony Finch
Jonathan Nieder jrnie...@gmail.com wrote: Sounds sensible. Can we have your sign-off? (Likewise for the next patch.) Doh! Thanks for looking at the patches. I'll post revised versions, plus a couple more tweaks. Tony. -- f.anthony.n.finch d...@dotat.at http://dotat.at/ Forties, Cromarty:

[PATCH 2/4] gitweb: vertically centre contents of page footer

2013-07-15 Thread Tony Finch
Signed-off-by: Tony Finch d...@dotat.at --- gitweb/static/gitweb.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gitweb/static/gitweb.css b/gitweb/static/gitweb.css index a869be1..3b4d833 100644 --- a/gitweb/static/gitweb.css +++ b/gitweb/static/gitweb.css @@ -68,12

[PATCH 4/4] gitweb: make search help link less ugly

2013-07-15 Thread Tony Finch
The search help link was a superscript question mark right next to a drop-down menu, which looks misaligned and is a cramped and awkward click target. Remove the superscript tags and add some spacing to fix these nits. Add a title attribute to provide an explanatory mouseover. Signed-off-by: Tony

[PATCH 3/4] gitweb: omit the repository owner when it is unset

2013-07-15 Thread Tony Finch
On the repository summary page, leave the whole owner line out if the repo does not have an owner, rather than displaying a labelled empty field.. Signed-off-by: Tony Finch d...@dotat.at --- gitweb/gitweb.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/gitweb.perl

[PATCH 1/4] gitweb: Ensure OPML text fits inside its box.

2013-07-15 Thread Tony Finch
The rss_logo CSS style has a fixed width which is too narrow for the string OPML. Replace the fixed width with horizontal padding so the text fits with nice margins. Signed-off-by: Tony Finch d...@dotat.at --- gitweb/static/gitweb.css | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff

Re: [PATCH v2 00/19] Index-v5

2013-07-15 Thread Thomas Gummerer
Duy Nguyen pclo...@gmail.com writes: On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer t.gumme...@gmail.com wrote: t/perf/p0003-index.sh| 59 + t/t2104-update-index-skip-worktree.sh|1 + For such a big code addition, the test part seems modest.

Re: [PATCH v2 00/19] Index-v5

2013-07-15 Thread Duy Nguyen
On Mon, Jul 15, 2013 at 4:30 PM, Thomas Gummerer t.gumme...@gmail.com wrote: Duy Nguyen pclo...@gmail.com writes: On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer t.gumme...@gmail.com wrote: t/perf/p0003-index.sh| 59 + t/t2104-update-index-skip-worktree.sh

Re: [PATCH v3] config: add support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
(I'm attempting to combine the various separate email replies into a single response here, please forgive me if I mangle something up.) On Jul 14, 2013, at 22:12, Jeff King wrote: On Sun, Jul 14, 2013 at 09:02:19PM -0700, Junio C Hamano wrote: Or proceed with what's there right now (there

Re: [PATCH v2 08/19] grep.c: Use index api

2013-07-15 Thread Thomas Gummerer
Duy Nguyen pclo...@gmail.com writes: On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer t.gumme...@gmail.com wrote: +static int grep_cache(struct cache_entry *ce, void *cb_data) { - int hit = 0; - int nr; - read_cache(); + struct grep_opts *opts = cb_data; -

[PATCH v5 0/5] config: add support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
This patch series adds support for url-specific http.* settings. It has been suggested that a preparatory patch to address the way the http.sslCertPasswordProtected variable is handled be included. I'm not sure if the intent was to make that a separate patch or include it in a patch series

[PATCH v5 1/5] http.c: fix parsing of http.sslCertPasswordProtected variable

2013-07-15 Thread Kyle J. McKay
From: Junio C Hamano gits...@pobox.com The existing code triggers only when the configuration variable is set to true. Once the variable is set to true in a more generic configuration file (e.g. ~/.gitconfig), it cannot be overriden to false in the repository specific one (e.g. .git/config).

[PATCH v5 2/5] http.c: fix parsing of GIT_SSL_CERT_PASSWORD_PROTECTED variable

2013-07-15 Thread Kyle J. McKay
The existing code triggers whenever GIT_SSL_CERT_PASSWORD_PROTECTED is defined. Setting GIT_SSL_CERT_PASSWORD_PROTECTED to a false value could not be used to override the http.sslCertPasswordProtected setting once it had been turned on. Signed-off-by: Kyle J. McKay mack...@gmail.com --- http.c

[PATCH v5 3/5] config: add support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
The credentials configuration values already support url-specific configuration items in the form credential.url.*. This patch adds similar support for http configuration values. The url value is considered a match to a url if the url value is either an exact match or a prefix of the url which

[PATCH v5 4/5] config: improve support for http.url.* settings

2013-07-15 Thread Kyle J. McKay
Improve on the http.url.* url matching behavior by first normalizing the urls before they are compared. With this change, for example, the following configuration section: [http https://example.com/path;] useragent = example-agent sslVerify = false will properly match a

[PATCH v5 5/5] tests: add new test for the url_normalize function

2013-07-15 Thread Kyle J. McKay
In order to perform sane URL matching for http.url.* options, http.c normalizes URLs before performing matches. A new test-url-normalize test program is introduced along with a new t5200-url-normalize.sh script to run the tests. Since the url_normalize function currently lives in http.c this

Re: [PATCH v2 12/19] read-cache: read index-v5

2013-07-15 Thread Duy Nguyen
A little bit more.. On Sat, Jul 13, 2013 at 12:26 AM, Thomas Gummerer t.gumme...@gmail.com wrote: +static void ce_queue_push(struct cache_entry **head, +struct cache_entry **tail, +struct cache_entry *ce) +{ + if (!*head) { +

Bug in git show?

2013-07-15 Thread Stefan Beller
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hello, so I wanted to write a script using some git commands, but the output of the git commands is not as expected. I am using git --version git version 1.8.3.2.804.g0da7a53 (current origin/master at git://github.com/gitster/git.git) The command I

Re: Bug in git show?

2013-07-15 Thread Matthieu Moy
Stefan Beller stefanbel...@googlemail.com writes: However I sometimes also get: sb@sb:~/OSS/git$ git show --format=%ad 0da7a53 Fri Jul 12 10:49:34 2013 -0700 diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt index 0e50df8..4250e5a 100644 ---

Re: Bug in git show?

2013-07-15 Thread Stefan Beller
On 07/15/2013 02:12 PM, Matthieu Moy wrote: Stefan Beller stefanbel...@googlemail.com writes: However I sometimes also get: sb@sb:~/OSS/git$ git show --format=%ad 0da7a53 Fri Jul 12 10:49:34 2013 -0700 diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt index

Missing capabilities in Documentation/technical/protocol-capbilities.txt

2013-07-15 Thread Duy Nguyen
I noticed that quiet and agent capabilities were missing in protocol-capabilitities.txt. I have a rough idea what they do, but I think it's best to be documented by the authors. Maybe you have some time to make a patch? -- Duy -- To unsubscribe from this list: send the line unsubscribe git in the

[PATCH 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt

2013-07-15 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-show.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index ae4edcc..4e617e6 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@

[PATCH 1/5] diff: allow --no-patch as synonym for -s

2013-07-15 Thread Matthieu Moy
This follows the usual convention of having a --no-foo option to negate --foo. Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/rev-list-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH 5/5] Documentation/git-log.txt: capitalize section names

2013-07-15 Thread Matthieu Moy
This is the convention in other files and even at the beginning of git-log.txt Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-log.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index

[PATCH 0/5] Make git show -s easier to discover for users

2013-07-15 Thread Matthieu Moy
Stefan Beller stefanbel...@googlemail.com writes: However I sometimes also get: sb@sb:~/OSS/git$ git show --format=%ad 0da7a53 Fri Jul 12 10:49:34 2013 -0700 diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt index 0e50df8..4250e5a 100644 ---

[PATCH 4/5] Documentation: move description of -s, --no-patch to diff-options.txt

2013-07-15 Thread Matthieu Moy
Technically, -s, --no-patch is implemented in diff.c (git diff --no-patch is essentially useless, but valid). From the user point of view, this allows the documentation to show up in git show --help, which is one of the most useful use of the option. While we're there, add a sentence explaining

Re: Segfault in `git describe`

2013-07-15 Thread Mantas Mikulėnas
On Mon, Jul 15, 2013 at 4:03 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 07/13/2013 03:27 PM, Mantas Mikulėnas wrote: I have a clone of linux.git with various stuff added to it (remotes for 'stable' and 'next', a bunch of local tags, and historical repositories imported using `git

Re: [PATCH v4 2/2] post-receive-email: deprecate script in favor of git-multimail

2013-07-15 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Jonathan Nieder jrnie...@gmail.com writes: (3) # An example hook ... # # Warning: this script is no longer actively maintained. Consider # switching to ... I prefer (2), which makes it clear to the reader that it is

Re: [PATCH] commit: Fix a memory leak in determine_author_info

2013-07-15 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. --- builtin/commit.c | 1 - 1 file changed, 1 deletion(-) diff --git

Re: [PATCH] commit: Fix a memory leak in determine_author_info

2013-07-15 Thread Stefan Beller
On 07/15/2013 04:42 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: The date variable is assigned new memory via xmemdupz and 2 lines later it is assigned new memory again via xmalloc, but the first assignment is never freed nor used. --- builtin/commit.c | 1 -

Re: [PATCH 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt

2013-07-15 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-show.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index ae4edcc..4e617e6 100644 ---

Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch

2013-07-15 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Signed-off-by: Matthieu Moy matthieu@imag.fr --- diff.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 6bd821d..66a6877 100644 --- a/diff.c +++ b/diff.c @@ -3515,9 +3515,10 @@ int

Re: [PATCH 3/5] Documentation/git-show.txt: include common diff options, like git-log.txt

2013-07-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@imag.fr writes: Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-show.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index

Re: [PATCH v2 9/9] mailmap: style fixes

2013-07-15 Thread Junio C Hamano
Thanks, the whole series looks sensible. Will replace and queue. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] do_one_ref(): save and restore value of current_ref

2013-07-15 Thread Michael Haggerty
If do_one_ref() is called recursively, then the inner call should not permanently overwrite the value stored in current_ref by the outer call. Aside from the tiny optimization loss, peel_ref() expects the value of current_ref not to change across a call to peel_entry(). But in the presence of

Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch

2013-07-15 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: I am wondering if the difference after this patch between -p and -U8 is deliberate, or just an accident coming from the way the original was written in ee1e5412 (git diff: support -U and --unified options properly, 2006-05-13). No, it isn't. I just

Re: [PATCH] git-clone.txt: remove the restriction on pushing from a shallow clone

2013-07-15 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Mon, Jul 15, 2013 at 8:01 AM, Duy Nguyen pclo...@gmail.com wrote: Also, the sender may have cloned from the receiver (fully) and then fetched a different history shallowly from elsewhere. The receiver may have no commit on that history, including the

Re: [PATCH 7/7] push: document --lockref

2013-07-15 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Now suppose my relay has some downtime. That's fine --- I can still maintain the mirror by running the same commands on another machine. But when the old relay comes back up, push --lockref will fail and pu and next in my mirror are not updated any

Re: [PATCH] show-ref: make --head always show the HEAD ref

2013-07-15 Thread Junio C Hamano
Doug Bell madcity...@gmail.com writes: diff --git a/builtin/show-ref.c b/builtin/show-ref.c index 4a0310d..4b069e7 100644 --- a/builtin/show-ref.c +++ b/builtin/show-ref.c @@ -31,6 +31,9 @@ static int show_ref(const char *refname, const unsigned char *sha1, int flag, vo const char

Re: [PATCH 2/5] diff: allow --patch to override -s/--no-patch

2013-07-15 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: I am wondering if the difference after this patch between -p and -U8 is deliberate, or just an accident coming from the way the original was written in ee1e5412 (git diff: support -U and --unified

Re: [PATCH 1/6] templates: Use heredoc in pre-commit hook

2013-07-15 Thread Junio C Hamano
Richard Hartmann richih.mailingl...@gmail.com writes: On Sun, Jul 14, 2013 at 9:20 PM, Junio C Hamano gits...@pobox.com wrote: Shells on modern distros and platforms have echo built-in, so this patch replaces series of writes internal to the shell with a fork to cat with heredoc (which often

Re: [PATCH 4/6] Documentation: Update manpage for pre-commit hook

2013-07-15 Thread Junio C Hamano
Richard Hartmann richih.mailingl...@gmail.com writes: Verbatim copy of 4b8234b2693af634a77ea059331d1658e070f6d7 in original patch series from 2013-06-10. As Jonathan said, this is not a commit log message. I've applied up to 3/6 with fixups, but will stop here for now. Signed-off-by:

[PATCH] howto: Use all-space indentation in ASCII art

2013-07-15 Thread Dirk Wallenstein
Keep the sketch aligned independent of the tabstop width used. Signed-off-by: Dirk Wallenstein hals...@t-online.de --- Documentation/howto/revert-a-faulty-merge.txt | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/howto/revert-a-faulty-merge.txt

[PATCH v2 0/5] Make git show -s easier to discover for users

2013-07-15 Thread Matthieu Moy
This fixes the issue found by Junio where git log --no-patch -u was showing the patch, but not git log --no-patch -U8. Other patches are unmodified. Matthieu Moy (5): diff: allow --no-patch as synonym for -s diff: allow --patch cie to override -s/--no-patch Documentation/git-show.txt:

[PATCH v2 4/5] Documentation: move description of -s, --no-patch to diff-options.txt

2013-07-15 Thread Matthieu Moy
Technically, -s, --no-patch is implemented in diff.c (git diff --no-patch is essentially useless, but valid). From the user point of view, this allows the documentation to show up in git show --help, which is one of the most useful use of the option. While we're there, add a sentence explaining

[PATCH v2 1/5] diff: allow --no-patch as synonym for -s

2013-07-15 Thread Matthieu Moy
This follows the usual convention of having a --no-foo option to negate --foo. Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/rev-list-options.txt | 1 + diff.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git

repo consistency under crashes and power failures?

2013-07-15 Thread Greg Troxel
Clearly there is the possibility of creating a corrupt repository when receiving objects and updating refs, if a crash or power failure causes data not to get written to disk but that data is pointed to. Journaling mitigates this, but I'd argue that programs should function safely with only the

Re: repo consistency under crashes and power failures?

2013-07-15 Thread Jonathan Nieder
Greg Troxel wrote: Alternatively, is there somewhere a first-principles analysis vs POSIX specs (such as fsyncing object files before updating refs to point to them, which I realize has performance negatives)? You might be interested in the 'core.fsyncobjectfiles' setting. git-config(1) has

[PATCH] Fix some sparse warnings

2013-07-15 Thread Ramsay Jones
Sparse issues three Using plain integer as NULL pointer warnings. Each warning relates to the use of an '{0}' initialiser expression in the declaration of an 'struct object_info'. The first field of this structure has pointer type. Thus, in order to suppress these warnings, we replace the

[RFC/PATCH] Add the NO_SENTINEL build variable

2013-07-15 Thread Ramsay Jones
Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Jeff, One of the three gcc compilers that I use does not understand the sentinel function attribute. (so, it spews 108 warning messages) Is this, or something like it, too ugly for you to squash into your patch? :-D ATB, Ramsay

[PATCH v3 0/6] Make git show -s easier to discover for users

2013-07-15 Thread Matthieu Moy
Compared to v2, I just added tests. Strongly inspired from Jonathan's, but there's one more, and I chose the modern indentation style (hence a clean-up patch before, to avoid mixed-style in the same file). Matthieu Moy (6): t4000-diff-format.sh: modernize style diff: allow --no-patch as

[PATCH v3 4/6] Documentation/git-show.txt: include common diff options, like git-log.txt

2013-07-15 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-show.txt | 9 + 1 file changed, 9 insertions(+) diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt index ae4edcc..4e617e6 100644 --- a/Documentation/git-show.txt +++ b/Documentation/git-show.txt @@

[PATCH v3 6/6] Documentation/git-log.txt: capitalize section names

2013-07-15 Thread Matthieu Moy
This is the convention in other files and even at the beginning of git-log.txt Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-log.txt | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index

[PATCH v3 2/6] diff: allow --no-patch as synonym for -s

2013-07-15 Thread Matthieu Moy
This follows the usual convention of having a --no-foo option to negate --foo. Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/rev-list-options.txt | 1 + diff.c | 2 +- t/t4000-diff-format.sh | 12 3 files changed, 14

Re: [PATCH v3 1/6] t4000-diff-format.sh: modernize style

2013-07-15 Thread Jonathan Nieder
Matthieu Moy wrote: Signed-off-by: Matthieu Moy matthieu@imag.fr --- t/t4000-diff-format.sh | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) This test script can use more cleanup, but as preparation for later patches in this series the above is enough. :) If I

Re: [PATCH v3 3/6] diff: allow --patch cie to override -s/--no-patch

2013-07-15 Thread Jonathan Nieder
Matthieu Moy wrote: All options that trigger a patch output now override --no-patch. The case of --binary is particular as the name may suggest that it turns Usage nit: this should say is unusual or In the case of --binary in particular, the name may suggest a normal patch into a

Re: [RFC/PATCH] Add the NO_SENTINEL build variable

2013-07-15 Thread Jonathan Nieder
Ramsay Jones wrote: One of the three gcc compilers that I use does not understand the sentinel function attribute. (so, it spews 108 warning messages) Do you know what version of gcc introduced the sentinel attribute? Would it make sense for the ifdef in git-compat-util.h to be keyed on

Re: [PATCH v3 6/6] Documentation/git-log.txt: capitalize section names

2013-07-15 Thread Jonathan Nieder
Matthieu Moy wrote: This is the convention in other files and even at the beginning of git-log.txt The docs aren't so consistent on this, but I agree that it makes sense to at least be consistent within the generated git-log.html. :) Generally the series looks very good. Thanks for taking

Re: [PATCH v3 3/6] diff: allow --patch cie to override -s/--no-patch

2013-07-15 Thread Matthieu Moy
Jonathan Nieder jrnie...@gmail.com writes: Matthieu Moy wrote: All options that trigger a patch output now override --no-patch. The case of --binary is particular as the name may suggest that it turns Usage nit: this should say is unusual I don't get it. The point is not that --binary is

Re: [PATCH v3 3/6] diff: allow --patch cie to override -s/--no-patch

2013-07-15 Thread Jonathan Nieder
Matthieu Moy wrote: Jonathan Nieder jrnie...@gmail.com writes: Matthieu Moy wrote: All options that trigger a patch output now override --no-patch. The case of --binary is particular as the name may suggest that it turns Usage nit: this should say is unusual I don't get it. The point is

Re: What's cooking in git.git (Jul 2013, #03; Tue, 9)

2013-07-15 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: [Stalled] * rj/read-default-config-in-show-ref-pack-refs (2013-06-17) 3 commits - ### DONTMERGE: needs better explanation on what config they need - pack-refs.c: Add missing call to git_config() - show-ref.c: Add missing call to

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-15 Thread Junio C Hamano
Mark Levedahl mleved...@gmail.com writes: In order to limit the adverse effects caused by this implementation, we provide a new fast stat interface, which allows us to use this only for interactions with the index (i.e. the cached stat data). Signed-off-by: Ramsay Jones

Re: [PATCH 7/7] push: document --lockref

2013-07-15 Thread Johannes Sixt
Am 15.07.2013 05:50, schrieb Junio C Hamano: ... or also with your --lockref is default $ git push origin +master ... rejected due to stale expectation $ git fetch You just have updated the lockref base, so if you did, without doing anything else, $

Re: [PATCH 7/7] push: document --lockref

2013-07-15 Thread Johannes Sixt
Am 14.07.2013 22:59, schrieb Johannes Sixt: ... I wonder how Junio's last example with push.default=simple can work today: $ git pull --rebase # not a merge $ git push because it is not a fast-forward. *blush* I was mostly asleep and and totally off the rails when I wrote this

[PATCH] t9200 - Allow cvs version 1.12

2013-07-15 Thread Mark Levedahl
cvs v1.12 does not correctly handle cvs co -d $DIR, which is shorthand for mkdir $DIR, cd $DIR, cvs co, cd -. So, use the latter form. Also cvs v1.12 does not necessarily match cvs v1.11 in the format of CVS/Entries, and this causes a false failure in subtest 14. Eliminate checking CVS/Entries

[ANNOUNCE] Git v1.8.3.3

2013-07-15 Thread Junio C Hamano
The latest maintenance release Git v1.8.3.3 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 417cb12660446702bffc5c2c83cbb6e7f1e60c79 git-1.8.3.3.tar.gz

Re: [PATCH v2 00/46] struct pathspec conversion and :(glob) and :(icase)

2013-07-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Compared to the last round [1] this series mainly fixes comments and commit messages suggested by Eric and Junio. It also fixes a conflict with cb/log-follow-with-combined (in master) and introduces :(icase) mentioned in the last round. [1]

Re: [PATCHv2 0/3] Switch German translation to G+E

2013-07-15 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes: Ralf Thielow (3): l10n: de.po: switch from pure German to German+English (part 1) l10n: de.po: switch from pure German to German+English (part 2) l10n: de.po: switch from pure German to German+English (part 3) Thanks a lot, and sorry I was so

Re: [PATCHv2 1/3] l10n: de.po: switch from pure German to German+English (part 1)

2013-07-15 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes: #: merge-recursive.c:268 msgid error building trees -msgstr Fehler beim Erstellen der Bäume +msgstr Fehler beim Erstellen der Verzeichnisse This should remain Bäume or possibly 'Tree-Objekte', as it refers to a failure within

Re: [PATCHv2 2/3] l10n: de.po: switch from pure German to German+English (part 2)

2013-07-15 Thread Thomas Rast
Ralf Thielow ralf.thie...@gmail.com writes: #: builtin/clone.c:73 msgid create a mirror repository (implies bare) -msgstr erstellt ein Spiegelarchiv (impliziert bloßes Projektarchiv) +msgstr erstellt ein Spiegelarchiv (impliziert Bare-Repository) Perhaps it's better to just say --bare

Re: [PATCH v5 4/5] config: improve support for http.url.* settings

2013-07-15 Thread Eric Sunshine
On Mon, Jul 15, 2013 at 5:51 AM, Kyle J. McKay mack...@gmail.com wrote: Improve on the http.url.* url matching behavior by first normalizing the urls before they are compared. diff --git a/http.c b/http.c index 758e5b1..d04386e 100644 --- a/http.c +++ b/http.c @@ -169,6 +169,210 @@ static

[PATCH] git-log.txt: fix typesetting of example git-log -L invocation

2013-07-15 Thread Eric Sunshine
All surrounding examples are typeset as monospaced text. Follow suit. Signed-off-by: Eric Sunshine sunsh...@sunshineco.com --- Documentation/git-log.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index

[PATCH] send-email: improve SSL certificate verification

2013-07-15 Thread brian m. carlson
The SSL and TLS code for SMTP is non-trivial, so refactor it into a separate function for ease of use. Handle both files and directories as sources for CA certificates. Also add handling for older version of IO::Socket::SSL that do not support the SSL_VERIFY_PEER and SSL_VERIFY_NONE constants;

Re: [PATCH] t9200 - Allow cvs version 1.12

2013-07-15 Thread Mark Levedahl
On 07/15/2013 06:06 PM, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: cvs v1.12 does not correctly handle cvs co -d $DIR, which is shorthand for mkdir $DIR, cd $DIR, cvs co, cd -. So, use the latter form. Hmph, I think I've been using 1.12.13 and without seeing such a

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-15 Thread Torsten Bögershausen
On 2013-07-15 21.49, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: In order to limit the adverse effects caused by this implementation, we provide a new fast stat interface, which allows us to use this only for interactions with the index (i.e. the cached stat data).

Re: [PATCH] send-email: improve SSL certificate verification

2013-07-15 Thread Torsten Bögershausen
[snip] I wasn't sure where to apply the patch, so I manually copy/paste it on top of pu: commit 6b1ca0f4d443ee8716857b871b0513ae85c9f112 Merge: bce90ab f351fcf Thanks, t9001 passes on Mac OS X 10.6. To be sure I didn't messed it up, please see the diff below. When it shows up on pu, I can re-test

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-15 Thread Mark Levedahl
On 07/15/2013 03:49 PM, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: In order to limit the adverse effects caused by this implementation, we provide a new fast stat interface, which allows us to use this only for interactions with the index (i.e. the cached stat data).

Re: [RFC/PATCH v2 1/1] cygwin: Add fast_lstat() and fast_fstat() functions

2013-07-15 Thread Mark Levedahl
On 07/15/2013 10:06 PM, Torsten Bögershausen wrote: On 2013-07-15 21.49, Junio C Hamano wrote: Mark Levedahl mleved...@gmail.com writes: In order to limit the adverse effects caused by this implementation, we provide a new fast stat interface, which allows us to use this only for interactions

Re: [PATCH] Fix some sparse warnings

2013-07-15 Thread Johannes Sixt
Am 7/15/2013 19:31, schrieb Ramsay Jones: Sparse issues three Using plain integer as NULL pointer warnings. Each warning relates to the use of an '{0}' initialiser expression in the declaration of an 'struct object_info'. I question the value of this warning. Initialization with '= {0}' is a