| ccd14e5 | Junio C Hamano | 10 January 2007, 22:16:16 UTC | Merge branch 'js/reflog' * js/reflog: Sanitize for_each_reflog_ent() | 10 January 2007, 22:16:16 UTC |
| 6fc301b | Junio C Hamano | 10 January 2007, 20:24:54 UTC | Makefile: remove $foo when $foo.exe is built/installed. On Cygwin, newly builtins are not recognized, because there exist both the executable binaries (with .exe extension) _and_ the now-obsolete scripts (without extension), but the script is executed. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 21:56:02 UTC |
| 374c590 | Jürgen Rühle | 10 January 2007, 21:36:39 UTC | send-email: work around double encoding of in-body From field. git-send-email sends out the message taken from format-patch output without quoting nor encoding. When copying the From: line to form in-body From: field, it should not copy it verbatim, because the From: for the header is quoted according to RFC 2047 when not ASCII. The original came from Jürgen Rühle, but I moved the string munging into a separate function so that later other people can tweak it more easily. Bugs introduced during the translation are mine. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 21:39:16 UTC |
| c2cb959 | Nicolas Pitre | 10 January 2007, 17:56:41 UTC | Add git-init documentation. Oops. Commit 515377ea9ec6192f82a2fa5c5b5b7651d9d6cf6c missed one file, git-init documentation. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 21:38:03 UTC |
| 1b510aa | Johannes Schindelin | 10 January 2007, 12:22:50 UTC | Fix t1410 for core.filemode==false Since c869753e, core.filemode is hardwired to false on Cygwin. So this test had no chance to succeed, since an early commit (changing just the filemode) failed, and therefore all subsequent tests. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 16:31:29 UTC |
| 9a0eaf8 | Shawn O. Pearce | 10 January 2007, 11:36:36 UTC | Make git-describe a builtin. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 16:27:01 UTC |
| 8c599c7 | Shawn O. Pearce | 10 January 2007, 11:36:29 UTC | Don't save the commit buffer in git-describe. The commit buffer (message of the commit) is not actually used by the git-describe process. We can save some memory by not keeping it around. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 16:26:50 UTC |
| e05db0f | Pavel Roskin | 10 January 2007, 04:07:11 UTC | Fix warnings in sha1_file.c - use C99 printf format if available Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 06:43:58 UTC |
| bb1091a | Junio C Hamano | 10 January 2007, 05:31:36 UTC | -u is now default for 'git-mailinfo'. Originally from David Woodhouse, but also adjusts the callers of mailinfo to the new default. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 05:32:49 UTC |
| 62c89c6 | Junio C Hamano | 10 January 2007, 05:20:01 UTC | -u is now default for 'git-applymbox' It has '-n' to disable it just in case, but do not even bother documenting it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 05:20:39 UTC |
| 3cf167b | Junio C Hamano | 10 January 2007, 05:16:45 UTC | git-am: should work when "--no-utf8 --utf8" is given Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 05:16:45 UTC |
| 1c23d79 | Shawn O. Pearce | 10 January 2007, 01:04:52 UTC | Don't die in git-http-fetch when fetching packs. My sp/mmap changes to pack-check.c modified the function such that it expects packed_git.pack_size to be populated with the total bytecount of the packfile by the caller. But that isn't the case for packs obtained by git-http-fetch as pack_size was not initialized before being accessed. This caused verify_pack to think it had 2^32-21 bytes available when the downloaded pack perhaps was only 305 bytes in length. The use_pack function then later dies with "offset beyond end of packfile" when computing the overall file checksum. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 01:54:25 UTC |
| cec21ca | Steven Grimm | 10 January 2007, 00:20:17 UTC | Update git-svn manpage to remove the implication that SVN::* is optional. Now that git-svn requires the SVN::* Perl library, the manpage doesn't need to describe what happens when you don't have it. Signed-off-by: Steven Grimm <koreth@midwinter.com> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 01:08:09 UTC |
| 6900679 | Stefan-W. Hahn | 09 January 2007, 21:04:12 UTC | Replacing the system call pread() with lseek()/xread()/lseek() sequence. Using cygwin with cygwin.dll before 1.5.22 the system call pread() is buggy. This patch introduces NO_PREAD. If NO_PREAD is set git uses a sequence of lseek()/xread()/lseek() to emulate pread. Signed-off-by: Stefan-W. Hahn <stefan.hahn@s-hahn.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 00:40:40 UTC |
| 0bdb28c | Jakub Narebski | 09 January 2007, 23:07:43 UTC | gitweb: Fix git_patchset_body not closing <div class="patch"> Fix case when git_patchset_body didn't close <div class="patch">, for patchsets with last patch empty. This patch also removes some commented out code in git_patchset_body. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 00:23:39 UTC |
| 03d311e | Alexandre Julliard | 09 January 2007, 20:27:40 UTC | git.el: Define the propertize function if needed, for XEmacs compatibility. Also use `concat' instead of `format' in the pretty-printer since format doesn't preserve properties under XEmacs. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 00:15:07 UTC |
| 3fe71f3 | Alexandre Julliard | 09 January 2007, 20:26:52 UTC | git-clone: Make sure the master branch exists before running cat on it. Otherwise we get an error like this on stderr: cat: [...]/.git/refs/remotes/origin/master: No such file or directory which makes it look like git-clone failed. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 00:14:41 UTC |
| d234b21 | Alexandre Julliard | 09 January 2007, 20:25:46 UTC | git-apply: Remove directories that have become empty after deleting a file. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 January 2007, 00:05:00 UTC |
| d93b7d1 | Jeff King | 09 January 2007, 16:11:47 UTC | get_tree_entry: map blank requested entry to tree root This means that git show HEAD: will now return HEAD^{tree}, which is logically consistent with git show HEAD:Documentation Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 22:08:41 UTC |
| 2740b2b | Junio C Hamano | 09 January 2007, 22:07:59 UTC | builtin-archive: do not free a tree held by the object layer. Found by running "git archive --format=tar HEAD" in Documentation/ directory. It's surprising that nobody has noticed this from the beginning... Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 22:07:59 UTC |
| 240897e | Junio C Hamano | 09 January 2007, 20:04:30 UTC | Merge branch 'maint' * maint: Fix "Do not ignore a detected patchfile brokenness." Do not ignore a detected patchfile brokenness. | 09 January 2007, 20:04:30 UTC |
| 6534141 | Junio C Hamano | 09 January 2007, 19:50:53 UTC | Fix "Do not ignore a detected patchfile brokenness." Returning negative value from there does not stop the caller from using the earlier part. Noticed by Linus. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 19:50:53 UTC |
| 883d60f | Johannes Schindelin | 08 January 2007, 00:59:54 UTC | Sanitize for_each_reflog_ent() It used to ignore the return value of the helper function; now, it expects it to return 0, and stops iteration upon non-zero return values; this value is then passed on as the return value of for_each_reflog_ent(). Further, it makes no sense to force the parsing upon the helper functions; for_each_reflog_ent() now calls the helper function with old and new sha1, the email, the timestamp & timezone, and the message. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 11:04:04 UTC |
| 5a17b54 | Junio C Hamano | 09 January 2007, 10:52:31 UTC | Do not ignore a detected patchfile brokenness. find_header() function is used to read and parse the patchfile and it detects errors in the patch, but one place ignored the error and went ahead, which was quite bad. Noticed by Jeff Garzik. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 10:56:43 UTC |
| 1295228 | Junio C Hamano | 09 January 2007, 07:10:49 UTC | merge-base: do not leak commit list Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 07:10:49 UTC |
| cdd4fb1 | Brian Gernhardt | 09 January 2007, 05:27:41 UTC | Auto-quote config values in config.c:store_write_pair() Suggested by Jakub Narebski <jnareb@gmail.com> on the list. When we send a value to store_write_pair(), make sure that the value that gets read out matches the one passed in. This means that for any value that contains leading or trailing whitespace or any comment character (# and ;), we need to surround it in quotes. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 06:00:18 UTC |
| baee1e9 | Brian Gernhardt | 09 January 2007, 05:27:33 UTC | Ignore git-init and git-remote These new commands weren't added to .gitignore. Add them so we don't end up with copies of them in the repo. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 05:53:23 UTC |
| 3f43d72 | Junio C Hamano | 09 January 2007, 05:52:38 UTC | rm git-rerere.perl -- it is now a built-in. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 05:52:38 UTC |
| 3486595 | Martin Langhoff | 09 January 2007, 02:10:41 UTC | cvsserver: fix revision number during file adds With this patch, cvs add / cvs commit echoes back to the client the correct file version (1.1) so that the file in the checkout is recognised as up-to-date. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 05:45:13 UTC |
| 49fb940 | Martin Langhoff | 09 January 2007, 02:10:32 UTC | cvsserver: detect early of we are up to date and avoid costly rev-list if the SHA1 of our head matches the last SHA1 seen in the DB, avoid further processing. [jc: an "Oops, please amend" patch rolled in] Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 05:44:07 UTC |
| 041e69c | J. Bruce Fields | 09 January 2007, 04:28:51 UTC | Documentation: add git-remote man page Add a preliminary man page for git-remote. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 January 2007, 05:42:37 UTC |
| c326246 | Junio C Hamano | 08 January 2007, 23:56:51 UTC | Merge branch 'jc/reflog' * jc/reflog: reflog --fix-stale: do not check the same trees and commits repeatedly. reflog expire --fix-stale Move traversal of reachable objects into a separate library. builtin-prune: separate ref walking from reflog walking. builtin-prune: make file-scope static struct to an argument. | 08 January 2007, 23:56:51 UTC |
| 480c9e5 | Andy Whitcroft | 08 January 2007, 15:58:38 UTC | short i/o: fix config updates to use write_in_full We need to check that the writes we perform during the update of the users configuration work. Convert to using write_in_full(). Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 23:44:47 UTC |
| 93822c2 | Andy Whitcroft | 08 January 2007, 15:58:23 UTC | short i/o: fix calls to write to use xwrite or write_in_full We have a number of badly checked write() calls. Often we are expecting write() to write exactly the size we requested or fail, this fails to handle interrupts or short writes. Switch to using the new write_in_full(). Otherwise we at a minimum need to check for EINTR and EAGAIN, where this is appropriate use xwrite(). Note, the changes to config handling are much larger and handled in the next patch in the sequence. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 23:44:47 UTC |
| 93d26e4 | Andy Whitcroft | 08 January 2007, 15:58:08 UTC | short i/o: fix calls to read to use xread or read_in_full We have a number of badly checked read() calls. Often we are expecting read() to read exactly the size we requested or fail, this fails to handle interrupts or short reads. Add a read_in_full() providing those semantics. Otherwise we at a minimum need to check for EINTR and EAGAIN, where this is appropriate use xread(). Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 23:44:47 UTC |
| e081405 | Andy Whitcroft | 08 January 2007, 15:57:52 UTC | short i/o: clean up the naming for the write_{in,or}_xxx family We recently introduced a write_in_full() which would either write the specified object or emit an error message and fail. In order to fix the read side we now want to introduce a read_in_full() but without an error emit. This patch cleans up the naming of this family of calls: 1) convert the existing write_or_whine() to write_or_whine_pipe() to better indicate its pipe specific nature, 2) convert the existing write_in_full() calls to write_or_whine() to better indicate its nature, 3) introduce a write_in_full() providing a write or fail semantic, and 4) convert write_or_whine() and write_or_whine_pipe() to use write_in_full(). Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 23:44:47 UTC |
| 0f018ba | Junio C Hamano | 08 January 2007, 22:40:33 UTC | --prune is now default for 'pack-refs' There is no reason not to, really. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 22:46:00 UTC |
| d84029b | Junio C Hamano | 08 January 2007, 21:59:15 UTC | --utf8 is now default for 'git-am' Since we are talking about allowing potentially incompatible UI changes in v1.5.0 iff the change improves the general situation, I would say why not. There is --no-utf8 flag to avoid re-coding from botching the log message just in case, but we may not even need it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 22:45:59 UTC |
| 521f9c4 | Michael Loeffler | 08 January 2007, 19:23:13 UTC | git-commit: do not fail to print the diffstat even if there is a file named HEAD Signed-off-by: Michael Loeffler <zvpunry@zvpunry.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 22:45:59 UTC |
| d677db8 | Andy Whitcroft | 08 January 2007, 11:45:44 UTC | ssh-upload: prevent buffer overrun Prevent a client from overrunning the on stack ref buffer. Signed-off-by: Andy Whitcroft <apw@shadowen.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 22:45:54 UTC |
| 4083c2f | Martin Langhoff | 08 January 2007, 08:08:46 UTC | cvsimport: cleanup temporary cvsps file It is bad manners to leave these sizable files around when we are done with them. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 11:01:35 UTC |
| eec8496 | Martin Langhoff | 08 January 2007, 06:53:03 UTC | cvsimport: document -S and -L options Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 11:01:32 UTC |
| ded9f40 | Martin Langhoff | 08 January 2007, 06:43:39 UTC | cvsimport: skip commits that are too recent (option and documentation) This makes the earlier "wait for 10 minutes before importing" safety overridable with "-a(ll)" flag, and adds necessary documentation. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 11:01:16 UTC |
| 9a5e407 | Eric Wong | 08 January 2007, 03:35:41 UTC | git-svn: pass an unambiguous ref to rev-list when grafting-branches Some users apparently create local heads with the same basename as the remote branch they're tracking. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 05:32:49 UTC |
| ae41098 | Eric Wong | 08 January 2007, 03:35:40 UTC | git-svn: add --prefix= option to multi-init Also, document --{trunk,branches,tags} options while we're documenting multi-init options. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 05:32:49 UTC |
| 59b5f52 | J. Bruce Fields | 08 January 2007, 00:25:35 UTC | Documentation: clarify definition of "reachable" Clarify definition of "reachable" (what chain?) Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 05:32:49 UTC |
| 6921677 | Sasha Khapyorsky | 08 January 2007, 02:22:42 UTC | git-svnimport: fix edge revisions double importing This fixes newly introduced bug when the incremental cycle edge revisions are imported twice. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 02:20:19 UTC |
| 6211988 | Martin Langhoff | 08 January 2007, 01:11:23 UTC | cvsimport: skip commits that are too recent With this patch, cvsimport will skip commits made in the last 10 minutes. The recent-ness test is of 5 minutes + cvsps fuzz window (5 minutes default). When working with a CVS repository that is in use, importing commits that are too recent can lead to partially incorrect trees. This is mainly due to - Commits that are within the cvsps fuzz window may later be found to have affected more files. - When performing incremental imports, clock drift between the systems may lead to skipped commits. This commit helps keep incremental imports of in-use CVS repositories sane. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 02:06:49 UTC |
| 3faa541 | Jakub Narebski | 08 January 2007, 01:10:42 UTC | gitweb: Remove superfluous "|" in "commit" view Remove superfluous trailing "|" separator from difftree part of "commit" view for new files (created in given commit). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 02:06:45 UTC |
| 3368d11 | Jürgen Rühle | 07 January 2007, 19:18:26 UTC | Remove unnecessary git-rm --cached reference from status output Since git-reset has learned restoring the absence of paths git-rm --cached is no longer necessary. Therefore remove it from the cached content header hint. Also remove the unfortunate wording 'Cached' from the header itself. Signed-off-by: Jürgen Rühle <j-r@online.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 02:04:57 UTC |
| 515377e | Nicolas Pitre | 07 January 2007, 17:31:29 UTC | "init-db" can really be just "init" Make "init" the equivalent of "init-db". This should make first GIT impression a little more friendly. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 January 2007, 02:03:07 UTC |
| cf2999e | Junio C Hamano | 07 January 2007, 08:12:47 UTC | Merge branch 'sp/mmap' * sp/mmap: (27 commits) Spell default packedgitlimit slightly differently Increase packedGit{Limit,WindowSize} on 64 bit systems. Update packedGit config option documentation. mmap: set FD_CLOEXEC for file descriptors we keep open for mmap() pack-objects: fix use of use_pack(). Fix random segfaults in pack-objects. Cleanup read_cache_from error handling. Replace mmap with xmmap, better handling MAP_FAILED. Release pack windows before reporting out of memory. Default core.packdGitWindowSize to 1 MiB if NO_MMAP. Test suite for sliding window mmap implementation. Create pack_report() as a debugging aid. Support unmapping windows on 'temporary' packfiles. Improve error message when packfile mmap fails. Ensure core.packedGitWindowSize cannot be less than 2 pages. Load core configuration in git-verify-pack. Fully activate the sliding window pack access. Unmap individual windows rather than entire files. Document why header parsing won't exceed a window. Loop over pack_windows when inflating/accessing data. ... Conflicts: cache.h pack-check.c | 07 January 2007, 08:12:47 UTC |
| ecaebf4 | Junio C Hamano | 07 January 2007, 08:11:11 UTC | Spell default packedgitlimit slightly differently This is shorter and easier to read, and also makes sure the constant expression does not overflow integer range. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 08:11:11 UTC |
| e7bb17a | Junio C Hamano | 07 January 2007, 07:49:24 UTC | Merge branch 'jr/status' * jr/status: Improve cached content header of status output Support --amend on initial commit in status output Improve "nothing to commit" part of status output Clarify syntax and role of git-add in status output | 07 January 2007, 07:49:24 UTC |
| 8f905eb | Junio C Hamano | 07 January 2007, 07:49:16 UTC | Merge branch 'jc/remote' * jc/remote: git-remote | 07 January 2007, 07:49:16 UTC |
| bc8c029 | Junio C Hamano | 05 January 2007, 09:38:56 UTC | git-reset <tree> -- <path> restores absense of <path> in <tree> When <path> exists in the index (either merged or unmerged), and <tree> does not have it, git-reset should be usable to restore the absense of it from the tree. This implements it. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:42 UTC |
| e9c8409 | Junio C Hamano | 05 January 2007, 09:25:18 UTC | diff-index --cached --raw: show tree entry on the LHS for unmerged entries. This updates the way diffcore represents an unmerged pair somewhat. It used to be that entries with mode=0 on both sides were used to represent an unmerged pair, but now it has an explicit flag. This is to allow diff-index --cached to report the entry from the tree when the path is unmerged in the index. This is used in updating "git reset <tree> -- <path>" to restore absense of the path in the index from the tree. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:42 UTC |
| cd1f9c3 | Junio C Hamano | 07 January 2007, 06:32:41 UTC | reflog --fix-stale: do not check the same trees and commits repeatedly. Since we use the reachability tracking machinery now, we should keep the already checked trees and commits whose completeness is known, to avoid checking the same thing over and over again. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:34 UTC |
| 1389d9d | Junio C Hamano | 06 January 2007, 10:16:19 UTC | reflog expire --fix-stale The logic in an earlier round to detect reflog entries that point at a broken commit was not sufficient. Just like we do not trust presense of a commit during pack transfer (we trust only our refs), we should not trust a commit's presense, even if the tree of that commit is complete. A repository that had reflog enabled on some of the refs that was rewound and then run git-repack or git-prune from older versions of git can have reflog entries that point at a commit that still exist but lack commits (or trees and blobs needed for that commit) between it and some commit that is reachable from one of the refs. This revamps the logic -- the definition of "broken commit" becomes: a commit that is not reachable from any of the refs and there is a missing object among the commit, tree, or blob objects reachable from it that is not reachable from any of the refs. Entries in the reflog that refer to such a commit are expired. Since this computation involves traversing all the reachable objects, i.e. it has the same cost as 'git prune', it is enabled only when a new option --fix-stale. Fortunately, once this is run, we should not have to ever worry about missing objects, because the current prune and pack-objects know about reflogs and protect objects referred by them. Unfortunately, this will be absolutely necessary to help people migrate to the newer prune and repack. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:34 UTC |
| 9442147 | Junio C Hamano | 06 January 2007, 10:16:17 UTC | Move traversal of reachable objects into a separate library. This moves major part of builtin-prune into a separate file, reachable.c. It is used to mark the objects that are reachable from refs, and optionally from reflogs. The patch looks very large, but if you look at it with diff -C, which this message is formatted in, most of them are copied lines and there are very little additions. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:34 UTC |
| ca4f293 | Junio C Hamano | 06 January 2007, 10:16:14 UTC | builtin-prune: separate ref walking from reflog walking. This is necessary for the next step, because the reason I am making the connectivity walker into a library is because I want to use it for cleaning up stale reflog entries. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:34 UTC |
| 2430481 | Junio C Hamano | 06 January 2007, 10:16:10 UTC | builtin-prune: make file-scope static struct to an argument. I want to make the first part of 'git prune' that marks the reachable objects callable as a library, so this starts the first step toward the goal by making the callchain to pass rev_info structure as an argument. No functionality change should be in this step. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:57:34 UTC |
| 13e86ef | Jakub Narebski | 07 January 2007, 01:52:27 UTC | gitweb: Fix split patches output (e.g. file to symlink) Do not replace /dev/null in two-line from-file/to-file diff header for split patches ("split" patch mean more than one patch per one diff-tree raw line) by a/file or b/file link. Split patches differ from pair of deletion/creation patch in git diff header: both a/file and b/file are hyperlinks, in all patches in a split. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:53:08 UTC |
| ac8b0cd | Jakub Narebski | 07 January 2007, 01:52:26 UTC | Revert "gitweb: There can be empty patches (in git_patchset_body)" This reverts commit 1ebb948f656c03a5bdaab4de1a113b9ffcb98bea, as that patch quieted warning but was not proper solution. The previous commit was. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:52:55 UTC |
| 66399ef | Jakub Narebski | 07 January 2007, 01:52:25 UTC | gitweb: Fix errors in git_patchset_body for empty patches We now do not skip over empty patches in git_patchset_body (where empty means that they consist only of git diff header, and of extended diff header, for example "pure rename" patch). This means that after extended diff header there can be next patch (i.e. /^diff /) or end of patchset, and not necessary patch body (i.e. /^--- /). Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:52:54 UTC |
| 2e1951f | Jakub Narebski | 07 January 2007, 01:52:24 UTC | gitweb: Fix error in "rename to"/"copy to" git diff header output Fix error in git_patchset_body subroutine, which caused "rename to"/"copy to" line in extended diff header to be displayed incorrectly. While at it, fix align. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:52:52 UTC |
| 62e4f26 | Jakub Narebski | 07 January 2007, 01:52:23 UTC | gitweb: Fix error in git_patchest_body for file creation/deletion patch $from_id, $to_id variables should be local per PATCH. Fix error in git_patchset_body for file creation (deletion) patches, where instead of /dev/null as from-file (to-file) diff header line, it had link to previous file with current file name. This error occured only if there was another patch before file creation (deletion) patch. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:52:49 UTC |
| fffe694 | Eric Wong | 07 January 2007, 06:25:55 UTC | git-svn: fix show-ignore Looks like I broke it in 747fa12cef73b6ca04fffaddaad7326cf546cdea but never noticed. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:48 UTC |
| 84dee6b | J. Bruce Fields | 07 January 2007, 03:38:38 UTC | Documentation: tutorial editing Edit for conciseness. Add a "Making changes" section header. When possible, make sure that stuff in text boxes could be entered literally. (Don't use "..." unless we want a user to type that.) Move 'commit -a' example into a literal code section, clarify that it finds modified files automatically. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:41 UTC |
| 2eff142 | Eric Wong | 07 January 2007, 01:53:40 UTC | Documentation/git-svn: clarify dcommit, rebase vs pull/merge Clarify that dcommit creates a revision in SVN for every commit in git. Also, add 'merge' to the rebase vs pull section because git-merge is now a first-class UI. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:21 UTC |
| 09c3a40 | Sasha Khapyorsky | 07 January 2007, 00:22:10 UTC | git-svnimport: clean svn path when accessing SVN repo Clean svn path from leading '/' when accessing SVN repo. Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:48:09 UTC |
| 40006ea | Sasha Khapyorsky | 07 January 2007, 00:17:19 UTC | git-svnimport: support for incremental import This adds ability to do import "in chunks" (default 1000 revisions), after each chunk git repo will be repacked. The option -R is used to change default value of chunk size (or how often repository will repacked). Signed-off-by: Sasha Khapyorsky <sashak@voltaire.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 January 2007, 06:47:58 UTC |
| 9fa77a5 | Alexandre Julliard | 06 January 2007, 13:46:47 UTC | git.el: Avoid setting font lock keywords before entering log-edit mode. Instead, reinitialize the keywords after the fact. This avoids conflicts with other users of log-edit mode, like pcl-cvs. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:45:13 UTC |
| f281e3a | Fredrik Kuivinen | 06 January 2007, 10:40:06 UTC | instaweb: Nicer error message when the http daemon isn't found Signed-off-by: Fredrik Kuivinen <frekui@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:59 UTC |
| cdc0873 | Alexandre Julliard | 06 January 2007, 10:20:57 UTC | git.el: Don't use --info-only when resolving a file. It doesn't make a difference for git.el, but it helps when interacting with git-rebase and friends. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:51 UTC |
| e6d7b2f | Alexandre Julliard | 06 January 2007, 10:19:44 UTC | git-clean: Fix the -q option. The 'quiet' flag is set by -q, but it's not used anywhere. Remove it and set the 'echo1' variable instead. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:44:40 UTC |
| f9e8a43 | Steven Grimm | 06 January 2007, 03:14:04 UTC | Print a more accurate error message when we fail to create a lock file. Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:42:49 UTC |
| 1170e80 | Steven Grimm | 06 January 2007, 01:52:20 UTC | Describe git-clone's actual behavior in the summary If a branch other than "master" is checked out in the origin repository, git-clone makes a local copy of that branch rather than the origin's "master" branch. This patch describes the actual behavior. Signed-off-by: Steven Grimm <koreth@midwinter.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:40:54 UTC |
| f08b3b0 | René Scharfe | 05 January 2007, 22:30:22 UTC | Set default "tar" umask to 002 and owner.group to root.root In order to make the generated tar files more friendly to users who extract them as root using GNU tar and its implied -p option, change the default umask to 002 and change the owner name and group name to root. This ensures that a) the extracted files and directories are not world-writable and b) that they belong to user and group root. Before they would have been assigned to a user and/or group named git if it existed. This also answers the question in the removed comment: uid=0, gid=0, uname=root, gname=root is exactly what we want. Normal users who let tar apply their umask while extracting are only affected if their umask allowed the world to change their files (e.g. a umask of zero). This case is so unlikely and strange that we don't need to support it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:37:14 UTC |
| 22bac0e | Shawn O. Pearce | 05 January 2007, 03:28:08 UTC | Increase packedGit{Limit,WindowSize} on 64 bit systems. If we have a 64 bit address space we can easily afford to commit a larger amount of virtual address space to pack file access. So on these platforms we should increase the default settings of core.packedGit{Limit,WindowSize} to something that will better handle very large projects. Thanks to Andy Whitcroft for pointing out that we can safely increase these defaults on such systems. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 18:34:56 UTC |
| 21afc41 | Junio C Hamano | 06 January 2007, 10:16:07 UTC | Fix timestamp for test-tick The earlier test timestamp was too old; I forgot that the bare unixtime integer had to be after Jan 1, 2000. This changes test_tick to use the git-epoch timestamp. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 January 2007, 10:17:06 UTC |
| 16157b8 | Junio C Hamano | 05 January 2007, 21:31:43 UTC | builtin-prune: memory diet. Somehow we forgot to turn save_commit_buffer off while walking the reachable objects. Releasing the memory for commit object data that we do not use matters for large projects (for example, about 90MB is saved while traversing linux-2.6 history). Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 21:31:43 UTC |
| e194cd1 | Junio C Hamano | 03 January 2007, 20:13:04 UTC | git-remote It might be handy to have a single command that helps you manage your configuration that relates to downloading from remote repositories. This currently does only about 20% of what I want it to do. $ git remote shows the list of 'remotes' you have defined somewhere, and $ git remote origin shows the details about the named remote (in this case "origin"). How the branches are tracked, if you have a tracking branch that is stale, etc. $ git add another git://git.kernel.org/pub/... defines the default remote.another.url and remote.another.fetch entries just like a clone does; you can say "git fetch another" afterwards. For it to be useful, I think it should be enhanced to: - check overlaps of tracking branches and warn; - offer to remove stale tracking branches in one go; - offer ways to remove or rename remote; - offer ways to update an existing remote, perhaps have an interactive mode; Other enhancements might be also possible, but I do not think of anything that is absolutely necessary other than the above right now. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 07:22:39 UTC |
| 244a70e | Luben Tuikov | 05 January 2007, 02:37:45 UTC | Blame "linenr" link jumps to previous state at "orig_lineno" Blame currently displays the commit id which introduced a block of one or more lines, the line numbers wrt the current listing of the file and the file's line contents. The commit id displayed is hyperlinked to the commit. Currently the linenr links are hyperlinked to the same commit id displayed to the left, which is _no_ different than the block of lines displayed, since it is the _same commit_ that is hyperlinked. And thus clicking on it leads to the same state of the file for that chunk of lines. I.e. data mining is not currently possible with gitweb given a chunk of lines introduced by a commit. This patch makes such data mining possible. The line numbers are now hyperlinked to the parent of the commit id of the block of lines. Furthermore they are linked to the line where that block was introduced. Thus clicking on a linenr link will show you the file's line(s) state prior to the commit id you were viewing. So clicking continually on a linenr link shows you how this line and its line number changed over time, leading to the initial commit where it was first introduced. Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 07:20:43 UTC |
| 27dd1a8 | Jakub Narebski | 03 January 2007, 21:54:29 UTC | gitweb: Fix "Use of uninitialized value" warning in git_tags_body Fix "Use of uninitialized value" warning in git_tags_body generated for lightweight tags of tree and blob object; those don't have age ($tag{'age'}) defined. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 07:19:09 UTC |
| 2a3240b | Eric Wong | 05 January 2007, 02:09:56 UTC | git-svn: make --repack work consistently between fetch and multi-fetch Since fetch reforks itself at most every 1000 revisions, we need to update the counter in the parent process to have a working count if we set our repack interval to be > ~1000 revisions. multi-fetch has always done this correctly because of an extra process; now fetch uses the extra process; as well. While we're at it, only compile the $sha1 regex that checks for repacking once. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 0d313b2 | Eric Wong | 05 January 2007, 02:04:06 UTC | git-svn: update documentation for multi-{init|fetch} Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 98327e5 | Eric Wong | 05 January 2007, 02:02:00 UTC | git-svn: make multi-init less confusing It now requires at least one of the (trunk|branch|tags) arguments (either from the command-line or in .git/config). Also we make sure that anything that is passed as a URL ('help') in David's case is actually a URL. Thanks to David Kågedal for reporting this issue. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 4fe2cc0 | René Scharfe | 04 January 2007, 18:33:36 UTC | Remove shadowing variable from traverse_trees() The variable named entry is allocated using malloc() and then forgotten, it being shadowed by an automatic variable of the same name. Fixing the array size at 3 worked so far because the only caller of traverse_trees() needed only as much entries. Simply remove the shadowing varaible and we're able to traverse more than three trees and save stack space at the same time! Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 7c4c9f4 | René Scharfe | 04 January 2007, 18:33:48 UTC | Make check target depend on common-cmds.h This fixes sparse complaining about a missing include file if 'make check' is run on clean sources. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| 3a2d3e8 | Junio C Hamano | 04 January 2007, 08:06:50 UTC | rerere: Fix removal of already resolved path. There was an obvious thinko in memmove() to remove an entry that was resolved from the in-core data structure. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:28:46 UTC |
| e27e609 | Junio C Hamano | 05 January 2007, 06:28:21 UTC | Merge branch 'maint' * maint: pack-check.c::verify_packfile(): don't run SHA-1 update on huge data Fix infinite loop when deleting multiple packed refs. | 05 January 2007, 06:28:21 UTC |
| 8977c11 | Junio C Hamano | 04 January 2007, 07:09:08 UTC | pack-check.c::verify_packfile(): don't run SHA-1 update on huge data Running the SHA1_Update() on the whole packfile in a single call revealed an overflow problem we had in the SHA-1 implementation on POWER architecture some time ago, which was fixed with commit b47f509b (June 19, 2006). Other SHA-1 implementations may have a similar problem. The sliding mmap() series already makes chunked calls to SHA1_Update(), so this patch itself will become moot when it graduates to "master", but in the meantime, run the hash function in smaller chunks to prevent possible future problems. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 January 2007, 06:17:59 UTC |
| d222984 | Robert Fitzsimons | 03 January 2007, 20:25:55 UTC | gitweb: Fix shortlog only showing HEAD revision. My change in 190d7fdcf325bb444fa806f09ebbb403a4ae4ee6 had a small bug found by Michael Krufky which caused the passed in hash value to be ignored, so shortlog would only show the HEAD revision. Signed-off-by: Robert Fitzsimons <robfitz@273k.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:48:39 UTC |
| 60c0f84 | Junio C Hamano | 03 January 2007, 20:34:20 UTC | git-verify-tag: make sure we remove temporary file. Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:34:20 UTC |
| 0bc72ab | Santi Béjar | 03 January 2007, 12:59:00 UTC | git-tag: add flag to verify a tag This way "git tag -v $tag" is the UI for git-verify-tag. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:31:43 UTC |
| af0e4ac | Lars Hjemli | 03 January 2007, 20:10:09 UTC | Refactor print-functions in builtin-branch This moves the guts of print_ref_list() into a revamped print_ref_info(), which at the same time gets renamed to print_ref_item(). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 1ebb948 | Jakub Narebski | 03 January 2007, 19:47:25 UTC | gitweb: There can be empty patches (in git_patchset_body) We now do not skip over empty patches in git_patchset_body (where empty means that they consist only of git diff header, and of extended diff header), so uncomment branch of code dealing with empty patches (patches which do not have even two-line from/to header) Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 6e72cf4 | Jakub Narebski | 03 January 2007, 19:47:24 UTC | gitweb: Fix bug in git_difftree_body (was '!=' instead of 'ne') Fix bug in git_difftree_body subroutine; it was used '!=' comparison operator for strings (file type) instead of correct 'ne'. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
| 9c9410e | Santi Béjar | 03 January 2007, 12:53:27 UTC | Documentation/tutorial: misc updates - Teach how to delete a branch with "git branch -d name". - Usually a commit has one parent; merge has more. - Teach "git show" instead of "git cat-file -p". Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 03 January 2007, 20:19:20 UTC |
