Re: [RFD] annnotating a pair of commit objects?

2013-01-03 Thread Jeff King
On Wed, Jan 02, 2013 at 11:03:00PM -0800, Junio C Hamano wrote: I'd like a datastore that maps a pair of commit object names to another object name, such that: * When looking at two commits A and B, efficiently query all data associated with a pair of commits X,Y where X is contained in

Re: [BUG] two-way read-tree can write null sha1s into index

2013-01-03 Thread Jeff King
On Tue, Jan 01, 2013 at 02:24:46PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: So I think we need to update twoway_merge to recognize unmerged entries, which gives us two options: 1. Reject the merge. 2. Throw away the current unmerged entry in favor of the new

Re: git filter-branch doesn't dereference annotated tags

2013-01-03 Thread Johannes Sixt
Am 03.01.2013 00:19, schrieb Junio C Hamano: Grégory Pakosz gpak...@visionobjects.com writes: So we have an annotated tag that points to a commit that is rewritten to nothing as the result of the filtering. What should happen? If the user asked to filter that tag itself, it may make sense

Re: git filter-branch doesn't dereference annotated tags

2013-01-03 Thread Grégory Pakosz
IOW, if the command was something like git filter-branch ...filter options... -- v1.0 master ... and v1.0 is an annotated tag, then it is reasonable to expect v1.0 to be deleted if the commit it points to goes away. But if the commit did not go away, but was rewritten, then it is equally

Re: [RFD] annnotating a pair of commit objects?

2013-01-03 Thread Michael Haggerty
On 01/03/2013 08:03 AM, Junio C Hamano wrote: I'd like a datastore that maps a pair of commit object names to another object name, such that: * When looking at two commits A and B, efficiently query all data associated with a pair of commits X,Y where X is contained in the range A..B

Re: [RFD] annnotating a pair of commit objects?

2013-01-03 Thread Johannes Sixt
Am 03.01.2013 08:03, schrieb Junio C Hamano: The intended use case is to go beyond rerere. Given a history of this shape: o---o---o---I mainline / O---o---X---o---Atopic A \ o---Y---o---o---B topic B Suppose in the original O we had a function

[PATCH v2 3/5] t4014: a few more tests on cover letter using branch description

2013-01-03 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- t/t4014-format-patch.sh | 21 + 1 file changed, 21 insertions(+) diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 16a4ca1..ec9ef9e 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh

Re: [PATCH] Replace git-cvsimport with a rewrite that fixes major bugs.

2013-01-03 Thread Michael Haggerty
On 01/03/2013 04:22 PM, Junio C Hamano wrote: Antoine Pelisse apeli...@gmail.com writes: Doesn't Python come with a standard subprocess module that lets you spawn external programs safely, similar to the way Perl's list form open(), e.g. open($fh, -|, 'git', @args), works? ... and of

Pretty pictures of git merge conflicts

2013-01-03 Thread Michael Haggerty
Hi, I've been thinking lately about how to attack difficult git merge conflicts. The first step is to visualize them. I have written some articles [1,2,3] describing a way to atomize a complicated merge and efficiently compute diagrams that show which pairwise commits cause the merge to go

Re: [PATCH] merge: Honor prepare-commit-msg return code

2013-01-03 Thread Antoine Pelisse
Oh, that wasn't meant as a complaint. I am tempted to rewrite the log message like so, though: 65969d4 (merge: honor prepare-commit-msg hook, 2011-02-14) tried to make git commit and git merge consistent, because a merge that required user assistance has to be concluded with git

Re: [RFH] NetBSD 6?

2013-01-03 Thread Greg Troxel
Junio C Hamano gits...@pobox.com writes: I forgot to mention that we also ship configure (and keep track of configure.ac) so that optionally people can let autoconf machinery to create config.mak.autogen to be included at the same place as handcrafted config.mak in their build process. I do

[PATCH v2 0/2] DEFAULT_DOC_TARGET

2013-01-03 Thread Junio C Hamano
This allows things like: $ DEFAULT_DOC_TARGET=html make doc $ DEFAULT_DOC_INSTALL_TARGET=html make install-doc on a platform that does not have manpage viewer. Which is not very useful, given that you can already say $ make install-html on such a platform, and these install-$format

Re: [BUG] two-way read-tree can write null sha1s into index

2013-01-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: Or are you suggesting that the three-way case should always be protected by checking that there are no unmerged entries before we start it? That seems sane to me, but I haven't confirmed that that is the case. I think the normal (and hopefully only) -m -u O A B

Re: [BUG] two-way read-tree can write null sha1s into index

2013-01-03 Thread Jeff King
On Thu, Jan 03, 2013 at 12:34:27PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Or are you suggesting that the three-way case should always be protected by checking that there are no unmerged entries before we start it? That seems sane to me, but I haven't confirmed that

Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET

2013-01-03 Thread Jeff King
On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote: On Thu, Jan 03, 2013 at 11:05:18AM -0800, Junio C Hamano wrote: This allows things like: $ DEFAULT_DOC_TARGET=html make doc $ DEFAULT_DOC_INSTALL_TARGET=html make install-doc on a platform that does not have manpage

[PATCH v2] Documentation: update howto maintain git

2013-01-03 Thread Junio C Hamano
The flow described in the document is still correct, but over time I have automated various parts of the workflow with tools and their use was not explained at all. Update it and outline the use of two key scripts from the 'todo' branch, Reintegrate and cook. Signed-off-by: Junio C Hamano

Re: git filter-branch doesn't dereference annotated tags

2013-01-03 Thread Brandon Casey
On Thu, Jan 3, 2013 at 2:33 AM, Johannes Sixt j...@kdbg.org wrote: Am 03.01.2013 10:50, schrieb Grégory Pakosz: IOW, if the command was something like git filter-branch ...filter options... -- v1.0 master ... and v1.0 is an annotated tag, then it is reasonable to expect v1.0 to be

Re: cvsps, parsecvs, svn2git and the CVS exporter mess

2013-01-03 Thread Eric S. Raymond
Michael Haggerty mhag...@alum.mit.edu: There are two good reasons that the output is written to two separate files: Those are good reasons to write to a pair of tempfiles, and I was able to deduce in advance most of what your explanation would be from the bare fact that you did it that way.

Suggested improvements to the git-p4 documentation (branch-related)

2013-01-03 Thread Olivier Delalleau
Hi, While struggling to get git-p4 to work properly with branches, I thought the documentation on http://git-scm.com/docs/git-p4 could use some improvements: 1. At the end of the Branch detection section, the following commands are provided (for when you want to explicitly provide branch

Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET

2013-01-03 Thread Jeff King
On Thu, Jan 03, 2013 at 03:32:22PM -0500, Jeff King wrote: I think the usefulness is that it can be set by default for a particular uname, so people on Windows can just type make install-doc without having to care about setting anything (though to be honest, I do not even know what they build

Re: [PATCH v2 0/2] DEFAULT_DOC_TARGET

2013-01-03 Thread Jeff King
On Thu, Jan 03, 2013 at 02:20:31PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Not surprising for such a large refactoring, but this has conflicts with what's in next. Here's the patch to apply on top of the conflicted tree you get from merging this with next: Yeah,

Re: [BUG] two-way read-tree can write null sha1s into index

2013-01-03 Thread Junio C Hamano
Jeff King p...@peff.net writes: Oh, I agree it's insane to try to carry through unmerged entries. I'm just concerned that not all code paths are careful enough to check. I would actually be surprised if some code path do assume somebody might give them an index with conflicting entries in it

Re: Lockless Refs? (Was [PATCH] refs: do not use cached refs in repack_without_ref)

2013-01-03 Thread Martin Fick
Any thoughts on this idea? Is it flawed? I am trying to write it up in a more formal generalized manner and was hoping to get at least one it seems sane before I do. Thanks, -Martin On Monday, December 31, 2012 03:30:53 am Martin Fick wrote: On Thursday, December 27, 2012 04:11:51 pm

Re: [PATCH 2/2] format-patch: give --reroll-count a short synonym -v

2013-01-03 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: +test_expect_success 'reroll count (-v)' ' + rm -fr patches + git format-patch -o patches --cover-letter -v 4 master..side list Shouldn't this be using the sticked form -v4 as described in the commit message and gitcli? I personally do not care

Fwd: Git hangs after resolving deltas when using NTLM proxy on Windows

2013-01-03 Thread Adam Baxter
Hi, Git is authenticating to my corporate proxy correctly, but is hanging after resolving deltas. This is when cloning via HTTPS. Apologies for linking to a Gist, but I'm having difficulty getting this list to accept a log file attachment. See https://gist.github.com/4448684 for the curl log.