Re: [PATCH 1/6] prompt: don't scream continuation state

2013-06-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: Even better, we can hit a middle ground by abstracting away some of the complexity. The latter half of __git_ps1 is already fairly nice; w/i/s/u/c/p and friends can serve as the basis of such an abstraction, even though r does want to be separated further. I

Re: [PATCH 6/6] completion: clarify ls-tree, archive, show completion

2013-06-04 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: Junio C Hamano wrote: I think this is the same as 5/6 and better explained in a single patch, as the rationale is the same: these commands can all take the usual revs and then paths, so using misnamed complete_FILE helper is wrong. Mind if I

Re: [PATCH v5 1/7] add simple tests of consistency across rebase types

2013-06-04 Thread Johannes Sixt
Am 6/4/2013 7:14, schrieb Martin von Zweigbergk: On Mon, Jun 3, 2013 at 3:28 PM, Junio C Hamano gits...@pobox.com wrote: + +# checks that the revisions in $2 represent a linear range with the +# subjects in $1 +test_linear_range () { + ! { git log --format=%p $2 | sane_grep ;} An

Re: [PATCH v2] core: use env variable instead of config var to turn on logging pack access

2013-06-04 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Have you ever tested this? Once log_pack_access goes to NULL (e.g. when it sees the empty string it was initialized to), this new test will happily dereference NULL. My bad. I did test when GIT_TRACE_PACK_ACCESS was set, not when it

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Antoine Pelisse
On Mon, Jun 3, 2013 at 11:10 PM, Felipe Contreras felipe.contre...@gmail.com wrote: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin. Signed-off-by: Felipe Contreras

[PATCH] Fix `git svn rebase` if top-level HEAD directory exist

2013-06-04 Thread ojab
Oh hai! I have a svn repo with the top-level directory named HEAD and `git svn rebase [HEAD] [--]` fails with $ git svn rebase fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate paths from revisions, like this: 'git command [revision...] -- [file...]' rev-list

Re: [PATCH v2] core: use env variable instead of config var to turn on logging pack access

2013-06-04 Thread Duy Nguyen
On Tue, Jun 4, 2013 at 1:26 PM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Have you ever tested this? Once log_pack_access goes to NULL (e.g. when it sees the empty string it was initialized to), this new test will happily dereference

Re: [PATCH] Fix `git svn rebase` if top-level HEAD directory exist

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 11:32:56AM +0400, ojab wrote: Oh hai! You can haz patch? I have a svn repo with the top-level directory named HEAD and `git svn rebase [HEAD] [--]` fails with $ git svn rebase fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate paths

[PATCH v3 3/6] send-email: make --suppress-cc=self sanitize input

2013-06-04 Thread Michael S. Tsirkin
--suppress-cc=self fails to filter sender address in many cases where it needs to be sanitized in some way, for example quoted: A U. Thor aut...@example.com To fix, make send-email sanitize both sender and the address it is compared against. Signed-off-by: Michael S. Tsirkin m...@redhat.com ---

[PATCH v3 6/6] test-send-email: test for pre-sanitized self name

2013-06-04 Thread Michael S. Tsirkin
Users can sanitize from address manually. Verify that these are suppressed properly. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 0d50fa7..38f407d 100755

[PATCH v3 1/6] send-email: fix suppress-cc=self on cccmd

2013-06-04 Thread Michael S. Tsirkin
When cccmd is used, old-style suppress-from filter is applied by the newer suppress-cc=self isn't. Fix this up. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- This makes one line a bit too long, but a follow-up patch fixes this up. git-send-email.perl | 2 +- 1 file changed, 1

[PATCH v3 4/6] t/send-email: add test with quoted sender

2013-06-04 Thread Michael S. Tsirkin
add test where sender address needs to be quoted. Make sure --suppress-cc=self works well in this case. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 20 1 file changed, 20 insertions(+) diff --git a/t/t9001-send-email.sh

Re: [PATCH v2 5/8] sequencer: run post-rewrite hook

2013-06-04 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: +static void run_rewrite_hook(void) +{ +struct strbuf buf = STRBUF_INIT; +struct child_process proc; +const char *argv[3]; +int code, i; + +argv[0] = find_hook(post-rewrite);

Re: Git status reports untracked on tracked files

2013-06-04 Thread Andrey Kiyanovsky
I have tried Git 1.8.3 for Windows. Case is fixed. Thank you very much! 2013/6/4 Jeff King p...@peff.net: On Wed, May 29, 2013 at 11:40:56AM +0300, Andrey Kiyanovsky wrote: Git version 1.8.1.2. for Windows Git config: [core] repositoryformatversion = 0 filemode = false

SNI (SSL virtual hosts)

2013-06-04 Thread Janusz Harkot
I was trying to to a push some repo over https and after few unsuccessful tries I've managed to find a problem - multiple virtual SSL servers on one IP address… Strange was, that initial communication was OK (http GET), but when there was http POST - git reported error (incorrect certificate).

Verbessern Sie den persönlichen Geschmack an lebensnotwendigen Gütern

2013-06-04 Thread Nanken
Leichtathletik Nike Air Jordan http://www.schuheniketraumwelt.org/nike-air-jordan begann, weil Leinwand besten und Gummisohlen Schuhe oder Stiefel mit zu gesehen worden, weil Turnschuhe. US Rubber die Firma Keds verwendet, um die primären sehr Turnschuhe im Jahr 1917 zu vermarkten. Generell

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Daniel Stenberg
On Tue, 4 Jun 2013, Janusz Harkot wrote: Strange was, that initial communication was OK (http GET), but when there was http POST - git reported error (incorrect certificate). The only workaround was to disable certificate verification. My question is: does git support SNI on the https? If so

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Janusz Harkot
It does. git uses libcurl for the HTTPS parts and it has support SNI for a long time, assuming you built libcurl with a TLS library that handles it. Which libcurl version and SSL backend is this? (curl -V usually tells) $ curl -V curl 7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0

[PATCH] git-remote-mediawiki: use git.pm functions for credentials

2013-06-04 Thread benoit . person
From: Benoit Person benoit.per...@ensimag.fr In 52dce6d, a new credential function was added to git.pm, based on git-remote-mediawiki's functions. The logical follow-up is to use those functions in git-remote-mediawiki. Signed-off-by: Benoit Person benoit.per...@ensimag.fr Signed-off-by:

Re: Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread Heiko Voigt
On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote: Sorry, I should have been more specific here. I saw that you did some changes to make submodule add do

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Daniel Stenberg
On Tue, 4 Jun 2013, Janusz Harkot wrote: Which libcurl version and SSL backend is this? (curl -V usually tells) $ curl -V curl 7.24.0 (x86_64-apple-darwin12.0) libcurl/7.24.0 OpenSSL/0.9.8r zlib/1.2.5 From what I can tell, that OpenSSL version supports SNI fine and libcurl has supported

[PATCH 00/15] Towards a more awesome git-branch

2013-06-04 Thread Ramkumar Ramachandra
Hi, Duy and I have been working on this topic for some time now. Here's a review candidate. Duy did most of the chunky work, and I mostly did review/documentation. The key patches are: [5/15] is a brilliant patch that made this entire thing possible. [10/15] is another brilliant patch to

[PATCH 01/15] for-each-ref, quote: convert *_quote_print - *_quote_buf

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com for-each-ref.c:print_value() currently prints values to stdout immediately using {sq|perl|python|tcl}_quote_print, giving us no opportunity to do any further processing. In preparation for getting print_value() to accept an additional strbuf argument

[PATCH 09/15] for-each-ref: teach verify_format() about pretty's syntax

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Pretty format accepts either ' ', '+' or '-' after '%' and before the placeholder name to modify certain behaviors. Teach verify_format() about this so that it finds atom upstream in, for example, '% (upstream)'. This is important because verify_format

[PATCH 06/15] pretty: limit recursion in format_commit_one()

2013-06-04 Thread Ramkumar Ramachandra
To make sure that a pretty_ctx-format substitution doesn't result in an infinite recursion, change the prototype of format_commit_one() to accept one last argument: no_recurse. So, a single substitution by format() must yield a result that can be parsed by format_commit_one() without the help of

[PATCH 07/15] pretty: allow passing NULL commit to format_commit_message()

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com The new formatter, for-each-ref, may use non-commit placeholders only. While it could audit the format line and warn/exclude commit placeholders, that's a lot more work than simply ignore them. Unrecognized placeholders are displayed as-is, pretty

[PATCH 15/15] for-each-ref: use get_pretty_userformat in --pretty

2013-06-04 Thread Ramkumar Ramachandra
Use get_pretty_userformat() to interpret the --pretty string. This means that leading you can now reference a format specified in a pretty.* configuration variable as an argument to 'git for-each-ref --pretty='. There are two caveats: 1. A leading format: or tformat: is automatically stripped

[PATCH 03/15] tar-tree: remove dependency on sq_quote_print()

2013-06-04 Thread Ramkumar Ramachandra
Currently, there is exactly one caller of sq_quote_print(), namely cmd_tar_tree(). In the interest of removing sq_quote_print() and simplification, replace it with an equivalent call to sq_quote_argv(). No functional changes intended. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com ---

[PATCH 14/15] pretty: introduce get_pretty_userformat

2013-06-04 Thread Ramkumar Ramachandra
This helper function is intended to be used by callers implementing --pretty themselves; it parses pretty.* configuration variables recursively and hands the user-defined format back to the caller. No builtins are supported, as CMT_FMT_* are really only useful when displaying commits. Callers

[PATCH 04/15] quote: remove sq_quote_print()

2013-06-04 Thread Ramkumar Ramachandra
Remove sq_quote_print() since it has no callers. A nicer alternative sq_quote_buf() exists: its callers aren't forced to print immediately. For historical context, sq_quote_print() was first introduced in 575ba9d6 (GIT_TRACE: show which built-in/external commands are executed, 2006-06-25) for

[PATCH 12/15] for-each-ref: introduce %(upstream:track[short])

2013-06-04 Thread Ramkumar Ramachandra
Introduce %(upstream:track) to display [ahead M, behind N] and %(upstream:trackshort) to display =, , , or appropriately (inspired by the contrib/completion/git-prompt.sh). Now you can use the following format in for-each-ref: %C(green)%(refname:short)%C(reset)%(upstream:trackshort) to

[PATCH 08/15] for-each-ref: get --pretty using format_commit_message

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com --format is very limited in its capabilities. Introduce --pretty, which extends the existing --format with pretty-formats. In --pretty: - Existing --format %(atom) is available. They also accept some pretty magic. For example, you can use %

[PATCH 13/15] for-each-ref: improve responsiveness of %(upstream:track)

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Before anything is printed, for-each-ref sorts all refs first. As part of the sorting, populate_value() is called to fill the values in for all atoms/placeholders per entry. By the time sort_refs() is done, pretty much all data is already retrieved.

[PATCH 10/15] for-each-ref: introduce format specifier %(*) and %(*)

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Pretty placeholders %(N) and %(N) require a user provided width N, which makes sense because the commit chain could be really long and the user only needs to look at a few at the top, going to the end just to calculate the best width wastes CPU cycles.

[PATCH 02/15] for-each-ref: don't print out elements directly

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Currently, the entire callchain starting from show_ref() parses and prints immediately. This inflexibility limits our ability to extend the parser. So, convert the entire callchain to accept a strbuf argument to write to. Also introduce a

[PATCH 05/15] pretty: extend pretty_print_context with callback

2013-06-04 Thread Ramkumar Ramachandra
From: Nguyễn Thái Ngọc Duy pclo...@gmail.com The struct pretty_print_context contains the context in which the placeholders in format_commit_one() should be parsed. Although format_commit_one() primarily acts as a parser, there is no way for a caller to plug in custom callbacks. Now, callers

[PATCH 11/15] for-each-ref: introduce %(HEAD) marker

2013-06-04 Thread Ramkumar Ramachandra
'git branch' shows which branch you are currently on with an '*', but 'git for-each-ref' misses this feature. So, extend the format with %(HEAD) to do exactly the same thing. Now you can use the following format in for-each-ref: %C(red)%(HEAD)%C(reset) %C(green)%(refname:short)%C(reset) to

Re: Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread John Keeping
On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote: On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote: Sorry, I should have been more specific

Re: [PATCH 00/15] Towards a more awesome git-branch

2013-06-04 Thread Duy Nguyen
On Tue, Jun 4, 2013 at 7:35 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Hi, Duy and I have been working on this topic for some time now. Here's a review candidate. I'm still hung up one the detached HEAD thing. It's a bit quirky to put in for-each-ref, but for-each-ref can't truly

Re: [PATCH v2 0/3] Towards a useable git-branch

2013-06-04 Thread Ramkumar Ramachandra
Duy Nguyen wrote: Nobody should ever parse these output with scripts. The color can be generated from color.branch.*. How do we implement color.branch.(current|local|remote|plain)? In the current code, we take a crude approach by hand-constructing argc, argv strings and passing it to

[no subject]

2013-06-04 Thread Мурад
Отправлено с iPhone

Re: [PATCH 10/15] for-each-ref: introduce format specifier %(*) and %(*)

2013-06-04 Thread Duy Nguyen
On Tue, Jun 4, 2013 at 7:35 PM, Ramkumar Ramachandra artag...@gmail.com wrote: +static unsigned int get_atom_width(struct format_one_atom_context *ctx, + const char *start, const char *end) +{ + struct strbuf sb = STRBUF_INIT; + int i, atom =

Re: [PATCH 15/15] for-each-ref: use get_pretty_userformat in --pretty

2013-06-04 Thread Duy Nguyen
On Tue, Jun 4, 2013 at 7:35 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Use get_pretty_userformat() to interpret the --pretty string. This means that leading you can now reference a format specified in a pretty.* configuration variable as an argument to 'git for-each-ref --pretty='.

Re: [PATCH v2 0/3] Towards a useable git-branch

2013-06-04 Thread Duy Nguyen
On Tue, Jun 4, 2013 at 7:52 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Duy Nguyen wrote: Nobody should ever parse these output with scripts. The color can be generated from color.branch.*. How do we implement color.branch.(current|local|remote|plain)? In the current code, we take a

git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Ian Kumlien
Hi again, Due to the earlier problem I upgraded git on all machines and eneded up with a ubunut machine running in to problems. I started getting errors like: fatal: protocol error: bad line length character: fata Which after some head scratching caused me to tell xinetd to directly launch

Re: [PATCH 3/7] unpack-trees: factor out dup_entry

2013-06-04 Thread Peter Krefting
René Scharfe: While we're add it, add → at -- \\// Peter - http://www.softwolves.pp.se/ -- 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

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 09:39:45AM -0400, Matt McClure wrote: Can `git blame` show the date that each line was merged to the current branch rather than the date it was committed? Not exactly. Git does not record when a commit entered a particular branch (or what the ours branch was called

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 04:13:14PM +0200, Ian Kumlien wrote: Due to the earlier problem I upgraded git on all machines and eneded up with a ubunut machine running in to problems. I started getting errors like: fatal: protocol error: bad line length character: fata Which after some head

Re: [PATCH] dir.c: fix ignore processing within not-ignored directories

2013-06-04 Thread Karsten Blees
Am 02.06.2013 21:25, schrieb Junio C Hamano: Duy Nguyen pclo...@gmail.com writes: + then + false + fi +' Nit pick, maybe this instead? test_must_fail grep ^one/a.1 output Neither. ! grep ^one/a.1 output Nice. I actually tried ! but without the

:6/4/2013 5:25:42 PM:

2013-06-04 Thread Matthew Mendell
http://thielois.free.fr/kk/miwrmacrfkhwwidtajnzttpnim.bnopj -- 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

Re: *** glibc detected *** git: double free or corruption (fasttop): 0x0000000001fab820 ***

2013-06-04 Thread Stefano Lattarini
On 06/04/2013 05:46 PM, Jason Gross wrote: I get *** glibc detected *** git: double free or corruption (fasttop): 0x01fab820 *** reliably on the following set of commands. I'm working on a remote machine where I don't have administrative privileges, so I can't update from git 1.7.2.5

Re: Git status reports untracked on tracked files

2013-06-04 Thread Karsten Blees
Am 04.06.2013 11:05, schrieb Andrey Kiyanovsky: I have tried Git 1.8.3 for Windows. Case is fixed. Thank you very much! 2013/6/4 Jeff King p...@peff.net: On Wed, May 29, 2013 at 11:40:56AM +0300, Andrey Kiyanovsky wrote: Git version 1.8.1.2. for Windows Git config: [core]

[PATCH] t/README: test_must_fail is for testing Git

2013-06-04 Thread Junio C Hamano
When a test wants to make sure there is no string in an output file, we should just say ! grep string output; test_must_fail is there only to test Git command and catch unusual deaths we know about (e.g. segv) as an error, not as an expected failure. Signed-off-by: Junio C Hamano

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Felipe Contreras
On Mon, Jun 3, 2013 at 4:45 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: On Mon, Jun 3, 2013 at 1:40 PM, Junio C Hamano gits...@pobox.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Pretty much what it says on the tin.

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Janusz Harkot
What makes you suggest that's what's happening? Sure, if it would've sent no or the wrong host name it would probably have that effect. line: [36] * Re-using existing connection! (#0) with host (nil) Any chance you can snoop on the network and the SSL handshake to see who's to blame?

Re: [PATCH v5 5/7] add tests for rebasing merged history

2013-06-04 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: --- +#TODO: make all flavors of rebase use --topo-order +test_run_rebase success 'e n o' '' +test_run_rebase success 'e n o' -m +test_run_rebase success 'n o e' -i I do not quite follow this TODO. While I think it would be nice to update

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Matt McClure
On Tue, Jun 4, 2013 at 11:56 AM, Jeff King p...@peff.net wrote: Aside: in some trial and error I notice this oddity: $ git blame --merges usage: git blame [options] [rev-opts] [rev] [--] file [rev-opts] are documented in git-rev-list(1) ... Your problem is not the

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: diff --git a/builtin/blame.c b/builtin/blame.c index 57a487e..0fb67af 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -1199,6 +1199,8 @@ static int num_scapegoats(struct rev_info *revs, struct commit *commit) { int cnt; struct

Re: [PATCH v3 0/6] git send-email suppress-cc=self fixes

2013-06-04 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: This includes bugfixes related to handling of --suppress-cc=self flag. Tests are also included. Hmph, flipped the patches without test-applying first? 2/6 adds two lines to test_suppress_self_quoted helper function, but that is introduced only at

Re: Can `git blame` show the date that each line was merged?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 10:28:06AM -0700, Junio C Hamano wrote: (though I suspect it would interact oddly with the --reverse option, and we would want to either declare them mutually exclusive or figure out some sane semantics). It is entirely unclear who the first child is, so I tend to

[PATCH/RFC] add --authorship-order flag to git log / rev-list

2013-06-04 Thread elliottcable
This is my first time submitting a patch to this list, so please, let me know if I'm doing any of this the wrong way! I've striven to follow `Documentation/SubmittingPatches`. I hope I've succeeded. For that matter, it's my first time diving into git's sources, so I obviously would love some

[PATCH/RFC] rev-list: add --authorship-order alternative ordering

2013-06-04 Thread elliottcable
--date-order is an excellent alternative to --topo-order if you want a feel for the *actual history*, chronologically, of your project. I use it often, with --graph as well; it's a great way to get an overview of a project's recent development history. However, in a project that rebases various

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-04 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: +xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) { xdchange_t *xch, *xchp; long max_common = 2 * xecfg-ctxlen + xecfg-interhunkctxlen; + long ignorable_context = max_common / 2 - 1; Could you explain how this

Re: [PATCH v2 3/8] cherry-pick: add --skip-empty option

2013-06-04 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: You didn't answer, what happens when you run --skip-empty and --allow-empty? I'll answer to a slightly different question: What should happen? I think it should error out, because --allow-empty is about allowing empty commits to be preserved,

Re: [PATCH] git-remote-mediawiki: use git.pm functions for credentials

2013-06-04 Thread Junio C Hamano
benoit.per...@gmail.com writes: From: Benoit Person benoit.per...@ensimag.fr In 52dce6d, a new credential function was added to git.pm, based on git-remote-mediawiki's functions. The logical follow-up is to use those functions in git-remote-mediawiki. Signed-off-by: Benoit Person

Re: [PATCH/RFC] add --authorship-order flag to git log / rev-list

2013-06-04 Thread Junio C Hamano
elliottcable m...@ell.io writes: This is my first time submitting a patch to this list, so please, let me know if I'm doing any of this the wrong way! I've striven to follow `Documentation/SubmittingPatches`. I hope I've succeeded. For that matter, it's my first time diving into git's

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Johannes Sixt
Am 04.06.2013 18:08, schrieb Jeff King: Older versions of git silently ignored errors reading config files, but it was tightened in v1.8.1.1, as there can be quite serious implications to failing to read expected config (e.g., imagine transfer.fsckobjects, or receive.deny* is ignored).

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-04 Thread Antoine Pelisse
On Tue, Jun 4, 2013 at 8:26 PM, Junio C Hamano gits...@pobox.com wrote: Antoine Pelisse apeli...@gmail.com writes: +xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) { xdchange_t *xch, *xchp; long max_common = 2 * xecfg-ctxlen + xecfg-interhunkctxlen; +

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Jonathan Nieder
Johannes Sixt wrote: Am 04.06.2013 18:08, schrieb Jeff King: However, since changing user id and leaving $HOME is so common, there is a patch under consideration to loosen the check only for the case of EACCES on files in $HOME. That commit is 4698c8f (config: allow inaccessible

Re: [PATCH/RFC] rev-list: add --authorship-order alternative ordering

2013-06-04 Thread Junio C Hamano
elliottcable m...@ell.io writes: --date-order is an excellent alternative to --topo-order if you want a feel for the *actual history*, chronologically, of your project. I use it often, with --graph as well; it's a great way to get an overview of a project's recent development history.

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: I could be remembering wrong, but I thought it was not so much under consideration as accepted for 1.8.4. I haven't heard any compelling reasons not to apply it. Would it would make sense against earlier releases as well? True; the patch is queued

Re: [PATCH] t/README: test_must_fail is for testing Git

2013-06-04 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Tuesday, June 04, 2013 5:50 PM When a test wants to make sure there is no string in an output file, we should just say ! grep string output; Small nit: It took me two readings of the commit message to correctly parse this break point. The flowing

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-04 Thread Junio C Hamano
Antoine Pelisse apeli...@gmail.com writes: On Tue, Jun 4, 2013 at 8:26 PM, Junio C Hamano gits...@pobox.com wrote: Antoine Pelisse apeli...@gmail.com writes: +xdchange_t *xdl_get_hunk(xdchange_t **xscr, xdemitconf_t const *xecfg) { xdchange_t *xch, *xchp; long max_common = 2 *

Re: [PATCH] t/README: test_must_fail is for testing Git

2013-06-04 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Tuesday, June 04, 2013 5:50 PM When a test wants to make sure there is no string in an output file, we should just say ! grep string output; Small nit: It took me two readings of the commit message to

Re: [PATCH] diff: add --ignore-blank-lines option

2013-06-04 Thread Antoine Pelisse
On Tue, Jun 4, 2013 at 10:46 PM, Junio C Hamano gits...@pobox.com wrote: OK. Thanks. I think the logic would be more like: 1. Start from xscr, find the first xchp that is !xchp-ignore; if there is none, we are done. There is no more to show. 2. Remember the xchp as the beginning.

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 12:10:25PM -0700, Jonathan Nieder wrote: However, since changing user id and leaving $HOME is so common, there is a patch under consideration to loosen the check only for the case of EACCES on files in $HOME. That commit is 4698c8f (config: allow inaccessible

Re: [PATCH 05/11] tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)

2013-06-04 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: There are many instances where the treatment of symbolic links in the object model and the algorithms are tested, but where it is not necessary to actually have a symbolic link in the worktree. Make adjustments to the tests and remove the SYMLINKS

Re: [PATCH] t/README: test_must_fail is for testing Git

2013-06-04 Thread Philip Oakley
From: Junio C Hamano gits...@pobox.com Sent: Tuesday, June 04, 2013 9:49 PM Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Sent: Tuesday, June 04, 2013 5:50 PM When a test wants to make sure there is no string in an output file, we should just say ! grep

Re: [PATCH 08/15] for-each-ref: get --pretty using format_commit_message

2013-06-04 Thread Eric Sunshine
On Tue, Jun 4, 2013 at 8:35 AM, Ramkumar Ramachandra artag...@gmail.com wrote: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com [rr: documentation] Signed-off-by: Ramkumar Ramachandra artag...@gmail.com --- Documentation/git-for-each-ref.txt | 22 - builtin/for-each-ref.c

Re: [PATCH 12/15] for-each-ref: introduce %(upstream:track[short])

2013-06-04 Thread Eric Sunshine
On Tue, Jun 4, 2013 at 8:35 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Introduce %(upstream:track) to display [ahead M, behind N] and %(upstream:trackshort) to display =, , , or appropriately (inspired by the contrib/completion/git-prompt.sh). Bikeshedding: s/trackshort/trackbrief/

Re: [PATCH 15/15] for-each-ref: use get_pretty_userformat in --pretty

2013-06-04 Thread Eric Sunshine
On Tue, Jun 4, 2013 at 8:35 AM, Ramkumar Ramachandra artag...@gmail.com wrote: Use get_pretty_userformat() to interpret the --pretty string. This means that leading you can now reference a format specified in a pretty.* s/leading// perhaps? configuration variable as an argument to 'git

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Daniel Stenberg
On Tue, 4 Jun 2013, Janusz Harkot wrote: What makes you suggest that's what's happening? Sure, if it would've sent no or the wrong host name it would probably have that effect. line: [36] * Re-using existing connection! (#0) with host (nil) Ah that. Yes, that's a stupid line to show (that

Re: [PATCH/RFC] rev-list: add --authorship-order alternative ordering

2013-06-04 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: @@ -301,7 +328,8 @@ int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long s pptr = commit_list_insert(new_parent, pptr)-next; } } -item-date = parse_commit_date(bufptr, tail); +

Re: [PATCH/RFC] rev-list: add --authorship-order alternative ordering

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 12:14:21PM -0700, Junio C Hamano wrote: diff --git a/commit.h b/commit.h index 67bd509..de07525 100644 --- a/commit.h +++ b/commit.h @@ -17,6 +17,7 @@ struct commit { void *util; unsigned int indegree; unsigned long date; + unsigned long

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Jun 04, 2013 at 12:10:25PM -0700, Jonathan Nieder wrote: However, since changing user id and leaving $HOME is so common, there is a patch under consideration to loosen the check only for the case of EACCES on files in $HOME. That commit is 4698c8f

Re: SNI (SSL virtual hosts)

2013-06-04 Thread Janusz Harkot
valid point, but from what you can find on the web, the only solution provided everywhere was to disable certificate checking… so maybe that's not me, but this is first time someone spent some time to check whats going on :) at least there will be something, maybe this will help someone…

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread Jens Lehmann
Am 04.06.2013 14:48, schrieb John Keeping: On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote: On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM +0100, John Keeping wrote:

Re: [PATCH v3 0/6] git send-email suppress-cc=self fixes

2013-06-04 Thread Michael S. Tsirkin
On Tue, Jun 04, 2013 at 10:40:51AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: This includes bugfixes related to handling of --suppress-cc=self flag. Tests are also included. Hmph, flipped the patches without test-applying first? No, I generated the patches

Re: [PATCH 05/11] tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases)

2013-06-04 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: There are many instances where the treatment of symbolic links in the object model and the algorithms are tested, but where it is not necessary to actually have a symbolic link in the worktree. diff --git a/t/t3000-ls-files-others.sh

Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread John Keeping
On Tue, Jun 04, 2013 at 11:39:25PM +0200, Jens Lehmann wrote: Am 04.06.2013 14:48, schrieb John Keeping: The problem is that sometimes you do want to adjust the path and sometimes you don't. Reading git-submodule(1), it says: This may be either an absolute URL, or (if it begins

Re: [PATCH 07/11] t2100: use test_ln_s_add to remove SYMLINKS prerequisite

2013-06-04 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: @@ -62,12 +57,7 @@ test_expect_success 'git update-index to add conflicting file path2 should fail' test_expect_success 'git update-index to add conflicting symlink path3 should fail' ' - if test_have_prereq SYMLINKS - then -

Re: [PATCH v3 0/6] git send-email suppress-cc=self fixes

2013-06-04 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: All I see in 2/6 is this: diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index e1a7f3e..f81e5f5 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -204,13 +204,15 @@

git archive --worktree-attributes doesn't exclude .gitattributes anymore

2013-06-04 Thread Gianfranco Costamagna
git version 1.8.1.2 (please cc me, I'm not subscribed to this list) Hi Developers, I write here because since my ubuntu update (quantal to raring) and git update from 1.7.10.4-1ubuntu1 to 1.8.1.2 my export script doesn't work anymore. I tried to put .gitattributes or .git/info/attributes, the

I: git archive --worktree-attributes doesn't exclude .gitattributes anymore

2013-06-04 Thread Gianfranco Costamagna
Forgot to mention, also this command doesn't work git archive --worktree-attributes  -v --format tgz -o ../boinc_7.1.7+dfsg.orig.tar.gz -9 --prefix boinc-7.1.7+dfsg/ client_release/7.1/7.1.7 Gianfranco - Messaggio inoltrato - Da: Gianfranco Costamagna

Re: Re: Re: What's cooking in git.git (May 2013, #09; Wed, 29)

2013-06-04 Thread Phil Hord
On Tue, Jun 4, 2013 at 8:48 AM, John Keeping j...@keeping.me.uk wrote: On Tue, Jun 04, 2013 at 09:17:17PM +1000, Heiko Voigt wrote: On Tue, Jun 04, 2013 at 09:10:45AM +0100, John Keeping wrote: On Tue, Jun 04, 2013 at 03:29:51PM +1000, Heiko Voigt wrote: On Mon, Jun 03, 2013 at 11:23:41PM

Re: [PATCH 02/15] for-each-ref: don't print out elements directly

2013-06-04 Thread Junio C Hamano
Ramkumar Ramachandra artag...@gmail.com writes: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Currently, the entire callchain starting from show_ref() parses and prints immediately. This inflexibility limits our ability to extend the parser. So, convert the entire callchain to accept a

Re: [PATCH 02/15] for-each-ref: don't print out elements directly

2013-06-04 Thread Duy Nguyen
On Wed, Jun 5, 2013 at 6:13 AM, Junio C Hamano gits...@pobox.com wrote: Ramkumar Ramachandra artag...@gmail.com writes: From: Nguyễn Thái Ngọc Duy pclo...@gmail.com Currently, the entire callchain starting from show_ref() parses and prints immediately. This inflexibility limits our ability

What's cooking in git.git (Jun 2013, #02; Tue, 4)

2013-06-04 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'. We are in the post-1.8.3 cycle. As promised, 'next' has been rewound. A few stalled topics have been ejected and bunch of new topics that have

[Administrivia] On ruby and contrib/

2013-06-04 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: * fc/contrib-related (2013-06-03) 4 commits - contrib: related: parse committish like format-patch - contrib: related: add option to parse from committish - contrib: related: add support for multiple patches - Add new git-related helper to contrib

Re: git archive --worktree-attributes doesn't exclude .gitattributes anymore

2013-06-04 Thread Jeff King
On Tue, Jun 04, 2013 at 11:18:59PM +0100, Gianfranco Costamagna wrote: git version 1.8.1.2 [...] I tried to put .gitattributes or .git/info/attributes, the file is the following http://pastebin.com/irngA1L8 [...] The archive gets created, but every file is inside, no exclusions at all.

  1   2   >