user/sven/git.git/cache.h, branch v1.8.3.3

Merge branch 'lf/read-blob-data-from-index'

2013-04-22T01:39:45Z

Reduce duplicated code between convert.c and attr.c. * lf/read-blob-data-from-index: convert.c: remove duplicate code read_blob_data_from_index(): optionally return the size of blob data attr.c: extract read_index_data() as read_blob_data_from_index()

Merge branch 'jn/add-2.0-u-A-sans-pathspec' (early part)

2013-04-19T20:37:36Z

In Git 2.0, "git add -u" and "git add -A" without any pathspec will update the index for all paths, including those outside the current directory, making it more consistent with "commit -a". To help the migration pain, a warning is issued when the differences between the current behaviour and the upcoming behaviour matters, i.e. when the user has local changes outside the current directory. * 'jn/add-2.0-u-A-sans-pathspec' (early part): add -A: only show pathless 'add -A' warning when changes exist outside cwd add -u: only show pathless 'add -u' warning when changes exist outside cwd add: make warn_pathless_add() a no-op after first call add: add a blank line at the end of pathless 'add [-u|-A]' warning add: make pathless 'add [-u|-A]' warning a file-global function

read_blob_data_from_index(): optionally return the size of blob data

2013-04-17T16:51:47Z

This allows for optionally getting the size of the returned data and will be used in a follow-up patch. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano

attr.c: extract read_index_data() as read_blob_data_from_index()

2013-04-17T16:49:11Z

Extract the read_index_data() function from attr.c and move it to read-cache.c; rename it to read_blob_data_from_index() and update the function signature of it to align better with index/cache API functions. This allows for reusing the function in convert.c later. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano

Merge branch 'tb/shared-perm'

2013-04-07T21:33:11Z

Simplifies adjust_shared_perm() implementation. * tb/shared-perm: path.c: optimize adjust_shared_perm() path.c: simplify adjust_shared_perm()

path.c: simplify adjust_shared_perm()

2013-04-05T19:37:55Z

All calls to set_shared_perm() use mode == 0, so simplify the function. Because all callers use the macro adjust_shared_perm(path) from cache.h to call this function, convert it to a proper function, losing set_shared_perm(). Since path.c has much more functions than just mkpath() these days, drop the stale comment about it. Signed-off-by: Torsten Bögershausen Signed-off-by: Junio C Hamano

add -u: only show pathless 'add -u' warning when changes exist outside cwd

2013-04-03T18:34:22Z

A common workflow in large projects is to chdir into a subdirectory of interest and only do work there: cd src vi foo.c make test git add -u git commit The upcoming change to 'git add -u' behavior would not affect such a workflow: when the only changes present are in the current directory, 'git add -u' will add all changes, and whether that happens via an implicit "." or implicit ":/" parameter is an unimportant implementation detail. The warning about use of 'git add -u' with no pathspec is annoying because it seemingly serves no purpose in this case. So suppress the warning unless there are changes outside the cwd that are not being added. A previous version of this patch ran two I/O-intensive diff-files passes: one to find changes outside the cwd, and another to find changes to add to the index within the cwd. This version runs one full-tree diff and decides for each change whether to add it or warn and suppress it in update_callback. As a result, even on very large repositories "git add -u" will not be significantly slower than the future default behavior ("git add -u :/"), and the slowdown relative to "git add -u ." should be a useful clue to users of such repositories to get into the habit of explicitly passing '.'. Signed-off-by: Jonathan Nieder Acked-by: Jeff King Improved-by: Junio C Hamano Signed-off-by: Junio C Hamano

Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'

2013-04-03T16:34:00Z

Consolidate repeated pathspec matches on the same paths, while fixing a bug in "git checkout dir/" code started from an unmerged index. * nd/checkout-paths-reduce-match-pathspec-calls: checkout: avoid unnecessary match_pathspec calls

Merge branch 'kb/name-hash' into maint-1.8.1

2013-04-03T15:44:54Z

* kb/name-hash: name-hash.c: fix endless loop with core.ignorecase=true

Merge branch 'kb/name-hash'

2013-04-01T15:59:53Z

The code to keep track of what directory names are known to Git on platforms with case insensitive filesystems can get confused upon a hash collision between these pathnames and looped forever. * kb/name-hash: name-hash.c: fix endless loop with core.ignorecase=true