- 25 9月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
This is a long overdue clean-up to the code for parsing and passing diff options. It also tightens some constness issues. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 21 9月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
Add -m/--modified to show files that have been modified wrt. the index. [jc: The original came from Brian Gerst on Sep 1st but it only checked if the paths were cache dirty without actually checking the files were modified. I also added the usage string and a new test.] Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 12 9月, 2005 1 次提交
-
-
由 Qingning Huo 提交于
Add a check before appending SHA1 signature to write_buffer, flush it first if necessary. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 17 8月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
This fixes up usage of ".." (without an ending slash) and "." (with or without the ending slash) in the git diff family. It also fixes pathspec matching for the case of an empty pathspec, since a "." in the top-level directory (or enough ".." under subdirectories) will result in an empty pathspec. We used to not match it against anything, but it should in fact match everything. Signed-off-by: NLinus Torvalds <torvalds@osdl.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 30 7月, 2005 1 次提交
-
-
由 Pavel Roskin 提交于
I have reviewed all occurrences of mmap() in git and fixed three types of errors/defects: 1) The result is not checked. 2) The file descriptor is closed if mmap() succeeds, but not when it fails. 3) Various casts applied to -1 are used instead of MAP_FAILED, which is specifically defined to check mmap() return value. [jc: This is a second round of Pavel's patch. He fixed up the problem that close() potentially clobbering the errno from mmap, which the first round had.] Signed-off-by: NPavel Roskin <proski@gnu.org> Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 15 7月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
... and make git-diff-files use it too. This all _should_ make the diffcore-pathspec.c phase unnecessary, since the diff'ers now all do the path matching early interally.
-
- 26 6月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
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: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 19 6月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
Pointed out by Junio, part of my debugging of the rewrite of the file/dir conflict handling.
-
由 Linus Torvalds 提交于
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.
-
- 10 6月, 2005 2 次提交
-
-
由 Junio C Hamano 提交于
When we choose to omit deleted entries, we should subtract numbers of such entries from the total number in the header. Signed-off-by: NJunio C Hamano <junkio@cox.net> Oops. Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
由 Linus Torvalds 提交于
Only when "-u" is used of course.
-
- 08 6月, 2005 1 次提交
-
-
由 Timo Hirvonen 提交于
Use ntohs instead of htons to convert ce_flags to host byte order Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 28 5月, 2005 1 次提交
-
-
由 David Meybohm 提交于
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: NDavid Meybohm <dmeybohmlkml@bellsouth.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 23 5月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
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.
-
由 Linus Torvalds 提交于
Add <limits.h> 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.
-
- 21 5月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
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.
-
- 20 5月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
With -u flag, git-checkout-cache picks up the stat information from newly created file and updates the cache. This removes the need to run git-update-cache --refresh immediately after running git-checkout-cache. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 18 5月, 2005 1 次提交
-
-
由 Brian Gerst 提交于
- Raw hashes should be unsigned char. - String functions want signed char. - Hash and compress functions want unsigned char. Signed-off By: Brian Gerst <bgerst@didntduck.org> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 15 5月, 2005 2 次提交
-
-
由 Brad Roberts 提交于
same_name -> ce_same_name() remove_entry_at() -> remove_cache_entry_at() Signed-off-by: NBrad Roberts <braddr@puremagic.com> Signed-off-by: NPetr Baudis <pasky@ucw.cz>
-
由 Brad Roberts 提交于
Signed-off-by: NBrad Roberts <braddr@puremagic.com> Signed-off-by: NPetr Baudis <pasky@ucw.cz>
-
- 09 5月, 2005 1 次提交
-
-
由 Junio C Hamano 提交于
Changes "if (pointer == 0)" to "if (!pointer)" to match the rest of the code, noticed by Petr Baudis. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 08 5月, 2005 2 次提交
-
-
由 Junio C Hamano 提交于
When "path" exists as a file or a symlink in the index, an attempt to add "path/file" is refused because it results in file vs directory conflict. Similarly when "path/file1", "path/file2", etc. exist, an attempt to add "path" as a file or a symlink is refused. With git-update-cache --replace, these existing entries that conflict with the entry being added are automatically removed from the cache, with warning messages. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
由 Junio C Hamano 提交于
And vice versa. The next commit will introduce an option --replace to allow replacing existing entries. Signed-off-by: NJunio C Hamano <junkio@cox.net>
-
- 07 5月, 2005 2 次提交
-
-
由 Junio C Hamano 提交于
Some commands initialize sha1_file_directory by hand. There is no need to do so; sha1_file.c knows how to handle it. The next patch will remove the variable altogether. Signed-off-by: NJunio C Hamano <junkio@cox.net> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
由 Linus Torvalds 提交于
It didn't properly mark all cache updates as being dirty, and causes merge errors due to that. In particular, it didn't notice when a file was force-removed. Besides, it was ugly as hell. I've put in place a slightly cleaner version, but I've not enabled the optimization because I don't want to be burned again.
-
- 06 5月, 2005 1 次提交
-
-
由 Kay Sievers 提交于
Fix update-cache to compare the blob of a symlink against the link-target and not the file it points to. Also ignore all permissions applied to links. Thanks to Greg for recognizing this while he added our list of symlinks back to the udev repository. Signed-off-by: NKay Sievers <kay.sievers@vrfy.org> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 05 5月, 2005 1 次提交
-
-
由 Kay Sievers 提交于
Allow to store and track symlink in the repository. A symlink is stored the same way as a regular file, only with the appropriate mode bits set. The symlink target is therefore stored in a blob object. This will hopefully make our udev repository fully functional. :) Signed-off-by: NKay Sievers <kay.sievers@vrfy.org> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 27 4月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
We now modify the in-memory copy of the index file in "diff-cache", so we need to add PROT_WRITE.
-
由 Christopher Li 提交于
Introduce xmalloc and xrealloc to die gracefully with a descriptive message when out of memory, rather than taking a SIGSEGV. Signed-off-by: Christopher Li<chrislgit@chrisli.org> Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 23 4月, 2005 1 次提交
-
-
由 Linus Torvalds 提交于
This one is about a million times simpler, and much more likely to be correct too. Instead of trying to match up a tree object against the index, we just read in the tree object side-by-side into the index, and just walk the resulting index file. This was what all the read-tree cleanups were all getting to.
-
- 22 4月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
We use that to specify alternative index files, which can be useful if you want to (for example) generate a temporary index file to do some specific operation that you don't want to mess with your main one with. It defaults to the regular ".git/index" if it hasn't been specified.
-
由 Linus Torvalds 提交于
The rev-tree thing just happened to work. It shouldn't have.
-
- 21 4月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
This allows us to both calculate it and verify it faster.
-
由 Linus Torvalds 提交于
No point in making 17,000 small writes when you can make just a couple of hundred nice 8kB writes instead and save a lot of time.
-
- 19 4月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
Do the usage and error reporting in "usage.c", and the sha1 file accesses in "sha1_file.c". Small, nice, easily separated parts. Good.
-
由 James Bottomley 提交于
I noticed this when I tried a non-trivial scsi merge and checked the results against BK. The problem is that remove_entry_at() actually decrements active_nr, so decrementing it in add_cache_entry() before calling remove_entry_at() is a double decrement (hence we lose cache entries at the end).
-
- 18 4月, 2005 2 次提交
-
-
由 Petr Baudis 提交于
This fixes show-diff listing all +x files as differring. Signed-off-by: NPetr Baudis <pasky@ucw.cz> [ That's what I get for working on a G5 - my testing was all big-endian in the first place. -- Linus ] Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
由 Junio C Hamano 提交于
When update-cache --remove is run, resolve unmerged state for the path. This is consistent with the update-cache --add behaviour. Essentially, the user is telling us how he wants to resolve the merge by running update-cache. Signed-off-by: NJunio C Hamano <junkio@cox.net> Fixed to do the right thing at the end. Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
-
- 17 4月, 2005 2 次提交
-
-
由 Linus Torvalds 提交于
We only really care about the difference between a file being executable or not (by its owner). Everything else we leave for the user umask to decide.
-
由 Linus Torvalds 提交于
This allows you to actually tell git that you've resolved a conflict.
-