[PATCH] gitk: pass --invert-grep option down to "git log"

2015-02-15 Thread Junio C Hamano
From: Christoph Junghans Date: Mon, 12 Jan 2015 18:33:32 -0700 "git log --grep=" shows only commits with messages that match the given string, but sometimes it is useful to be able to show only commits that do *not* have certain messages (e.g. "show me ones that are not FIXUP commits"). Now the

Re: [PATCH 2/3] cmd_push: pass "flags" pointer to config callback

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 11:05:57PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > This will let us manipulate any transport flags which have matching > > config options (there are none yet, but we will add one in > > the next patch). > > Nice---this will later lets us do push.atomic if

Re: Pack v4 again..

2015-02-15 Thread Junio C Hamano
Jeff King writes: > 2. Calculating reachability for packing[1] spends a lot of time in > lookup_object, as we have to go through each tree saying "have we > seen object 1234abcd yet?". If we could instead just view the > differences, we would not have to make those hash lookups f

Re: [PATCH 2/3] cmd_push: pass "flags" pointer to config callback

2015-02-15 Thread Junio C Hamano
Jeff King writes: > This will let us manipulate any transport flags which have matching > config options (there are none yet, but we will add one in > the next patch). Nice---this will later lets us do push.atomic if we really wanted to, right? > To be honest, the whole do_push is confusing to

Re: Pack v4 again..

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 11:59:02PM -0500, Nicolas Pitre wrote: > Yet, I think the biggest problem with pack v4 at the moment is the > packing algorithm for tree objects. We are piggy-backing on the pack v2 > object delta compression sorting and that produces suboptimal results > due to deep re

Re: [PATCH 0/6] test updates around diff

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 03:43:38PM -0800, Junio C Hamano wrote: > This is primarily to update t4008 that will have to be updated in > the course of "diff -B -M" work to modern standard and also make it > easier to be used as the test bed. I gave this a once-over and they all look sane. I agree wi

Re: [PATCH 3/2] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 10:11:21PM -0800, Junio C Hamano wrote: > On Sun, Feb 15, 2015 at 10:02 PM, Junio C Hamano wrote: > > On Sun, Feb 15, 2015 at 9:54 PM, Jeff King wrote: > >> > >> Or alternatively, we could pull the "flags" field from cmd_push out into > >> a static global "transport_flags

[PATCH 3/3] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Jeff King
From: Dave Olszewski Signed-off-by: Dave Olszewski --- Again, this is just a preview. Dave should send the final when he thinks it is good. The if/else I added to the config callback is kind of ugly. I wonder if we should have git_config_bit, or even just a function to set/clear a bit. Then the

[PATCH 2/3] cmd_push: pass "flags" pointer to config callback

2015-02-15 Thread Jeff King
This will let us manipulate any transport flags which have matching config options (there are none yet, but we will add one in the next patch). We could also just make "flags" a static file-scope global, but the result is a little confusing. We end up passing it along through do_push and push_with

[PATCH 1/3] cmd_push: set "atomic" bit directly

2015-02-15 Thread Jeff King
This makes the code shorter and more obvious by removing an unnecessary interim variable. Signed-off-by: Jeff King --- builtin/push.c | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/builtin/push.c b/builtin/push.c index ab99f4c..f558c2e 100644 --- a/builtin/push.c +++ b/

Re: [PATCH 3/2] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Junio C Hamano
On Sun, Feb 15, 2015 at 10:02 PM, Junio C Hamano wrote: > On Sun, Feb 15, 2015 at 9:54 PM, Jeff King wrote: >> >> Or alternatively, we could pull the "flags" field from cmd_push out into >> a static global "transport_flags", and manipulate it directly from the >> config (or if we don't like a glo

[PATCH 0/3] cleaner bit-setting in cmd_push

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 10:02:08PM -0800, Junio C Hamano wrote: > On Sun, Feb 15, 2015 at 9:54 PM, Jeff King wrote: > > > > Or alternatively, we could pull the "flags" field from cmd_push out into > > a static global "transport_flags", and manipulate it directly from the > > config (or if we don'

Re: [PATCH 3/2] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Junio C Hamano
On Sun, Feb 15, 2015 at 9:54 PM, Jeff King wrote: > > Or alternatively, we could pull the "flags" field from cmd_push out into > a static global "transport_flags", and manipulate it directly from the > config (or if we don't like a global, pass it via the config-callback > void pointer; but certai

Re: [PATCH 2/2] builtin/push.c: make push_default a static variable

2015-02-15 Thread Junio C Hamano
On Sun, Feb 15, 2015 at 9:47 PM, Jeff King wrote: > When the "push_default" flag was originally added, it was > made globally visible to all code. This might have been > useful if other commands or library calls ended up depending > on it, but as it turns out, only builtin/push.c cares. > ... > Si

[PATCH 3/2] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Jeff King
On Mon, Feb 16, 2015 at 12:45:50AM -0500, Jeff King wrote: > On Mon, Feb 16, 2015 at 12:20:49AM -0500, Jeff King wrote: > > > But here you are adding to git_default_push_config, which is in another > > file. > > > > I'm trying to figure out why git_default_push_config exists at all. The > > majo

[PATCH 1/2] git_push_config: drop cargo-culted wt_status pointer

2015-02-15 Thread Jeff King
The push config callback does not expect any incoming data via the void pointer. And if it did, it would certainly not be a "struct wt_status". This probably got picked up accidentally in b945901 (push: heed user.signingkey for signed pushes, 2014-10-22), which copied the template for the config ca

[PATCH 2/2] builtin/push.c: make push_default a static variable

2015-02-15 Thread Jeff King
When the "push_default" flag was originally added, it was made globally visible to all code. This might have been useful if other commands or library calls ended up depending on it, but as it turns out, only builtin/push.c cares. Let's make it a static variable in builtin/push.c. Since it is no lo

[PATCH 0/2] clean up push config callbacks

2015-02-15 Thread Jeff King
On Mon, Feb 16, 2015 at 12:20:49AM -0500, Jeff King wrote: > But here you are adding to git_default_push_config, which is in another > file. > > I'm trying to figure out why git_default_push_config exists at all. The > major difference from git_push_config is that the "default" variant will > get

Re: [PATCH] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Jeff King
On Sun, Feb 15, 2015 at 07:01:30PM -0800, Dave Olszewski wrote: > +push.followTags:: > + If set to true enable '--follow-tags' option by default. You > + may override this configuration at time of push by specifying > + '--no-follow-tags'. Thanks, this is something I've considered im

Re: Pack v4 again..

2015-02-15 Thread Nicolas Pitre
On Fri, 13 Feb 2015, Duy Nguyen wrote: > After taking 1.5 years "vacation" from pack v4, I plan to do something > about it again. Will post more when I have some patches to discuss. > Only one question for now (forgive me if I asked already, it's been > quite some time) Yeah. I had to re-study m

Re: [git] Re: [PATCH] push: allow --follow-tags' to be set by config push.followTags

2015-02-15 Thread Dave Olszewski
On Sun, 15 Feb 2015, Junio C Hamano wrote: > On Sun, Feb 15, 2015 at 3:39 PM, Dave Olszewski wrote: > > Signed-off-by: Dave Olszewski > > > > diff --git a/Documentation/config.txt b/Documentation/config.txt > > index ae6791d..cdb8a99 100644 > > --- a/Documentation/config.txt > > +++ b/Documentat

[PATCH] push: allow --follow-tags to be set by config push.followTags

2015-02-15 Thread Dave Olszewski
Signed-off-by: Dave Olszewski --- Documentation/config.txt | 6 ++ Documentation/git-push.txt | 5 - builtin/push.c | 5 + cache.h| 1 + config.c | 5 + contrib/completi

Re: [PATCH 1/2] git-send-email.perl: support no- prefix with older GetOptions

2015-02-15 Thread Brandon Casey
On Sun, Feb 15, 2015 at 1:51 AM, Kyle J. McKay wrote: > On Feb 14, 2015, at 22:32, Brandon Casey wrote: > >> On Fri, Feb 13, 2015 at 12:19 PM, Junio C Hamano >> wrote: >>> >>> From: "Kyle J. McKay" >>> >>> Only Perl version 5.8.0 or later is required, but that comes with >>> an older Getopt::Lon

Re: [PATCH] push: allow --follow-tags' to be set by config push.followTags

2015-02-15 Thread Junio C Hamano
On Sun, Feb 15, 2015 at 3:39 PM, Dave Olszewski wrote: > Signed-off-by: Dave Olszewski > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index ae6791d..cdb8a99 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -2079,6 +2079,9 @@ new default). > >

[PATCH] push: allow --follow-tags' to be set by config push.followTags

2015-02-15 Thread Dave Olszewski
Signed-off-by: Dave Olszewski --- Documentation/config.txt | 3 +++ Documentation/git-push.txt | 5 - cache.h| 1 + config.c | 5 + contrib/completion/git-completion.bash | 1 + environment.c

Re: [msysGit] Re: [PATCH] t/lib-httpd: switch SANITY check for NOT_ROOT

2015-02-15 Thread Junio C Hamano
Torsten Bögershausen writes: > The work to "be done", what I can see: please amend the commit message: > s/more exotic// Thanks for reminding; I thought this was excised already but apparently hasn't (yet). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mes

[PATCH 0/6] test updates around diff

2015-02-15 Thread Junio C Hamano
This is primarily to update t4008 that will have to be updated in the course of "diff -B -M" work to modern standard and also make it easier to be used as the test bed. Junio C Hamano (6): t4008: correct stale comments t9300: correct expected object names t4010: correct expected object names

[PATCH 3/6] t4010: correct expected object names

2015-02-15 Thread Junio C Hamano
The output the test expects is bogus. It was left unnoticed only because compare_diff_raw, which only cares about the add/delete/rename/copy was used to check the result. Signed-off-by: Junio C Hamano --- t/t4010-diff-pathspec.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH 2/6] t9300: correct expected object names

2015-02-15 Thread Junio C Hamano
The output the test #36 expects is bogus. There are no blob objects whose names are 36a590... or 046d037... when this test was run. It was left unnoticed only because compare_diff_raw, which only cares about the add/delete/rename/copy was used to check the result. Signed-off-by: Junio C Hamano

[PATCH 5/6] t/diff-lib: check exact object names in compare_diff_raw

2015-02-15 Thread Junio C Hamano
The "sanitize" helper wanted to strip the similarity and dissimilarity scores when making comparison, but it was stripping away the object names as well. While we do not want to require the exact object names the tests expect to be maintained, as it would be seen as an extra burden, this would hav

[PATCH 4/6] tests: do not borrow from COPYING and README from the real source

2015-02-15 Thread Junio C Hamano
These two files have been modified since the tests started using as test input, making the exact object names they expect to be different from what actually happens in the trash repository they use to run tests. Instead, take a snapshot of these two files and keep them in t/diff-lib/ so that we ca

[PATCH 1/6] t4008: correct stale comments

2015-02-15 Thread Junio C Hamano
A complete rewrite of a single file was originally designed to be expressed as a deletion immediately followed by a creation of the same file, and the comments in the test updated here were written to reflect that design decision made in f345b0a0 (Add -B flag to diff-* brothers., 2005-05-30). Howe

[PATCH 6/6] t4008: modernise style

2015-02-15 Thread Junio C Hamano
Update this ancient test script to a more modern style in which the expected result is prepared inside the body of the test that uses it. Also, instead of using $tree, a shell variable, throughout the test script, create a tag that points at it, to make it easier to manually debug the test script

[PATCH 2/2] daemon: use callback to build interpolated path

2015-02-15 Thread René Scharfe
Provide a callback function for strbuf_expand() instead of using the helper strbuf_expand_dict_cb(). While the resulting code is longer, it only looks up the canonical hostname and IP address if at least one of the placeholders %CH and %IP are used with --interpolated-path. Use a struct for passi

[PATCH 1/2] daemon: look up client-supplied hostname lazily

2015-02-15 Thread René Scharfe
Look up canonical hostname and IP address using getaddrinfo(3) or gethostbyname(3) only if --interpolated-path or --access-hook were specified. Do that by introducing getter functions for canon_hostname and ip_address and using them for all read accesses. These wrappers call the new helper lookup