Commits

Author Commit Message Labels Comments Date
Junio C Hamano
GIT v0.99.7d Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.7d
Junio C Hamano
Merge branch 'fixes'
Junio C Hamano
show-branch: fix commit naming breakage. It was ignoring the generation number of the commit when naming 2nd and later parents, showing "(linus^n)^2" for any <n> incorrectly as "linus^2". Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
git-grep: fix 'git grep -e $pattern' handling People typically say 'grep -e $pattern' because $pattern has a leading dash which would be mistaken as a grep flag. Make sure we pass -e in front of $pattern when we invoke grep. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
GIT 0.99.7c Contains the following post-0.99.7b fixes: - rsh.c string termination fix by H. Peter Anvin - further fetch fixes by Sergey Vlasov - diff-tree documentation by Robert Watson. - 'git diff --cached' synonymous to 'git diff --cached HEAD'. - subprocess.py licensing status clarification. Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.7c
Junio C Hamano
Really ignore generated distribution material. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from e558e33b7bdb4a7c633bedd1606f7dd7ef912933 commit)
Junio C Hamano
Merge 'fixes' branch Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Further clarify licensing status of compat/subprocess.py. PSF license explicitly states the files in Python distribution is compatible with GPL, and upstream clarified the licensing terms by shortening its file header. This version is a verbatim copy from release24-maint branch form Python CVS. Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin
[PATCH] rsh.c unterminated string The change I made to rsh.c would leave the string unterminated under certain conditions, which unfortunately always applied! This patch fixes this. For some reason this never bit on i386 or ppc, but bit me on x86-64. Fix situation where the buffer was not properly null-terminated. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] git-local-fetch: Avoid confusing error messages on packed repositories If the source repository was packed, and git-local-fetch needed to fetch a pack file, it spewed a misleading error message about not being able to find the unpacked object. Fixed by adding the warn_if_not_exists argument to copy_file(), which controls printing of error messages in case the source file does not exist. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <j…
Sergey Vlasov
[PATCH] Fix "git-local-fetch -s" with packed source repository "git-local-fetch -s" did not work with a packed repository, because symlink() happily created a link to a non-existing object file, therefore fetch_file() always returned success, and fetch_pack() was not called. Fixed by calling stat() before symlink() to ensure the file really exists. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] git-local-fetch: Avoid calling close(-1) After open() failure, copy_file() called close(ifd) with ifd == -1 (harmless, but causes Valgrind noise). The same thing was possible for the destination file descriptor. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] git-local-fetch: Fix error checking and leak in setup_indices() setup_indices() did not check the return value of opendir(), and did not have a corresponding closedir() call. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Plug memory leak in process_tree() When freeing a tree entry, must free its name too. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Do not build object ref lists The fetch code does not need object ref lists; by disabling them we can save some time and memory. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Robert Watson
[PATCH] document command to show diff of a commit Document the best way to show the change introduced by a commit, based on the suggestion by Linus on the list. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Ignore a bit more generated files. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Make 'git diff --cached' synonymous to 'git diff --cached HEAD'. When making changes to different files (i.e. dirty working tree) and committing logically separate changes in groups, often it is necessary to run 'git diff --cached HEAD' to make sure that the changes being committed makes sense. Saying 'git diff --cached' by mistake gives rather uninformative error message from git-diff-files complaining it does not understand --cached flag. Signed-off-by: Jun…
Junio C Hamano
GIT 0.99.7b Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v0.99.7b
Junio C Hamano
Merge branch 'fixes'
Sergey Vlasov
[PATCH] fetch.c: Remove call to parse_object() from process() The call to parse_object() in process() is not actually needed - if the object type is unknown, parse_object() will be called by loop(); if the type is known, the object will be parsed by the appropriate process_*() function. After this change blobs which exist locally are no longer parsed, which gives about 2x CPU usage improvement; the downside is that there will be no warnings for existing cor…
Sergey Vlasov
[PATCH] fetch.c: Clean up object flag definitions Remove holes left after deleting flags, and use shifts to emphasize that flags are single bits. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Remove redundant test of TO_SCAN in process() If the SEEN flag was not set, the TO_SCAN flag cannot be set, therefore testing it is pointless. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Remove some duplicated code in process() It does not matter if we call prefetch() or set the TO_SCAN flag before or after adding the object to process_queue. However, doing it before object_list_insert() allows us to kill 3 lines of duplicated code. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Remove redundant TO_FETCH flag The TO_FETCH flag also became redundant after adding the SEEN flag - it was set and checked in process() to prevent adding the same object to process_queue multiple times, but now SEEN guards against this. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Remove redundant SCANNED flag After adding the SEEN flag, the SCANNED flag became obviously redundant - each object can get into process_queue through process() only once, and therefore multiple calls to process_object() for the same object are not possible. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Sergey Vlasov
[PATCH] fetch.c: Make process() look at each object only once The process() function is very often called multiple times for the same object (because lots of trees refer to the same blobs), but did not have a fast check for this, therefore a lot of useless calls to has_sha1_file() and parse_object() were made before discovering that nothing needs to be done. This patch adds the SEEN flag which is used in process() to make it look at each object only once. …
Sergey Vlasov
[PATCH] fetch.c: Remove useless lookup_object_type() call in process() In all places where process() is called except the one in pull() (which is executed only once) the pointer to the object is already available, so pass it as the argument to process() instead of sha1 and avoid an unneeded call to lookup_object_type(). Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Do not give alarming error message from rsync in fetch and clone. When we check the optional objects/info/alternates file at the remote repository, we forgot to really squelch error message from rsync. Not having that file is not a crime. Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 89d844d084f14bc9506f63cd3c9aa44b21b49067 commit)
Junio C Hamano
Fix documentation dependency. Randal L. Schwartz noticed that 'make install' does not rebuild what is installed. Make the 'install' rule depend on 'man'. I noticed also 'touch' of the source files were used to express include dependencies, which is a no-no. Rewrite it to do dependencies properly, and add missing include dependencies while we are at it. Signed-off-by: Junio C Hamano <junkio@cox.net>
  1. Prev
  2. Next