Re: [PATCH] imap-send: use Apple's Security framework for base64 encoding

2013-07-29 Thread David Aguilar
On Sun, Jul 28, 2013 at 8:35 PM, Jonathan Nieder jrnie...@gmail.com wrote: Hi, David Aguilar wrote: --- a/imap-send.c +++ b/imap-send.c @@ -22,14 +22,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include cache.h -#include exec_cmd.h

[PATCH] More typofixes.

2013-07-29 Thread Ondřej Bílka
Hi, I improved my tool and it catched following additional typos. As with any big project best way to catch errors is to have automated checks that catch them ( Other possibility would be to read everything ten times to get error rate down but nobody wants to do it). If you want you could add a

Re: [PATCH] More typofixes.

2013-07-29 Thread Bryan Turner
diff --git a/pathspec.c b/pathspec.c index 6ea0867..27ffe77 100644 --- a/pathspec.c +++ b/pathspec.c @@ -40,7 +40,7 @@ void add_pathspec_matches_against_index(const char **pathspec, /* * Finds which of the given pathspecs match items in the index. * - * This is a one-shot wrapper

Re: [PATCH] More typofixes.

2013-07-29 Thread David Aguilar
On Mon, Jul 29, 2013 at 1:18 AM, Ondřej Bílka nel...@seznam.cz wrote: Hi, I improved my tool and it catched following additional typos. As with any big project best way to catch errors is to have automated checks that catch them ( Other possibility would be to read everything ten times to

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Duy Nguyen
On Sun, Jul 28, 2013 at 11:59 PM, Ramkumar Ramachandra artag...@gmail.com wrote: By improving the relative_path() algorithm, e02ca72 (path.c: refactor relative_path(), not only strip prefix, 2013-06-25) uncovered a latent bug. While most editor applications like cat and vim handle

Re: [PATCH] More typofixes.

2013-07-29 Thread Ramkumar Ramachandra
Ondřej Bílka wrote: diff --git a/builtin/log.c b/builtin/log.c index 2625f98..01b49b3 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -304,7 +304,7 @@ static void setup_early_output(struct rev_info *rev) * tenth of a second, don't even bother doing the * early-output

Re: [PATCH] git-rebase: fix typo

2013-07-29 Thread Ramkumar Ramachandra
Ralf Thielow wrote: diff --git a/git-rebase.sh b/git-rebase.sh index 0039ecf..8d7659a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -159,7 +159,7 @@ finish_rebase () { die $(eval_gettext Cannot store \$stash_sha1) gettext 'Applying

Re: [PATCH] More typofixes.

2013-07-29 Thread Marc Branchaud
On 13-07-29 04:18 AM, Ondřej Bílka wrote: Hi, I improved my tool and it catched following additional typos. As with any big project best way to catch errors is to have automated checks that catch them ( Other possibility would be to read everything ten times to get error rate down but

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: By improving the relative_path() algorithm, e02ca72 (path.c: refactor relative_path(), not only strip prefix, 2013-06-25) uncovered a latent bug. While most editor applications like cat and vim handle non-canonicalized relative paths fine,

Re: [PATCHv3] git-tag man: when to use lightweight or annotated tags

2013-07-29 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: On 13-07-26 03:06 PM, Jeff King wrote: On Fri, Jul 26, 2013 at 07:33:01PM +0200, Daniele Segato wrote: stress the difference between the two with suggestion on when the user should use one in place of the other. Signed-off-by: Daniele Segato

Re: [PATCH] commit: correct advice about aborting a cherry-pick

2013-07-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Jul 26, 2013 at 05:40:36PM -0400, Jeff King wrote: Jeff King wrote: Your patch is just swapping out git reset for cherry-pick --abort, so I think that is a good improvement in the meantime. Um, wasn't the idea of the original message that

Re: [PATCH] commit: correct advice about aborting a cherry-pick

2013-07-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: Here it is in patch form, with an updated commit message that hopefully explains the rationale a bit better. -- 8 -- Subject: [PATCH] commit: tweak empty cherry pick advice for sequencer When we refuse to make an empty commit, we check whether we are in a

Re: [PATCH] commit: correct advice about aborting a cherry-pick

2013-07-29 Thread Jeff King
On Mon, Jul 29, 2013 at 08:18:45AM -0700, Junio C Hamano wrote: if (file_exists(git_path(MERGE_HEAD))) whence = FROM_MERGE; - else if (file_exists(git_path(CHERRY_PICK_HEAD))) + else if (file_exists(git_path(CHERRY_PICK_HEAD))) { whence =

[PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Stefan Beller
As of b04ba2bb4 OPTION_BOOLEAN was deprecated. This commit removes all occurrences of OPTION_BOOLEAN. In b04ba2bb4 Junio suggested to replace it with either OPTION_SET_INT or OPTION_COUNTUP instead. However a pattern, which occurred often with the OPTION_BOOLEAN was a hidden boolean parameter. So

[PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Stefan Beller
Hi, the following patch removes the OPTION_BOOLEAN from all commands. So recently Junio released -rc0. Is that a reason to not send out patches, which do not do bugfixes? So the following commit for example doesn't fix a bug nor does it add a feature. Is it fine to send out such kind of commits

Re: [PATCH] More typofixes.

2013-07-29 Thread Ondřej Bílka
On Mon, Jul 29, 2013 at 10:55:41AM -0400, Marc Branchaud wrote: On 13-07-29 04:18 AM, Ondřej Bílka wrote: Hi, I improved my tool and it catched following additional typos. As with any big project best way to catch errors is to have automated checks that catch them ( Other

Re: [RFC/PATCH] commit-slab.h: Fix memory allocation and addressing

2013-07-29 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: I was convinced, just by reading the code in the header, that when used with stride 1, the memory allocated to a slab would not be sufficient. (ie it would be too small by: s-slab_size * (sizeof(**s-slab) * (stride - 1)) ). So, I had

Re: [PATCH] commit: correct advice about aborting a cherry-pick

2013-07-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Jul 29, 2013 at 08:18:45AM -0700, Junio C Hamano wrote: if (file_exists(git_path(MERGE_HEAD))) whence = FROM_MERGE; - else if (file_exists(git_path(CHERRY_PICK_HEAD))) + else if (file_exists(git_path(CHERRY_PICK_HEAD))) {

Re: [PATCH] imap-send: use Apple's Security framework for base64 encoding

2013-07-29 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: diff --git a/imap-send.c b/imap-send.c index d6b65e2..3fd9c0e 100644 --- a/imap-send.c +++ b/imap-send.c @@ -22,14 +22,11 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include cache.h -#include

Re: [PATCH] send-email: squelch warning from Net::SMTP::SSL

2013-07-29 Thread Junio C Hamano
Colin Guthrie gm...@colin.guthr.ie writes: For what it's worth, after upgrading here, I got this error at the server side: Jul 26 10:15:41 foo.example.com postfix/smtpd[7736]: warning: TLS library problem: 7736:error:14094418:SSL routines:SSL3_READ_BYTES:tlsv1 alert unknown

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: That's a bit strange---the patch text looks like the how about this patch Duy posted earlier. Shouldn't it be From: Duy with S-o-b: by two of you instead? Feel free to amend as you see fit, as always. For editors that are not broken, this could be an annoying

Re: [PATCH] builtins: search builtin commands via binary search.

2013-07-29 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: However I could not find a speedup. So if the patch is accepted, it would only be for readability. This adds a maintenance burden. It is very easy for somebody to mistakenly run sort on the region in her editor under non C locale. Perhaps

[PATCH] fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-07-29 Thread Stefan Beller
This task emerged from b04ba2bb4. All occurrences of the respective variables have been reviewed and none of them relied on the counting up mechanism, but all of them were using the variable as a true boolean. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/fsck.c | 16

Re: [PATCH] Avoid using `echo -n` anywhere

2013-07-29 Thread Junio C Hamano
Lukas Fleischer g...@cryptocrack.de writes: `echo -n` is non-portable. The POSIX specification says: Conforming applications that wish to do prompting without newline characters or that could possibly be expecting to echo a -n, should use the printf utility derived from the Ninth

Re: [PATCH] send-email: squelch warning from Net::SMTP::SSL

2013-07-29 Thread Colin Guthrie
'Twas brillig, and Junio C Hamano at 29/07/13 17:01 did gyre and gimble: Colin Guthrie gm...@colin.guthr.ie writes: For what it's worth, after upgrading here, I got this error at the server side: Jul 26 10:15:41 foo.example.com postfix/smtpd[7736]: warning: TLS library problem:

Re: [PATCH/RFC] core.precomposeunicode is true by default

2013-07-29 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: When core.precomposeunicode was introduced, it was set to false by default, to be compatible with older versions of Git. Whenever UTF-8 file names are used in a mixed environment, the Mac OS users need to find out that this configuration exist and

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: That's a bit strange---the patch text looks like the how about this patch Duy posted earlier. Shouldn't it be From: Duy with S-o-b: by two of you instead? Feel free to amend as you see fit, as always. I was asking what

Re: [PATCH] git-rebase: fix typo

2013-07-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Ralf Thielow wrote: diff --git a/git-rebase.sh b/git-rebase.sh index 0039ecf..8d7659a 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -159,7 +159,7 @@ finish_rebase () { die $(eval_gettext Cannot store \$stash_sha1)

Re: [PATCH] More typofixes.

2013-07-29 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: Unfortunately no automated system is perfect (see some of my comments below). I'm all for an automated system that identifies potential misspellings, but I'm wary of anything that attempts to automatically correct perceived errors, or that can't be

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Ramkumar Ramachandra
Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: That's a bit strange---the patch text looks like the how about this patch Duy posted earlier. Shouldn't it be From: Duy with S-o-b: by two of you instead? Feel free to amend as you see fit, as

Re: [PATCH] More typofixes.

2013-07-29 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Marc Branchaud marcn...@xiplink.com writes: Unfortunately no automated system is perfect (see some of my comments below). I'm all for an automated system that identifies potential misspellings, but I'm wary of anything that attempts to automatically

Re: [PATCH] fsck: Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-07-29 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: This task emerged from b04ba2bb4. All occurrences of the respective variables have been reviewed and none of them relied on the counting up mechanism, but all of them were using the variable as a true boolean. Signed-off-by: Stefan Beller

Re: [PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: So recently Junio released -rc0. Is that a reason to not send out patches, which do not do bugfixes? So the following commit for example doesn't fix a bug nor does it add a feature. Is it fine to send out such kind of commits during the -rc

Re: [PATCH] More typofixes.

2013-07-29 Thread Stefan Beller
On 07/29/2013 07:52 PM, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Marc Branchaud marcn...@xiplink.com writes: Unfortunately no automated system is perfect (see some of my comments below). I'm all for an automated system that identifies potential misspellings, but

Re: [PATCHv3] git-tag man: when to use lightweight or annotated tags

2013-07-29 Thread Daniele Segato
On 07/26/2013 09:36 PM, Jonathan Nieder wrote: Eventually the description section should probably be tweaked to start by explaining what the command is actually for. ;-) Elaborating from this suggestion you gave me I tried to rewrite/rearrange the description moving things around a little.

Re: [PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Stefan Beller
On 07/29/2013 07:58 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: So recently Junio released -rc0. Is that a reason to not send out patches, which do not do bugfixes? So the following commit for example doesn't fix a bug nor does it add a feature. Is it fine

Re: [PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: As of b04ba2bb4 OPTION_BOOLEAN was deprecated. The primary purpose of b04ba2bb (parse-options: deprecate OPT_BOOLEAN, 2011-09-27) is to deprecate OPT_BOOLEAN(), which was hard to use correctly. OPT_BOOLEAN() is not touched at all with this

Re: [PATCHv3] git-tag man: when to use lightweight or annotated tags

2013-07-29 Thread Daniele Segato
On 07/27/2013 01:45 PM, Stefan Beller wrote: On 07/27/2013 01:26 PM, Philip Oakley wrote: Try 'git format-patch' and 'git send-email'. The format-patch man page even has a note about Thunderbird corruptions. Philip Well I use Thunderbird as well for regular communication except for sending

Re: [PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Stefan Beller
On 07/29/2013 08:11 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: As of b04ba2bb4 OPTION_BOOLEAN was deprecated. The primary purpose of b04ba2bb (parse-options: deprecate OPT_BOOLEAN, 2011-09-27) is to deprecate OPT_BOOLEAN(), which was hard to use correctly.

Re: [PATCHv3] git-tag man: when to use lightweight or annotated tags

2013-07-29 Thread Daniele Segato
On 07/29/2013 05:04 PM, Junio C Hamano wrote: Marc Branchaud marcn...@xiplink.com writes: On 13-07-26 03:06 PM, Jeff King wrote: On Fri, Jul 26, 2013 at 07:33:01PM +0200, Daniele Segato wrote: stress the difference between the two with suggestion on when the user should use one in place of

Re: [PATCH] git-tag man: when to use lightweight or annotated tags

2013-07-29 Thread Daniele Segato
On 07/26/2013 11:13 PM, Marc Branchaud wrote: On 13-07-26 01:19 PM, Daniele Segato wrote: By the way which is your role in the community? Don't want to be rude, I just don't know who I'm talking about :) the documentation maintainer? I'm just a git user and (very) occasional contributor.

Re: [PATCH] More typofixes.

2013-07-29 Thread Marc Branchaud
On 13-07-29 01:52 PM, Junio C Hamano wrote: Here is what I salvaged for 'maint'. Eyeballing by others is very much appreciated. -- 8 -- From: Ondřej Bílka nel...@seznam.cz Subject: [PATCH] many small typofixes Date: Mon, 29 Jul 2013 10:18:21 +0200 Signed-off-by: Ondřej Bílka

Re: [PATCH] Remove deprecated OPTION_BOOLEAN

2013-07-29 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: On 07/29/2013 07:58 PM, Junio C Hamano wrote: Stefan Beller stefanbel...@googlemail.com writes: So recently Junio released -rc0. Is that a reason to not send out patches, which do not do bugfixes? So the following commit for example

Re: [PATCH] More typofixes.

2013-07-29 Thread Junio C Hamano
Marc Branchaud marcn...@xiplink.com writes: On 13-07-29 01:52 PM, Junio C Hamano wrote: Here is what I salvaged for 'maint'. Eyeballing by others is very much appreciated. -- 8 -- From: Ondřej Bílka nel...@seznam.cz Subject: [PATCH] many small typofixes Date: Mon, 29 Jul 2013 10:18:21

Re: [PATCH gitk 0/4] gitk support for git log -L

2013-07-29 Thread Thomas Rast
Thomas Rast tr...@inf.ethz.ch writes: Thomas Rast tr...@inf.ethz.ch writes: Now that git log -L has hit master, I figure it's time to discuss the corresponding change to gitk. Paul, any news on this? Any chance we can get it into the next release, since that will also be the first release

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: That's a bit strange---the patch text looks like the how about this patch Duy posted earlier. Shouldn't it be From: Duy with S-o-b: by two of you

[PATCH 0/4] Removing deprecated parsing macros

2013-07-29 Thread Stefan Beller
The first patch of this series is a start on replacing the deprecated OPT_BOOLEAN macro by OPT_BOOL. All occurences have been reviewed so far, only 140 occurences to go. The 3 patches after the first are things I noticed during the review for the macro replacement. These should ease readability.

[PATCH 4/4] name-rev: ease up condition

2013-07-29 Thread Stefan Beller
Now that the internal variables 'all' and 'transform_stdin' are read in by OPT_BOOL, which makes sure to have the variable being 0 or 1 after reading, we do not need the double negation to map any other value to 1. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/name-rev.c |

[PATCH 3/4] checkout: remove superfluous local variable

2013-07-29 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/checkout.c | 12 +--- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/builtin/checkout.c b/builtin/checkout.c index 8b48f4a..ed39cec 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -228,8 +228,6

[PATCH 2/4] log, format-patch: accept short parameter 'q' for quiet

2013-07-29 Thread Stefan Beller
Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 9b6c910..5cb968b 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -121,7 +121,7 @@ static void

[PATCH 1/4] Replace deprecated OPT_BOOLEAN by OPT_BOOL

2013-07-29 Thread Stefan Beller
This task emerged from b04ba2bb4. All occurrences of the respective variables have been reviewed and none of them relied on the counting up mechanism, but all of them were using the variable as a true boolean. Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/check-attr.c | 8

Re: [PATCH gitk 0/4] gitk support for git log -L

2013-07-29 Thread Jens Lehmann
Am 29.07.2013 21:37, schrieb Thomas Rast: Thomas Rast tr...@inf.ethz.ch writes: Thomas Rast tr...@inf.ethz.ch writes: Now that git log -L has hit master, I figure it's time to discuss the corresponding change to gitk. Paul, any news on this? Any chance we can get it into the next

[PATCH] Documentation: fix typos in man pages

2013-07-29 Thread Øystein Walle
Signed-off-by: Øystein Walle oys...@gmail.com --- I thought I'd take part in the typo fixing frenzy :) I have some other potential typos lines up. Right now the docs refer to both 'filesystem' and 'file system', as well as both 'testsuite' and 'test suite'. I think words like these are generally

Re: [PATCH 2/4] log, format-patch: accept short parameter 'q' for quiet

2013-07-29 Thread René Scharfe
Am 29.07.2013 21:49, schrieb Stefan Beller: Signed-off-by: Stefan Beller stefanbel...@googlemail.com --- builtin/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 9b6c910..5cb968b 100644 --- a/builtin/log.c +++ b/builtin/log.c @@

What's cooking in git.git (Jul 2013, #09; Mon, 29)

2013-07-29 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 shape of the upcoming release is pretty much known by now; all the topics that are marked for 'master' in this issue will likely to be in

[PATCH 2/3] builtin/config: refactor collect_config()

2013-07-29 Thread Junio C Hamano
In order to reuse the logic to format the configuration value while honouring the requested type, split this function into two. Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/config.c | 42 +- 1 file changed, 21 insertions(+), 21 deletions(-)

[PATCH 1/3] url-match: split out URL matching logic out of http.c

2013-07-29 Thread Junio C Hamano
Move reusable URL matching code out of http.c, because it is not limited to http, and we do not necessarily want to link its users with the cURL library. Signed-off-by: Junio C Hamano gits...@pobox.com --- Makefile | 2 + http.c | 500

[PATCH 3/3] config: --get-urlmatch

2013-07-29 Thread Junio C Hamano
git config --get-urlmatch $section[.$variable] $url is a way to learn what the configured value for $section.$variable is for the given URL, using the logic introduced by the http.url.config topic. In addition to $section.$variable, entries in the configuration file(s) that match

[PATCH 0/3] git config --get-urlmatch $section.$key $url

2013-07-29 Thread Junio C Hamano
So here is a bit of refactoring to extract the logic to find the entry $section.urlpattern.$key from the configuration that best matches the given $url to answer what value $section.$key should be for $url? out of http.c (primarily because we never want to link git cofnig with the cURL library),

Re: [PATCH] editor: use canonicalized absolute path

2013-07-29 Thread Duy Nguyen
On Mon, Jul 29, 2013 at 9:56 PM, Junio C Hamano gits...@pobox.com wrote: Co-authored-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com Signed-off-by: Ramkumar Ramachandra artag...@gmail.com That's a bit strange---the patch text looks like the how about this patch Duy posted earlier. Shouldn't it be

Re: [PATCH 3/3] config: --get-urlmatch

2013-07-29 Thread Jeff King
On Mon, Jul 29, 2013 at 03:49:10PM -0700, Junio C Hamano wrote: git config --get-urlmatch $section[.$variable] $url is a way to learn what the configured value for $section.$variable is for the given URL, using the logic introduced by the http.url.config topic. That interface looks good to

[PATCH v2] imap-send: use Apple's Security framework for base64 encoding

2013-07-29 Thread David Aguilar
From: Jeremy Huddleston jerem...@apple.com Use Apple's supported functions for base64 encoding instead of the deprecated OpenSSL functions. Signed-off-by: Jeremy Huddleston jerem...@apple.com Signed-off-by: David Aguilar dav...@gmail.com --- This version moves the tricky #ifdefs into

Re: [PATCH 3/3] config: --get-urlmatch

2013-07-29 Thread Junio C Hamano
Jeff King p...@peff.net writes: +struct urlmatch_item { +size_t max_matched_len; +char user_matched; +char value_is_null; +struct strbuf value; +}; I think you ultimately want such a string_list for matching arbitrary numbers of keys, but do you need it for the git-config

Flatten history

2013-07-29 Thread Hilco Wijbenga
Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now like to get all the changes from feature but not any of the commits. Basically, I want to replay all of feature's commits without creating those commits. I

[PATCH 4/3] url-match: generalize configuration collection logic

2013-07-29 Thread Junio C Hamano
Instead of always collecting the found value in the strbuf in the string list item for each found key, allow a set of callback functions to be specified by the user to be called back at strategic places. Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/config.c | 117

[PATCH 5/3] revert most of the http_options() change

2013-07-29 Thread Junio C Hamano
With the previous preparation step, the earlier 1bb6 (config: add support for http.url.* settings, 2013-07-21) that introduced many repeated changes: -if (!strcmp(http.key, var)) { +if (!strcmp(key, key)) { + if (match_is_shorter(..., OPT_KEY_NAME)) +

Re: Flatten history

2013-07-29 Thread Felipe Contreras
On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now like to get all the changes from feature but not any of the commits.

Re: Flatten history

2013-07-29 Thread Bryan Turner
On 30 July 2013 13:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now

[PATCH] sha1_file: introduce close_one_pack() to close packs on fd pressure

2013-07-29 Thread Brandon Casey
From: Brandon Casey draf...@gmail.com When the number of open packs exceeds pack_max_fds, unuse_one_window() is called repeatedly to attempt to release the least-recently-used pack windows, which, as a side-effect, will also close a pack file after closing its last open window. If a pack file

Re: Flatten history

2013-07-29 Thread Hilco Wijbenga
On 29 July 2013 20:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date with master by regularly merging master back into it. I would now

Re: Flatten history

2013-07-29 Thread Hilco Wijbenga
On 29 July 2013 20:59, Bryan Turner btur...@atlassian.com wrote: On 30 July 2013 13:50, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jul 29, 2013 at 8:42 PM, Hilco Wijbenga hilco.wijbe...@gmail.com wrote: Hi all, I have a (public) feature branch that has been kept up-to-date