Re: [PATCH] Documentation/log: fix description of format.pretty

2012-11-12 Thread Jonathan Nieder
Hi Ram, Ramkumar Ramachandra wrote: 59893a88 (Documentation/log: add a CONFIGURATION section, 2010-05-08) mentioned that `format.pretty` is the default for the `--format` option. Such an option never existed, False. Have you tried it? Thanks, Jonathan -- To unsubscribe from this list:

git imap-send with HTML preformatting broken for multipart messages

2012-11-12 Thread Michael Haggerty
I just noticed that git imap-send with imap.preformattedHTML turned on is broken for multipart messages. The problem is that git imap-send embeds *everything* after the main email header in pre/pre and HTML-escapes it, instead of splitting out the email parts and quoting their bodies

Re: [PATCHv2] replace: parse revision argument for -d

2012-11-12 Thread Michael J Gruber
Jeff King venit, vidit, dixit 09.11.2012 17:48: On Mon, Oct 29, 2012 at 02:23:27PM +0100, Michael J Gruber wrote: 'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the

Re: [PATCH] Documentation/log: fix description of format.pretty

2012-11-12 Thread Ramkumar Ramachandra
Hi Jonathan, Jonathan Nieder wrote: Hi Ram, Ramkumar Ramachandra wrote: 59893a88 (Documentation/log: add a CONFIGURATION section, 2010-05-08) mentioned that `format.pretty` is the default for the `--format` option. Such an option never existed, False. Have you tried it? Oops, I read

Re: [PATCH v5 11/15] remote-testgit: make clear the 'done' feature

2012-11-12 Thread Max Horn
On 11.11.2012, at 22:22, Felipe Contreras wrote: On Sun, Nov 11, 2012 at 9:49 PM, Max Horn m...@quendi.de wrote: On 11.11.2012, at 14:59, Felipe Contreras wrote: People seeking for reference would find it useful. Hm, I don't understand this commit message. Probably means I am j git

Re: git merge commits are non-deterministic? what changed?

2012-11-12 Thread Michael J Gruber
Ulrich Spörlein venit, vidit, dixit 09.11.2012 19:27: On Fri, 2012-11-09 at 11:16:47 -0500, Jeff King wrote: On Fri, Nov 09, 2012 at 04:52:48PM +0100, Matthieu Moy wrote: Ulrich Spörlein u...@spoerlein.net writes: 2. Why the hell is the commit hash dependent on the ordering of the parent

RE: Failure using webdav basic auth by git client

2012-11-12 Thread Pyeron, Jason J CTR (US)
-Original Message- From: Jeff King Sent: Sunday, November 11, 2012 1:29 PM On Sun, Nov 11, 2012 at 01:09:02PM -0500, Jason Pyeron wrote: My google fu has failed me on this issue. I am trying to setup http(s) repositories for git. If I require authenticated users then git

Re: Help requested - trying to build a tool doing whole-tree commits

2012-11-12 Thread ydirson
esr: Junio C Hamano gitster at pobox.com: Perhaps not exactly what you are looking for, but don't we have import-tar somewhere in contrib/fast-import hierarchy (sorry, not on a machine yet, and I cannot give more details). If I recall correctly, that can only be used for original import. You

[PATCHv3] replace: parse revision argument for -d

2012-11-12 Thread Michael J Gruber
'git replace' parses the revision arguments when it creates replacements (so that a sha1 can be abbreviated, e.g.) but not when deleting replacements. Make it parse the argument to 'replace -d' in the same way. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: v3

RE: git-svn with ignore-paths misses/skips some revisions during fetch

2012-11-12 Thread McHenry, Matt
Enrico asked: Could it be that certain files spent parts of their historical lifetime inside the ignored paths ? I left out one possibly important piece of information: My initial 'git svn fetch' used '-r' to cauterize the history, both because there is a lot of it (almost 12 years)

Re: [PATCH] Documentation/log: fix description of format.pretty

2012-11-12 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Oops, I read about `--pretty` in pretty-formats.txt and didn't realize that `--format` existed. However, your patch is still wrong because there seems to be a subtle (and confusing) difference between `--pretty` and `--format`. In the latter, you can't omit the

Re: [PATCH v5 11/15] remote-testgit: make clear the 'done' feature

2012-11-12 Thread Jonathan Nieder
Max Horn wrote: Aha, now I understand what this patch is about. So I would suggest this alternate commit message: remote-testgit: make it explicit clear that we use the 'done' feature Previously we relied on passing '--use-done-feature ' to git fast-export, which is easy to miss when

splitting off shell test framework

2012-11-12 Thread Adam Spiers
Hi all, I've been pretty impressed with git's test framework, and I'm not aware of many other (decent) shell-based test frameworks out there. (One that springs to mind is the one used by rvm, but last time I looked - admittedly a while ago now - it had limitations). Recently a situation arose

Re: [PATCH v5 11/15] remote-testgit: make clear the 'done' feature

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 4:45 PM, Jonathan Nieder jrnie...@gmail.com wrote: Max Horn wrote: Aha, now I understand what this patch is about. So I would suggest this alternate commit message: remote-testgit: make it explicit clear that we use the 'done' feature Previously we relied on

Re: splitting off shell test framework

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 5:37 PM, Adam Spiers g...@adamspiers.org wrote: I've been pretty impressed with git's test framework, and I'm not aware of many other (decent) shell-based test frameworks out there. (One that springs to mind is the one used by rvm, but last time I looked - admittedly a

RE: splitting off shell test framework

2012-11-12 Thread Pyeron, Jason J CTR (US)
-Original Message- From: Felipe Contreras Sent: Monday, November 12, 2012 11:44 AM On Mon, Nov 12, 2012 at 5:37 PM, Adam Spiers g...@adamspiers.org wrote: I've been pretty impressed with git's test framework, and I'm not aware of many other (decent) shell-based test frameworks

Re: [regression] Newer gits cannot clone any remote repos

2012-11-12 Thread Kevin
Maybe handy to say that you're on a Powerpc platform. On Mon, Nov 12, 2012 at 5:32 PM, Douglas Mencken dougmenc...@gmail.com wrote: *Any* git clone fails with: fatal: premature end of pack file, 106 bytes missing fatal: index-pack failed At first, I tried 1.8.0, and it failed. Then I tried

[PATCH 0/4] remote-hg: small fixes

2012-11-12 Thread Felipe Contreras
Hi, Just a few fixes, nothing major. Felipe Contreras (3): remote-hg: fix compatibility with older versions of hg remote-hg: try the 'tip' if no checkout present remote-hg: avoid bad refs Ramkumar Ramachandra (1): remote-hg: add missing config for basic tests

[PATCH 1/4] remote-hg: add missing config for basic tests

2012-11-12 Thread Felipe Contreras
From: Ramkumar Ramachandra artag...@gmail.com 'hg commit' fails otherwise in some versiosn of mercurial because of the missing user information. Other versions simply throw a warning and guess though. Signed-off-by: Ramkumar Ramachandra artag...@gmail.com Signed-off-by: Felipe Contreras

[PATCH 2/4] remote-hg: fix compatibility with older versions of hg

2012-11-12 Thread Felipe Contreras
Turns out repo.revs was introduced quite late, and it doesn't do anything fancy for our refspec; only list all the numbers in that range. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

[PATCH 3/4] remote-hg: try the 'tip' if no checkout present

2012-11-12 Thread Felipe Contreras
There's no concept of HEAD in mercurial, but let's try our best to do something sensible. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-hg | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg

[PATCH 4/4] remote-hg: avoid bad refs

2012-11-12 Thread Felipe Contreras
Turns out fast-export throws bad 'reset' commands because of a behavior in transport-helper that is not even needed. Either way, better to ignore them, otherwise the user will get warnings when we OK them. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com ---

Re: [PATCH] Documentation/log: fix description of format.pretty

2012-11-12 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Ramkumar Ramachandra wrote: Oops, I read about `--pretty` in pretty-formats.txt and didn't realize that `--format` existed. However, your patch is still wrong because there seems to be a subtle (and confusing) difference between `--pretty` and

Re: [PATCH 1/2] git-sh-setup: refactor ident-parsing functions

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: The only ident-parsing function we currently provide is get_author_ident_from_commit. This is not very flexible for two reasons: 1. It takes a commit as an argument, and can't read from commit headers saved on disk. 2. It will only parse authors,

Re: [PATCH] Re:gitweb: add readme to overview page

2012-11-12 Thread Junio C Hamano
Heinrich Schuchardt xypron.g...@gmx.de writes: In this version of the patch the formatting has been corrected. Warnings for double / in filenames are avoided. Signed-off-by: Heinrich Schuchardt xypron.g...@gmx.de --- The above is *not* a proper log message. Those of us who are reading

Re: [PATCH v5 01/15] fast-export: avoid importing blob marks

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: Major issue: echo -n is still not portable. Could we simply use touch marks-cur touch marks-new Yes, echo -n is definitely not portable. Our preferred way of creating an empty file is just file. Yes. And it is misleading to use touch in this case;

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-12 Thread Junio C Hamano
A Large Angry SCM gitzi...@gmail.com writes: On 11/11/2012 07:41 AM, Felipe Contreras wrote: On Sat, Nov 10, 2012 at 8:25 PM, A Large Angry SCMgitzi...@gmail.com wrote: On 11/10/2012 01:43 PM, Felipe Contreras wrote: So, the options are: a) Leave the name conversion to the export tools,

Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote: This patch addresses Junios comment in WC: Misapplication of a patch fixed; the ones near the tip needs to update the links to point at the html files, though. See older mail in this thread:

Re: [PATCHv3 3/4] git-status: show short sequencer state

2012-11-12 Thread Junio C Hamano
Phil Hord ho...@cisco.com writes: State token strings which may be emitted and their meanings: merge a merge is in progress am an am is in progress am-is-emptythe am patch is empty rebase a rebase is in progress

Re: Strange behaviour of git diff branch1 ... branch2

2012-11-12 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sat, Oct 27, 2012 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Nguyen Thai Ngoc Duy pclo...@gmail.com wrote: Notice the --cc in the first line, which is combined diff. Usually combined-diff is between two points and one parent. Though

Re: [PATCH v3 0/8] Fix GIT_CEILING_DIRECTORIES that contain symlinks

2012-11-12 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The log message of the original commit (0454dd93bf) described the following scenario: a /home partition under which user home directories are automounted, and setting GIT_CEILING_DIRECTORIES=/home to avoid hitting /home/.git, /home/.git/objects,

Re: [PATCHv3 3/4] git-status: show short sequencer state

2012-11-12 Thread Phil Hord
Junio C Hamano wrote: Phil Hord ho...@cisco.com writes: State token strings which may be emitted and their meanings: merge a merge is in progress am an am is in progress am-is-emptythe am patch is empty rebase a rebase is in

Re: splitting off shell test framework

2012-11-12 Thread Drew Northup
On Mon, Nov 12, 2012 at 11:37 AM, Adam Spiers g...@adamspiers.org wrote: Hi all, I've been pretty impressed with git's test framework, and I'm not aware of many other (decent) shell-based test frameworks out there. (One that springs to mind is the one used by rvm, but last time I looked -

Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 09:45:31AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote: This patch addresses Junios comment in WC: Misapplication of a patch fixed; the ones near the tip needs to update the

Re: [regression] Newer gits cannot clone any remote repos

2012-11-12 Thread Douglas Mencken
On Mon, Nov 12, 2012 at 12:12 PM, Kevin i...@ikke.info wrote: Maybe handy to say that you're on a Powerpc platform. Oh, and yes, I'm on 2 x 2-core (4-core) machine. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [PATCH 1/2] git-sh-setup: refactor ident-parsing functions

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 09:44:01AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: The only ident-parsing function we currently provide is get_author_ident_from_commit. This is not very flexible for two reasons: 1. It takes a commit as an argument, and can't read from

Re: [PATCH 2/5] launch_editor: ignore SIGINT while the editor has control

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 09:44:49AM -0800, Junio C Hamano wrote: How did this message happen? Subject: [PATCH 2/5] launch_editor: ignore SIGINT while the editor has control To: Kalle Olavi Niemitalo k...@iki.fi Cc: Paul Fox p...@foxharp.boston.ma.us, git@vger.kernel.org

Fwd: [PATCH] Add tcsh-completion support to contrib by using git-completion.bash

2012-11-12 Thread Marc Khouzam
Hi, this patch allows tcsh-users to get the benefits of the awesome git-completion.bash script. It could also help other shells do the same. == The current tcsh-completion support for Git, as can be found on the internet, takes the approach of defining the possible completions explicitly.

Re: [PATCH 1/2] git-sh-setup: refactor ident-parsing functions

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: Changing the interface for get_author_ident_from_commit would be a pain, but if we just wanted to help filter-branch, we could do something like this: Yes, that is the direction I was alluding to. Callers of get_author_ident_from_commit can also do the same

Re: [PATCH 1/2] git-sh-setup: refactor ident-parsing functions

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 12:08:37PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Changing the interface for get_author_ident_from_commit would be a pain, but if we just wanted to help filter-branch, we could do something like this: Yes, that is the direction I was

Re: [Patch 1/1] Wire html for all files in ./technical and ./howto in Makefile

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Nov 12, 2012 at 09:45:31AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: On Mon, Oct 29, 2012 at 07:33:47PM +0100, Thomas Ackermann wrote: This patch addresses Junios comment in WC: Misapplication of a patch fixed; the ones near

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 03:24:13PM -0500, Jeff King wrote: I think the right answer is going to be a well-placed call to esc_html. I'm guessing the right answer is this: diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 10ed9e5..a51a8ba 100755 --- a/gitweb/gitweb.perl +++

Re: [PATCH 1/4] remote-hg: add missing config for basic tests

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 06:41:05PM +0100, Felipe Contreras wrote: From: Ramkumar Ramachandra artag...@gmail.com 'hg commit' fails otherwise in some versiosn of mercurial because of s/versiosn/versions/ +setup () { + ( + echo [ui] + echo username = A U Thor aut...@example.com

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Nov 12, 2012 at 03:24:13PM -0500, Jeff King wrote: I think the right answer is going to be a well-placed call to esc_html. I'm guessing the right answer is this: diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 10ed9e5..a51a8ba 100755 ---

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 6:45 PM, Junio C Hamano gits...@pobox.com wrote: A Large Angry SCM gitzi...@gmail.com writes: On 11/11/2012 07:41 AM, Felipe Contreras wrote: On Sat, Nov 10, 2012 at 8:25 PM, A Large Angry SCMgitzi...@gmail.com wrote: On 11/10/2012 01:43 PM, Felipe Contreras wrote:

Re: [PATCH] Update cygwin.c for new mingw-64 win32 api headers

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 07:17:20PM -0500, Mark Levedahl wrote: The cygwin project recently switched to a new implementation of the windows api, now using header files from the mingw-64 project. These new header files are incompatible with the way cygwin.c included the old headers: cygwin.c

Re: RFD: fast-import is picky with author names (and maybe it should - but how much so?)

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 10:41 PM, Jeff King p...@peff.net wrote: On Sun, Nov 11, 2012 at 07:48:14PM +0100, Felipe Contreras wrote: 3. Exporters should not use it if they have any broken-down representation at all. Even knowing that the first half is a human name and the second

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Joe Perches
On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: cc-cmd is only per-file, and many times receipients get lost without seing the full patch series. s/seing/seeing [...] Looks good otherwise. s/receipients/recipients/ too Practically this is ok

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 11:52 PM, Joe Perches j...@perches.com wrote: On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: cc-cmd is only per-file, and many times receipients get lost without seing the full patch series. s/seing/seeing [...] Looks

Re: [BUG] gitweb: XSS vulnerability of RSS feed

2012-11-12 Thread Andreas Schwab
Drew Northup n1xim.em...@gmail.com writes: Something like this may be useful to defuse the file parameter, but I presume a more definitive fix is in order... A proper fix will have to add esc_html to the feed generation, something like this (untested): diff --git a/gitweb/gitweb.perl

Re: splitting off shell test framework

2012-11-12 Thread Adam Spiers
On Mon, Nov 12, 2012 at 6:18 PM, Drew Northup n1xim.em...@gmail.com wrote: On Mon, Nov 12, 2012 at 11:37 AM, Adam Spiers g...@adamspiers.org wrote: As it turned out to be fairly easy, I was wondering if there would be any interest in doing this more formally, i.e. splitting off the framework

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Joe Perches
On Tue, 2012-11-13 at 00:03 +0100, Felipe Contreras wrote: On Mon, Nov 12, 2012 at 11:52 PM, Joe Perches j...@perches.com wrote: On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: cc-cmd is only per-file, and many times receipients get lost without

Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 11:27:14PM +0100, Jean-Jacques Lafay wrote: 2012/11/11 Jeff King p...@peff.net: On Sun, Nov 11, 2012 at 05:46:32PM +0100, René Scharfe wrote: Ultimately, I have some ideas for doing this in a breadth-first way, which would make it more naturally iterative. It

Re: git log to use .mailmap by default?

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 04:13:19AM -0800, Jason Timrod wrote: I note that when defining a .mailmap file, that it's honoured by git-shotlog(1) by default, but for git-log(1) I have to define an entirely new --pretty= formatting option to use it. Why is this?  Why doesn't git-log honour this

Re: [PATCH] gitweb: git_summary - show $project in title

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 06:20:58AM +0100, Henrich Schuchardt wrote: Gitweb pages are structured by divs of class title with grey background. The shortlog, and the log page show the project name as the first title. Page summary only shows an empty grey box above the project details. This

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 06:06:50PM +0100, Felipe Contreras wrote: There's no point in asking this over and over if the user already properly configured his/her name and email. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- I got really tired of 'git send-email' always

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 12:13 AM, Joe Perches j...@perches.com wrote: On Tue, 2012-11-13 at 00:03 +0100, Felipe Contreras wrote: On Mon, Nov 12, 2012 at 11:52 PM, Joe Perches j...@perches.com wrote: On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote:

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Joe Perches
On Tue, 2012-11-13 at 00:37 +0100, Felipe Contreras wrote: On Tue, Nov 13, 2012 at 12:13 AM, Joe Perches j...@perches.com wrote: On Tue, 2012-11-13 at 00:03 +0100, Felipe Contreras wrote: [] For --to-cmd and --cc-cmd? So basically you check the dirname of the argument passed? yes.

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 12:35 AM, Jeff King p...@peff.net wrote: On Sun, Nov 11, 2012 at 06:06:50PM +0100, Felipe Contreras wrote: There's no point in asking this over and over if the user already properly configured his/her name and email. Signed-off-by: Felipe Contreras

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 12:42:02AM +0100, Felipe Contreras wrote: Why not use Git::ident_person() here? It saves some code, and would also respect environment variables. Or better yet... I assume there was a reason why that code was asking for input; precisely because it would use the

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 07:02:17PM -0500, Jeff King wrote: The one distinction that would make sense to me is pausing to ask when we use implicit methods to look up the ident, like concatenating the username with the hostname to get the email. By the way, I suspect this is the answer to what

Re: Test failures in contrib/remote-helpers

2012-11-12 Thread Felipe Contreras
On Sun, Nov 11, 2012 at 1:48 PM, Ramkumar Ramachandra artag...@gmail.com wrote: Felipe Contreras wrote: On Sun, Nov 11, 2012 at 11:32 AM, Ramkumar Ramachandra artag...@gmail.com wrote: I'm experiencing test failures in contrib/remote-helpers. Which are your versions of hg, and bzr?

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Junio C Hamano
Joe Perches j...@perches.com writes: On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: cc-cmd is only per-file, and many times receipients get lost without seing the full patch series. s/seing/seeing [...] Looks good otherwise.

Re: [PATCH] gitweb: git_summary - show $project in title

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Sun, Nov 11, 2012 at 06:20:58AM +0100, Henrich Schuchardt wrote: Gitweb pages are structured by divs of class title with grey background. The shortlog, and the log page show the project name as the first title. Page summary only shows an empty grey box

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 1:02 AM, Jeff King p...@peff.net wrote: On Tue, Nov 13, 2012 at 12:42:02AM +0100, Felipe Contreras wrote: Why not use Git::ident_person() here? It saves some code, and would also respect environment variables. Or better yet... I assume there was a reason why that

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Nov 12, 2012 at 07:02:17PM -0500, Jeff King wrote: The one distinction that would make sense to me is pausing to ask when we use implicit methods to look up the ident, like concatenating the username with the hostname to get the email. By the way, I

Re: [PATCH 2/2] send-email: add series-cc-cmd option

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 1:37 AM, Junio C Hamano gits...@pobox.com wrote: Joe Perches j...@perches.com writes: On Tue, 2012-11-13 at 03:21 +0530, Ramkumar Ramachandra wrote: Felipe Contreras wrote: cc-cmd is only per-file, and many times receipients get lost without seing the full patch

[PATCH 0/2] remote-bzr: trivial updates

2012-11-12 Thread Felipe Contreras
Hi, Here's a fix for older versions of bzr, and a check for local repositories. Felipe Contreras (2): remote-bzr: add support for older versions of bzr remote-bzr: detect local repositories contrib/remote-helpers/git-remote-bzr | 54 +-- 1 file changed, 33

[PATCH 1/2] remote-bzr: add support for older versions of bzr

2012-11-12 Thread Felipe Contreras
At least as old as 2.0. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr b/contrib/remote-helpers/git-remote-bzr index

[PATCH 2/2] remote-bzr: detect local repositories

2012-11-12 Thread Felipe Contreras
So we don't create a clone unnecessarily. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/git-remote-bzr | 48 --- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/contrib/remote-helpers/git-remote-bzr

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Johannes Schindelin
Hi Peff, On Mon, 12 Nov 2012, Jeff King wrote: On Mon, Nov 12, 2012 at 11:27:14PM +0100, Jean-Jacques Lafay wrote: 2012/11/11 Jeff King p...@peff.net: On Sun, Nov 11, 2012 at 05:46:32PM +0100, René Scharfe wrote: Ultimately, I have some ideas for doing this in a breadth-first way,

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 01:54:59AM +0100, Felipe Contreras wrote: But we use the environment to default the field, so the distinction doesn't make much sense to me. Plus, it has always been the case that you can use git without setting user.*, but instead only using the environment. I

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 10:27:27PM -0500, Jeff King wrote: On Tue, Nov 13, 2012 at 01:54:59AM +0100, Felipe Contreras wrote: But we use the environment to default the field, so the distinction doesn't make much sense to me. Plus, it has always been the case that you can use git

Re: [PATCH v5 00/14] New remote-hg helper

2012-11-12 Thread Felipe Contreras
On Sun, Nov 11, 2012 at 11:17 PM, Chris Webb ch...@arachsys.com wrote: Felipe Contreras felipe.contre...@gmail.com writes: Implemented now. I'm not handling the 'tip' revision, but most likely it's also the '.' revision. In this case a fake 'master' bookmark will be created to track that

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 01:16:01AM +, Johannes Schindelin wrote: We can do much better than O(number of commits), though, if we stop traversing down a path when its timestamp shows that it is too old to contain the commits we are searching for. The problem is that the timestamps

Re: [PATCH 1/4] remote-hg: add missing config for basic tests

2012-11-12 Thread Felipe Contreras
On Mon, Nov 12, 2012 at 9:32 PM, Jeff King p...@peff.net wrote: On Mon, Nov 12, 2012 at 06:41:05PM +0100, Felipe Contreras wrote: From: Ramkumar Ramachandra artag...@gmail.com 'hg commit' fails otherwise in some versiosn of mercurial because of s/versiosn/versions/ +setup () { + ( +

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 4:27 AM, Jeff King p...@peff.net wrote: On Tue, Nov 13, 2012 at 01:54:59AM +0100, Felipe Contreras wrote: But we use the environment to default the field, so the distinction doesn't make much sense to me. Plus, it has always been the case that you can use git

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 04:55:25AM +0100, Felipe Contreras wrote: No, it's not. Those broken names do not come from the environment, but from our last-resort guess of the hostname. That depends how you define environment, but fine, the point is that it happens. If you have a strawman

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Johannes Schindelin
Hi Peff, On Mon, 12 Nov 2012, Jeff King wrote: On Tue, Nov 13, 2012 at 01:16:01AM +, Johannes Schindelin wrote: We can do much better than O(number of commits), though, if we stop traversing down a path when its timestamp shows that it is too old to contain the commits we are

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 04:01:11AM +, Johannes Schindelin wrote: Note that name-rev will produce wrong answers in the face of clock skew. And I think that you even wrote that code. :) IIRC the cute code to short-circuit using the date is not from me. If it is, I am very ashamed.

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Junio C Hamano
Jeff King p...@peff.net writes: Yeah. We tolerate a certain amount of skew (24 hours for --name-rev, and 5 broken commits in a row for --since). But the big ones are usually software bugs (the big kernel ones were from broken guilt, I think) or broken imports (when I published a bunch of skew

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Johannes Schindelin
Hi Peff, On Mon, 12 Nov 2012, Jeff King wrote: On Tue, Nov 13, 2012 at 04:01:11AM +, Johannes Schindelin wrote: Note that name-rev will produce wrong answers in the face of clock skew. And I think that you even wrote that code. :) IIRC the cute code to short-circuit using the

Re: Test failures in contrib/remote-helpers

2012-11-12 Thread Ramkumar Ramachandra
Felipe Contreras wrote: And here's the one for bzr: --- a/contrib/remote-helpers/git-remote-bzr +++ b/contrib/remote-helpers/git-remote-bzr @@ -646,12 +646,12 @@ def get_repo(url, alias): global dirname, peer clone_path = os.path.join(dirname, 'clone') -origin =

Re: [PATCH 2/3] diff: introduce diff.submodule configuration variable

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 10:29:05PM +0530, Ramkumar Ramachandra wrote: +static int parse_submodule_params(struct diff_options *options, const char *value, + struct strbuf *errmsg) +{ + if (!strcmp(value, log)) + DIFF_OPT_SET(options,

Re: [PATCH 3/3] submodule: display summary header in bold

2012-11-12 Thread Jeff King
On Sun, Nov 11, 2012 at 10:29:06PM +0530, Ramkumar Ramachandra wrote: Currently, 'git diff --submodule' displays output with a bold diff header for non-submodules. So this part is in bold: diff --git a/file1 b/file1 index 30b2f6c..2638038 100644 --- a/file1 +++ b/file1

Re: [PATCH 1/4] remote-hg: add missing config for basic tests

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 04:46:36AM +0100, Felipe Contreras wrote: +setup () { + ( + echo [ui] + echo username = A U Thor aut...@example.com + ) $HOME/.hgrc +} This makes sense, but I wonder if we should use something different from the git author ident set up by

Re: [msysGit] Re: [PATCH] git tag --contains : avoid stack overflow

2012-11-12 Thread Jeff King
On Mon, Nov 12, 2012 at 08:51:37PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Yeah. We tolerate a certain amount of skew (24 hours for --name-rev, and 5 broken commits in a row for --since). But the big ones are usually software bugs (the big kernel ones were from

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 5:01 AM, Jeff King p...@peff.net wrote: On Tue, Nov 13, 2012 at 04:55:25AM +0100, Felipe Contreras wrote: No, it's not. Those broken names do not come from the environment, but from our last-resort guess of the hostname. That depends how you define environment, but

Re: [PATCH 2/4] remote-hg: fix compatibility with older versions of hg

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 6:25 AM, Ramkumar Ramachandra artag...@gmail.com wrote: This patch fixes my original problem. So, Reported-by: Ramkumar Ramachandra artag...@gmail.com Tested-by: Ramkumar Ramachandra artag...@gmail.com However, test 4 in test-hg.sh still fails for me: --- expected

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Felipe Contreras
On Tue, Nov 13, 2012 at 7:42 AM, Felipe Contreras felipe.contre...@gmail.com wrote: 6) GIT_AUTHOR Who should the emails appear to be from? [Felipe Contreras 4th felipe.contrera...@gmail.com] What about after my change? 6.1) GIT_AUTHOR without anything else fatal: empty ident name (for

Re: [PATCH] send-email: add proper default sender

2012-11-12 Thread Jeff King
On Tue, Nov 13, 2012 at 07:42:58AM +0100, Felipe Contreras wrote: No, it's not. Those broken names do not come from the environment, but from our last-resort guess of the hostname. That depends how you define environment, but fine, the point is that it happens. If you have a