[PATCH v6 0/3]

This re-roll fixes a couple more issues found by Johannes Sixt: use of a size_t instead of an unsigned long, and a broken -chain. -- 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

[PATCH v6 3/3] cat-file: add --follow-symlinks to --batch

From: David Turner dtur...@twitter.com This wires the in-repo-symlink following code through to the cat-file builtin. In the event of an out-of-repo link, cat-file will print the link in a new format. Signed-off-by: David Turner dtur...@twitter.com --- Documentation/git-cat-file.txt | 54

[PATCH v7 0/3]

This version of the patch adds improved error outputs for various weird situations that can come up during symlink resolution. It also improves the documentation, following suggestions by Junio Hamano. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

[PATCH 1/2] merge-recursive.c: Fix case-changing merge.

From: David Turner dtur...@twitter.com On a case-insensitive filesystem, when merging, a file would be wrongly deleted from the working tree if an incoming commit had renamed it changing only its case. When merging a rename, the file with the old name would be deleted -- but since the filesystem

[PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems

From: David Turner dtur...@twitter.com Make it possible to change the case of a filename on a case-insensitive filesystem using git mv. Change git mv to allow moves where the destination file exists if the destination file has the same name as the source file ignoring case. Signed-off-by: David

[PATCH 0/2] Re: ignorecase: Fix git mv on insensitive filesystems

Torsten Bögershausen wrote: On 05/08/2014 08:37 AM, Johannes Sixt wrote: What if both inums are zero? Can this happen on any sane POSIX system? I don't know, but my gut feeling is that inode zero is too special to be allocated for files or directories. In that case, it is safe to assume

[PATCH 2/2] ignorecase: Fix git mv on insensitive filesystems

From: David Turner dtur...@twitter.com Make it possible to change the case of a filename on a case-insensitive filesystem using git mv. Change git mv to allow moves where the destination file exists if either the destination file has the same inode as the source file (for Mac) or the same name

[PATCH 1/2] merge-recursive.c: Fix case-changing merge.

From: David Turner dtur...@twitter.com On a case-insensitive filesystem, when merging, a file would be wrongly deleted from the working tree if an incoming commit had renamed it changing only its case. When merging a rename, the file with the old name would be deleted -- but since the filesystem

[PATCH 1/3] After chdir to run grep, return to old directory

From: David Turner dtur...@twitter.com Signed-off-by: David Turner dtur...@twitter.com --- builtin/grep.c | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/builtin/grep.c b/builtin/grep.c index 69ac2d8..e9fe040 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@

Watchman support for git

The most sigificant patch uses Facebook's watchman daemon[1] to monitor the repository work tree for changes. This makes allows git status to avoid traversing the entire work tree to find changes. This change requires libwatchman[2], a client library that I wrote for watchman. While making the