Re: Troubleshoot clone issue to NFS.

2015-05-24 Thread Duy Nguyen
On Fri, May 22, 2015 at 2:12 PM, Jeff King p...@peff.net wrote: So I think there are two possibilities for improving this: 1. Find places where we expect the object will not exist (like the collision_test check you pointed out) and use a has_sha1_file_fast that accepts that it may

Re: [PATCH 2/2] git-p4: fix handling of multi-word P4EDITOR

2015-05-24 Thread Luke Diamand
On 07/05/15 23:16, Junio C Hamano wrote: Luke Diamand l...@diamand.org writes: [Resurrecting old thread] Looking at run-command.c, GIT_WINDOES_NATIVE and POSIX seems to use pretty much the same construct, except that they use SHELL_PATH instead of sh. I think the state of git on Windows

Re: recovering from unordered stage entries in index error

2015-05-24 Thread Duy Nguyen
On Sat, May 23, 2015 at 9:47 AM, McHenry, Matt mmche...@carnegielearning.com wrote: So maybe you can do GIT_TRACE=2 git svn fetch and post the output. I'd expect to see something like git read-tree sha1 before fatal: unorder You can then use git ls-tree sha1 to examine this tree, try to

Re: [PATCHv3 3/3] git-p4: tests: use test-chmtime in place of touch

2015-05-24 Thread Junio C Hamano
Luke Diamand l...@diamand.org writes: diff --git a/t/t9813-git-p4-preserve-users.sh b/t/t9813-git-p4-preserve-users.sh index 166b840..fe65788 100755 --- a/t/t9813-git-p4-preserve-users.sh +++ b/t/t9813-git-p4-preserve-users.sh @@ -53,7 +53,8 @@ test_expect_success 'preserve users' '

Re: [PATCH 3/3] clone: add `--seed` shorthand

2015-05-24 Thread Junio C Hamano
Jeff King p...@peff.net writes: Having slept on it, I really think --seed should be fetch from the seed into temp refs, and not what I posted earlier. Yeah, I think that is the right way to do it. And it happens to mesh well with the (not so well advertised but not so well hidden) plan to

Re: [PATCH/RFC 0/3] --seed as an alias for --dissociate --reference

2015-05-24 Thread Michael Haggerty
Thanks for working on this. I have one little bikeshedding comment... On 05/21/2015 06:14 AM, Jeff King wrote: [...] There are a few open issues with this series: 1. Assuming that seed is a reasonable verb for this concept, is --seed=repo OK for the option? Would --seed-from=repo be

Re: 'Minimal' diff-algorithm producing a different result than 'myers', 'patience' and 'histogram' ones

2015-05-24 Thread Jeff King
On Tue, May 12, 2015 at 03:07:46PM +0200, Dmitry Malikov wrote: I'm trying to compare 4 different git-diff algorithms and the 'minimal' one is the most vague and non-obvious. The documentation says Spend extra time to make sure the smallest possible diff is produced. - that's all. By any

Re: [PATCH/RFC 0/3] using stat() to avoid re-scanning pack dir

2015-05-24 Thread Jeff King
On Sat, May 23, 2015 at 08:19:03AM +0700, Duy Nguyen wrote: On Sat, May 23, 2015 at 6:51 AM, Jeff King p...@peff.net wrote: The other problem is that I'm not sure stat data is enough to notice when a directory changes. Certainly the mtime should change, but if you have only one-second

Re: [PATCH 1/3] stat_validity: handle non-regular files

2015-05-24 Thread Jeff King
On Sat, May 23, 2015 at 01:00:06PM +0200, Michael Haggerty wrote: I don't have any insight about whether mtimes are reliable change indicators for directories. But if you make this change, you are changing the contract of the stat_validity functions: * Have you verified that no callers