git/read-cache.c, branch v0.99

[PATCH] Fix oversimplified optimization for add_cache_entry().

2005-06-25T23:52:16Z

An earlier change to optimize directory-file conflict check broke what "read-tree --emu23" expects. This is fixed by this commit. (1) Introduces an explicit flag to tell add_cache_entry() not to check for conflicts and use it when reading an existing tree into an empty stage --- by definition this case can never introduce such conflicts. (2) Makes read-cache.c:has_file_name() and read-cache.c:has_dir_name() aware of the cache stages, and flag conflict only with paths in the same stage. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds

read-cache.c: remove stray debugging printf

2005-06-19T06:34:12Z

Pointed out by Junio, part of my debugging of the rewrite of the file/dir conflict handling.

Re-implement "check_file_directory_conflict()"

2005-06-19T03:21:34Z

This is (imho) more readable, and is also a lot faster. The expense of looking up sub-directory beginnings was killing us on things like "git-diff-cache", even though that one didn't even care at all about the file vs directory conflicts. We really only care when somebody tries to add a conflicting name to stage 0. We should go through the conflict rules more carefully some day.

[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.

2005-06-10T14:42:45Z

When we choose to omit deleted entries, we should subtract numbers of such entries from the total number in the header. Signed-off-by: Junio C Hamano Oops. Signed-off-by: Linus Torvalds

git-read-tree: remove deleted files in the working directory

2005-06-09T22:34:04Z

Only when "-u" is used of course.

[PATCH] Use ntohs instead of htons to convert ce_flags to host byte order

2005-06-07T20:44:11Z

Use ntohs instead of htons to convert ce_flags to host byte order Signed-off-by: Linus Torvalds

[PATCH] check_file_directory_conflict path fix

2005-05-27T17:34:24Z

check_file_directory_conflict can give the wrong answers. This is because the wrong length is passed to cache_name_pos. The length passed should be the length of the whole path from the root, not the length of each path subcomponent. $ git-init-db defaulting to local storage area $ mkdir path && touch path/file $ git-update-cache --add path/file $ rm path/file $ mkdir path/file && touch path/file/f $ git-update-cache --add path/file/f <-- Conflict ignored $ Signed-off-by: David Meybohm Signed-off-by: Linus Torvalds

Don't care about st_dev in the index file

2005-05-22T22:08:15Z

Thomas Glanzmann points out that it doesn't work well with different clients accessing the repository over NFS - they have different views on what the "device" for the filesystem is. Of course, other filesystems may not even have stable inode numbers. But we don't care. At least for now.

Include file cleanups..

2005-05-22T18:54:17Z

Add to the include files handled by "cache.h", and remove extraneous #include directives from various .c files. The rule is that "cache.h" gets all the basic stuff, so that we'll have as few system dependencies as possible.

Introduce "base_name_compare()" helper function

2005-05-20T16:09:18Z

This one compares two pathnames that may be partial basenames, not full paths. We need to get the path sorting right, since a directory name will sort as if it had the final '/' at the end.