| 42b5c78 | Junio C Hamano | 15 April 2006, 06:21:34 UTC | GIT v1.3.0-rc4 I've merged everything I think is ready for 1.3.0, so this is the final round -- hopefully I can release this with minimum last-minute fixup as v1.3.0 early next week. Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 06:21:34 UTC |
| 170abc8 | Junio C Hamano | 15 April 2006, 05:58:17 UTC | Merge branch 'dl/xdiff' * dl/xdiff: xdiff: post-process hunks to make them consistent. | 15 April 2006, 05:58:17 UTC |
| afcb536 | Junio C Hamano | 15 April 2006, 04:55:23 UTC | Merge branch 'js/diffstat' * js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2) | 15 April 2006, 04:55:23 UTC |
| a3cc31f | Junio C Hamano | 15 April 2006, 04:55:22 UTC | Merge branch 'jc/fix5500' * jc/fix5500: t5500: test fix | 15 April 2006, 04:55:22 UTC |
| 40c2fe0 | Linus Torvalds | 15 April 2006, 04:20:51 UTC | Clean up trailing whitespace when pretty-printing commits Partly because we've messed up and now have some commits with trailing whitespace, but partly because this also just simplifies the code, let's remove trailing whitespace from the end when pretty-printing commits. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 15 April 2006, 04:46:08 UTC |
| cad1ed9 | Junio C Hamano | 14 April 2006, 22:54:51 UTC | "git cmd -h" for shell scripts. Wrappers that use sh-setup took --help but not -h. Noticed by Sébastien Pierre. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 22:54:51 UTC |
| e51c3b5 | Junio C Hamano | 14 April 2006, 19:59:09 UTC | git-log <diff-options> <paths> documentation Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:59:09 UTC |
| e3a125a | Junio C Hamano | 14 April 2006, 19:47:10 UTC | Retire git-log.sh (take #4) Noticed by Johannes. We do not install it anymore, but still have been shipping the source, which was crazy. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:48:45 UTC |
| 5cf7e21 | Junio C Hamano | 14 April 2006, 19:41:51 UTC | stripspace: incomplete line fix (take #2) This fixes f4ee3eb68906f079dea45de4f1bbb03d68189eb3 breakage, which added an extra trailing blank line after stripping trailing blank lines by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 19:41:51 UTC |
| 7f732c6 | Junio C Hamano | 14 April 2006, 05:28:06 UTC | t5500: test fix Relying on eye-candy progress bar was fragile to begin with. Run fetch-pack with -k option, and count the objects that are in the pack that were transferred from the other end. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 05:28:06 UTC |
| 84981f9 | Junio C Hamano | 14 April 2006, 04:35:54 UTC | diff --stat: no need to ask funcnames nor context. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 04:35:54 UTC |
| dfdcb55 | Junio C Hamano | 14 April 2006, 02:05:38 UTC | Fix-up previous expr changes. The regexp on the right hand side of expr : operator somehow was broken. expr 'z+pu:refs/tags/ko-pu' : 'z\+\(.*\)' does not strip '+'; write 'z+\(.*\)' instead. We probably should switch to shell based substring post 1.3.0; that's not bashism but just POSIX anyway. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 April 2006, 02:05:38 UTC |
| ece634d | Johannes Schindelin | 13 April 2006, 23:09:48 UTC | diff-options: add --stat (take 2) ... and a fix for an invalid free(): Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:50:02 UTC |
| 295ba2f | Davide Libenzi | 13 April 2006, 23:45:13 UTC | xdiff: post-process hunks to make them consistent. | 13 April 2006, 23:48:45 UTC |
| d75f795 | Johannes Schindelin | 13 April 2006, 22:15:30 UTC | diff-options: add --stat (take 2) Now, you can say "git diff --stat" (to get an idea how many changes are uncommitted), or "git log --stat". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:48:24 UTC |
| f327dbc | Mark Wooding | 13 April 2006, 22:01:24 UTC | Shell utilities: Guard against expr' magic tokens. Some words, e.g., `match', are special to expr(1), and cause strange parsing effects. Track down all uses of expr and mangle the arguments so that this isn't a problem. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 23:45:48 UTC |
| 2283645 | Junio C Hamano | 13 April 2006, 18:57:57 UTC | t3600-rm: skip failed-remove test when we cannot make an unremovable file. When running t3600-rm test under fakeroot (or as root), we cannot make a file unremovable with "chmod a-w .". Detect this case early and skip that test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 18:57:57 UTC |
| f43ba60 | Linus Torvalds | 13 April 2006, 17:01:02 UTC | Use less memory in "git log" This trivially avoids keeping the commit message data around after we don't need it any more, avoiding a continually growing "git log" memory footprint. It's not a huge deal, but it's somewhat noticeable. For the current kernel tree, doing a full "git log" I got - before: /usr/bin/time git log > /dev/null 0.81user 0.02system 0:00.84elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+8851minor)pagefaults 0swaps - after: /usr/bin/time git log > /dev/null 0.79user 0.03system 0:00.83elapsed 100%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+0outputs (0major+5039minor)pagefaults 0swaps ie the touched pages dropped from 8851 to 5039. For the historic kernel archive, the numbers are 18357->11037 minor page faults. We could/should in theory free the commits themselves, but that's really a lot harder, since during revision traversal we may hit the same commit twice through different children having it as a parent, even after we've shown it once (when that happens, we'll silently ignore it next time, but we still need the "struct commit" to know). And as the commit message data is clearly the biggest part of the commit, this is the really easy 60% solution. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 18:26:56 UTC |
| d533524 | Junio C Hamano | 13 April 2006, 07:26:21 UTC | git-log: do not output excess blank line between commits Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:26:21 UTC |
| 8c989ec | Junio C Hamano | 13 April 2006, 07:17:19 UTC | Makefile: $(MAKE) check-docs This target lists undocumented commands, and/or whose document is not referenced from the main git documentation. For now, there are some exceptions I added primarily because I lack the energy to document them myself: - merge backends (we should really document them) - ssh-push/ssh-pull (does anybody still use them?) - annotate and blame (maybe after one of them eats the other ;-) Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:21:47 UTC |
| c16e30c | Junio C Hamano | 13 April 2006, 07:09:54 UTC | Documentation: add a couple of missing docs. Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 April 2006, 07:21:06 UTC |
| 0237628 | Junio C Hamano | 12 April 2006, 20:24:48 UTC | Merge branch 'jc/combine' into next * jc/combine: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. combine-diff: type fix. | 12 April 2006, 20:24:48 UTC |
| 3103c00 | Junio C Hamano | 12 April 2006, 20:24:04 UTC | Merge branch 'master' into jc/combine * master: stripspace: make sure not to leave an incomplete line. git-commit: do not muck with commit message when no_edit is set. When showing a commit message, do not lose an incomplete line. Retire t5501-old-fetch-and-upload test. | 12 April 2006, 20:24:04 UTC |
| 8bc7574 | Junio C Hamano | 12 April 2006, 20:23:50 UTC | combine-diff: type fix. The variable hunk_end points at a line number, which is represented as unsigned long by all the other variables. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 20:23:50 UTC |
| f4ee3eb | Junio C Hamano | 12 April 2006, 20:10:27 UTC | stripspace: make sure not to leave an incomplete line. When dealing with a commit log message for human consumption, it never makes sense to keep a log that ends with an incomplete line, so make it a part of the clean-up process done by git-stripspace. Acked-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 20:10:27 UTC |
| 475443c | Junio C Hamano | 12 April 2006, 18:45:18 UTC | git-commit: do not muck with commit message when no_edit is set. Spotted by Linus and Darrin Thompson. When we took a commit message from -F <file> with an incomplete line, we appended "git status" output, which ended up attaching a lone "#" at the end. We still need the "do we have anything to commit?" check by running "status" (which has to know what to do in different cases with -i/-o/-a), but there is no point appending its output to the proposed commit message given by the user. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 April 2006, 18:45:18 UTC |
| 684958a | Linus Torvalds | 12 April 2006, 18:31:23 UTC | When showing a commit message, do not lose an incomplete line. | 12 April 2006, 18:31:23 UTC |
| 5ca64e4 | Junio C Hamano | 11 April 2006, 23:35:39 UTC | Retire t5501-old-fetch-and-upload test. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 23:35:39 UTC |
| 72c159f | Junio C Hamano | 11 April 2006, 21:34:59 UTC | Merge branch 'jc/combine' into next * jc/combine: combine-diff: fix hunks at the end (take #2). combine-diff: do not lose hunks with only deletion at end. | 11 April 2006, 21:34:59 UTC |
| 4da8cbc | Junio C Hamano | 11 April 2006, 21:34:53 UTC | Merge branch 'jc/diff' into next * jc/diff: blame and friends: adjust to multiple pathspec change. git log --full-diff tree-diff: do not assume we use only one pathspec | 11 April 2006, 21:34:53 UTC |
| 7406595 | Junio C Hamano | 11 April 2006, 21:31:31 UTC | combine-diff: fix hunks at the end (take #2). The previous round showed the delete-only hunks at the end, but forgot to mark them interesting when they were. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 21:31:31 UTC |
| 8a470eb | Junio C Hamano | 11 April 2006, 10:13:29 UTC | combine-diff: do not lose hunks with only deletion at end. We used to lose hunks that appear at the end and have only deletion. This makes sure that the record beyond the end of file (which holds such deletions) is examined. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 19:06:27 UTC |
| b5b1442 | Junio C Hamano | 11 April 2006, 18:52:36 UTC | Merge branch 'ds/index' into next * ds/index: Replace index() with strchr(). Solaris 9 also wants our own unsetenv/setenv. Retire git-log.sh (take #3) | 11 April 2006, 18:52:36 UTC |
| 55275b3 | Junio C Hamano | 11 April 2006, 18:52:01 UTC | Merge branch 'jc/withraw' into next * jc/withraw: Separate the raw diff and patch with a newline Document --patch-with-raw | 11 April 2006, 18:52:01 UTC |
| ef9e58c | Dennis Stosberg | 11 April 2006, 16:37:58 UTC | Replace index() with strchr(). strchr() is more portable than index() and is used everywhere in git already. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:45:37 UTC |
| 40d88d4 | Dennis Stosberg | 11 April 2006, 18:42:26 UTC | Solaris 9 also wants our own unsetenv/setenv. [jc: the original had "index() is evil" but that should be a separate patch.] | 11 April 2006, 18:42:26 UTC |
| f94fbbe | Junio C Hamano | 11 April 2006, 18:29:36 UTC | Retire git-log.sh (take #3) Do not install built-in commands as separate files -- use hardlinks instead. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:29:36 UTC |
| 90c1b08 | Petr Baudis | 11 April 2006, 11:30:46 UTC | Separate the raw diff and patch with a newline More friendly for human reading I believe, and possibly friendlier to some parsers (although only by an epsilon). Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:17:50 UTC |
| 5c91da2 | Petr Baudis | 11 April 2006, 11:22:17 UTC | Document --patch-with-raw Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 18:16:51 UTC |
| 8fcd421 | Junio C Hamano | 11 April 2006, 02:45:30 UTC | Merge branch 'eb/apply' into next * eb/apply: Implement limited context matching in git-apply. | 11 April 2006, 02:45:30 UTC |
| 6b32ee2 | Junio C Hamano | 11 April 2006, 02:44:35 UTC | Merge branch 'jc/withraw' into next * jc/withraw: diff-* --patch-with-raw Retire git-log.sh (take#2) Retire git-log.sh Retire diffcore-pathspec. Improve the git-diff-tree -c/-cc documentation | 11 April 2006, 02:44:35 UTC |
| 86ff1d2 | Junio C Hamano | 11 April 2006, 00:36:53 UTC | diff-* --patch-with-raw This new flag outputs the diff-raw output and diff-patch output at the same time. Requested by Cogito. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:44:18 UTC |
| 4749588 | Eric W. Biederman | 10 April 2006, 09:33:06 UTC | Implement limited context matching in git-apply. Ok this really should be the good version. The option handling has been reworked to be automation safe. Currently to import the -mm tree I have to work around git-apply by using patch. Because some of Andrews patches in quilt will only apply with fuzz. I started out implementing a --fuzz option and then I realized fuzz is not a very safe concept for an automated system. What you really want is a minimum number of context lines that must match. This allows policy to be set without knowing how many lines of context a patch actually provides. By default the policy remains to match all provided lines of context. Allowng git-apply to match a restricted set of context makes it much easier to import the -mm tree into git. I am still only processing 1.5 to 1.6 patches a second for the 692 patches in 2.6.17-rc1-mm2 is still painful but it does help. If I just loop through all of Andrews patches in order and run git-apply --index -C1 I process the entire patchset in 1m53s or about 6 patches per second. So running git-mailinfo, git-write-tree, git-commit-tree, and git-update-ref everytime has a measurable impact, and shows things can be speeded up even more. All of these timings were taking on my poor 700Mhz Athlon with 512MB of ram. So people with fast machiens should see much better performance. When a match is found after the number of context are reduced a warning is generated. Since this is a rare event and possibly dangerous this seems to make sense. Unless you are patching a single file the error message is a little bit terse at the moment, but it should be easy to go back and fix. I have also updated the documentation for git-apply to reflect the new -C option that sets the minimum number of context lines that must match. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:44:08 UTC |
| 944e3a8 | Junio C Hamano | 11 April 2006, 00:37:58 UTC | Retire git-log.sh (take#2) ... and install a replacement properly. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:40:59 UTC |
| c4e05b1 | Junio C Hamano | 11 April 2006, 01:14:54 UTC | blame and friends: adjust to multiple pathspec change. This makes things that include revision.h build again. Blame is also built, but I am not sure how well it works (or how well it worked to begin with) -- it was relying on tree-diff to be using whatever pathspec was used the last time, which smells a bit suspicious. Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 02:17:31 UTC |
| 9173080 | Junio C Hamano | 11 April 2006, 00:37:58 UTC | Retire git-log.sh Signed-off-by: Junio C Hamano <junkio@cox.net> | 11 April 2006, 00:52:17 UTC |
| 477f2b4 | Junio C Hamano | 10 April 2006, 23:40:40 UTC | git log --full-diff Without this flag, "git log -p paths..." shows commits that touch the specified paths, and diffs about the same specified paths. With this, the full diff is shown for commits that touch the specified paths. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 23:45:19 UTC |
| a8baa7b | Junio C Hamano | 10 April 2006, 23:39:11 UTC | tree-diff: do not assume we use only one pathspec The way tree-diff was set up assumed we would use only one set of pathspec during the entire life of the program. Move the pathspec related static variables out to diff_options structure so that we can filter commits with one set of paths while show the actual diffs using different set of paths. I suspect this breaks blame.c, and makes "git log paths..." to default to the --full-diff, the latter of which is dealt with the next commit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 23:45:19 UTC |
| 6d46a23 | Junio C Hamano | 10 April 2006, 23:44:59 UTC | Merge branch 'master' into jc/diff * master: Make "--parents" logs also be incremental Retire diffcore-pathspec. Improve the git-diff-tree -c/-cc documentation | 10 April 2006, 23:44:59 UTC |
| 5910e99 | Junio C Hamano | 10 April 2006, 22:58:41 UTC | Merge branch 'lt/rev' * lt/rev: Make "--parents" logs also be incremental | 10 April 2006, 22:58:41 UTC |
| 77882f6 | Junio C Hamano | 10 April 2006, 22:57:24 UTC | Retire diffcore-pathspec. Nobody except diff-stages used it -- the callers instead filtered the input to diffcore themselves. Make diff-stages do that as well and retire diffcore-pathspec. Signed-off-by: Junio C Hamano <junkio@cox.net> | 10 April 2006, 22:57:24 UTC |
| a13ba12 | Petr Baudis | 09 April 2006, 13:43:17 UTC | Improve the git-diff-tree -c/-cc documentation This tries to clarify the -c/-cc documentation and clean up the style and grammar. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 18:11:19 UTC |
| 910a591 | Junio C Hamano | 09 April 2006, 09:07:33 UTC | Merge branch 'jc/diff' into next * jc/diff: git log [diff-tree options]... log-tree: separate major part of diff-tree. | 09 April 2006, 09:07:33 UTC |
| 52b70d5 | Junio C Hamano | 09 April 2006, 08:59:03 UTC | git log [diff-tree options]... And this makes "git log" to take common diff-tree options, so that it can be used as "git whatchanged". The recent revision walker updates by Linus to make path limiting low-latency helps this quite a bit. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 08:59:03 UTC |
| 5f1c3f0 | Junio C Hamano | 09 April 2006, 08:11:11 UTC | log-tree: separate major part of diff-tree. This separates out the part that deals with one-commit diff-tree (and --stdin form) into a separate log-tree module. There are two goals with this. The more important one is to be able to make this part available to "git log --diff", so that we can have a native "git whatchanged" command. Another is to simplify the commit log generation part simpler. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 08:35:13 UTC |
| 3381c79 | Linus Torvalds | 09 April 2006, 00:05:58 UTC | Make "--parents" logs also be incremental The parent rewriting feature caused us to create the whole history in one go, and then simplify it later, because of how rewrite_parents() had been written. However, with a little tweaking, it's perfectly possible to do even that one incrementally. Right now, this doesn't really much matter, because every user of "--parents" will probably generally _also_ use "--topo-order", which will cause the old non-incremental behaviour anyway. However, I'm hopeful that we could make even the topological sort incremental, or at least _partially_ so (for example, make it incremental up to the first merge). In the meantime, this at least moves things in the right direction, and removes a strange special case. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 06:37:21 UTC |
| 0ed49a3 | Marco Roeland | 08 April 2006, 15:27:20 UTC | xdiff/xdiffi.c: fix warnings about possibly uninitialized variables Compiling this module gave the following warnings (some double dutch!): xdiff/xdiffi.c: In functie 'xdl_recs_cmp': xdiff/xdiffi.c:298: let op: 'spl.i1' may be used uninitialized in this function xdiff/xdiffi.c:298: let op: 'spl.i2' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'fbest1' may be used uninitialized in this function xdiff/xdiffi.c:219: let op: 'bbest1' may be used uninitialized in this function A superficial tracking of their usage, without deeper knowledge about the algorithm, indeed confirms that there are code paths on which these variables will be used uninitialized. In practice these code paths might never be reached, but then these fixes will not change the algorithm. If these code paths are ever reached we now at least have a predictable outcome. And should the very small performance impact of these initializations be noticeable, then they should at least be replaced by comments why certain code paths will never be reached. Some extra initializations in this patch now fix the warnings. | 09 April 2006, 06:35:22 UTC |
| fc58071 | Junio C Hamano | 09 April 2006, 03:17:46 UTC | diffcore-rename: fix merging back a broken pair. When a broken pair is matched up by rename detector to be merged back, we do not want to say it is "dissimilar" with the similarity index. The output should just say they were changed, taking the break score left by the earlier diffcore-break run if any. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:41 UTC |
| a041d94 | Junio C Hamano | 09 April 2006, 02:45:39 UTC | diff: fix output of total-rewrite diff. We did not read in the file data before emitting the total-rewrite diff. Noticed by Pasky. Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:40 UTC |
| f085383 | Junio C Hamano | 08 April 2006, 05:34:11 UTC | git-log: match rev-list --abbrev and --abbrev-commit Signed-off-by: Junio C Hamano <junkio@cox.net> | 09 April 2006, 03:32:40 UTC |
| ad0b46b | Junio C Hamano | 08 April 2006, 01:03:07 UTC | Merge branch 'master' into next * master: GIT 1.3.0-rc3 | 08 April 2006, 01:03:07 UTC |
| a0a0195 | Junio C Hamano | 08 April 2006, 01:02:40 UTC | GIT 1.3.0-rc3 Signed-off-by: Junio C Hamano <junkio@cox.net> | 08 April 2006, 01:02:40 UTC |
| a906ce6 | Junio C Hamano | 08 April 2006, 01:01:55 UTC | Merge branch 'kh/svn' * kh/svn: git-svnimport: Don't assume that copied files haven't changed | 08 April 2006, 01:01:55 UTC |
| 90238fb | Junio C Hamano | 08 April 2006, 01:00:16 UTC | Merge branch 'jc/thinpack' * jc/thinpack: Thin pack generation: optimization. | 08 April 2006, 01:00:16 UTC |
| 9f2700c | Junio C Hamano | 08 April 2006, 01:00:06 UTC | Merge branch 'jc/date' * jc/date: date parsing: be friendlier to our European friends. | 08 April 2006, 01:00:06 UTC |
| 028e049 | Junio C Hamano | 08 April 2006, 00:59:36 UTC | Merge branch 'nh/http' * nh/http: Fix compile with expat, but an old curl version http-fetch: add optional DAV-based pack list | 08 April 2006, 00:59:36 UTC |
| f1fffec | Junio C Hamano | 08 April 2006, 00:59:10 UTC | Merge branch 'ew/rev-abbrev' * ew/rev-abbrev: rev-list --abbrev-commit | 08 April 2006, 00:59:10 UTC |
| 45fa760 | Junio C Hamano | 08 April 2006, 00:57:46 UTC | Merge branch 'jc/blame' * jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface. blame: use built-in xdiff combine-diff: move the code to parse hunk-header into common library. combine-diff: refactor built-in xdiff interface. combine-diff: use built-in xdiff. | 08 April 2006, 00:57:46 UTC |
| 1b25fd1 | Junio C Hamano | 07 April 2006, 23:53:06 UTC | Merge branch 'master' into next * master: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully | 07 April 2006, 23:53:06 UTC |
| d69dc37 | Junio C Hamano | 07 April 2006, 23:52:59 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix incorrect invocation of getmergediffline [PATCH] gitk: Fix searching for filenames in gitk | 07 April 2006, 23:52:59 UTC |
| ce18135 | Junio C Hamano | 07 April 2006, 23:51:55 UTC | Merge branch 'maint' * maint: count-delta: match get_delta_hdr_size() changes. check patch_delta bounds more carefully | 07 April 2006, 23:51:55 UTC |
| 98cf815 | Junio C Hamano | 07 April 2006, 23:48:09 UTC | count-delta: match get_delta_hdr_size() changes. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 23:48:09 UTC |
| 8960844 | Nicolas Pitre | 07 April 2006, 19:26:10 UTC | check patch_delta bounds more carefully Let's avoid going south with invalid delta data. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 23:31:20 UTC |
| 0ba9ea9 | Junio C Hamano | 07 April 2006, 09:13:20 UTC | Merge branch 'jc/thinpack' into next * jc/thinpack: Thin pack generation: optimization. | 07 April 2006, 09:13:20 UTC |
| fcedc5a | Junio C Hamano | 07 April 2006, 09:12:55 UTC | Merge branch 'ew/rev-abbrev' into next * ew/rev-abbrev: rev-list --abbrev-commit | 07 April 2006, 09:12:55 UTC |
| dd4bca3 | Junio C Hamano | 07 April 2006, 09:12:48 UTC | Merge branch 'jc/blame' into next * jc/blame: blame -S <ancestry-file> Match ofs/cnt types in diff interface. | 07 April 2006, 09:12:48 UTC |
| 38b525e | Junio C Hamano | 07 April 2006, 09:12:18 UTC | Merge branch 'kh/svn' into next * kh/svn: git-svnimport: Don't assume that copied files haven't changed Add Documentation/technical/pack-format.txt Added Packing Heursitics IRC writeup. Add documentation for git-imap-send. | 07 April 2006, 09:12:18 UTC |
| e67c662 | Karl Hasselström | 07 April 2006, 06:06:09 UTC | git-svnimport: Don't assume that copied files haven't changed Don't assume that a file that SVN claims was copied from somewhere else is bit-for-bit identical with its parent, since SVN allows changes to copied files before they are committed. Without this fix, such copy-modify-commit operations causes the imported file to lack the "modify" part -- that is, we get subtle data corruption. Signed-off-by: Karl Hasselström <kha@treskal.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:11:33 UTC |
| 5c51c98 | Junio C Hamano | 07 April 2006, 04:32:36 UTC | rev-list --abbrev-commit This should make --pretty=oneline a whole lot more readable for people using 80-column terminals. Originally from Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:09:18 UTC |
| 5379a5c | Junio C Hamano | 06 April 2006, 06:24:57 UTC | Thin pack generation: optimization. Jens Axboe noticed that recent "git push" has become very slow since we made --thin transfer the default. Thin pack generation to push a handful revisions that touch relatively small number of paths out of huge tree was stupid; it registered _everything_ from the excluded revisions. As a result, "Counting objects" phase was unnecessarily expensive. This changes the logic to register the blobs and trees from excluded revisions only for paths we are actually going to send to the other end. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:08:38 UTC |
| 9760662 | Junio C Hamano | 07 April 2006, 09:07:40 UTC | Add Documentation/technical/pack-format.txt ... along with the previous one, pack-heuristics, by popular demand. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:07:40 UTC |
| b116b29 | Jon Loeliger | 03 March 2006, 01:19:29 UTC | Added Packing Heursitics IRC writeup. Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 09:06:18 UTC |
| 5040f17 | Junio C Hamano | 07 April 2006, 06:58:51 UTC | blame -S <ancestry-file> This adds the -S <ancestry-file> option to blame, which is needed by the CVS server emulation. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 08:59:51 UTC |
| a0fd314 | Junio C Hamano | 07 April 2006, 05:29:55 UTC | Match ofs/cnt types in diff interface. Signed-off-by: Junio C Hamano <junkio@cox.net> | 07 April 2006, 05:29:55 UTC |
| 454a35b | Mike McCormack | 06 April 2006, 03:32:19 UTC | Add documentation for git-imap-send. Signed-off-by: Mike McCormack <mike@codeweavers.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2006, 03:48:40 UTC |
| 2db70f6 | Junio C Hamano | 06 April 2006, 01:22:19 UTC | Merge branch 'master' into next * master: blame.c: fix completely broken ancestry traversal. | 06 April 2006, 01:22:19 UTC |
| ba3c937 | Junio C Hamano | 06 April 2006, 01:21:17 UTC | blame.c: fix completely broken ancestry traversal. Recent revision.c updates completely broken the assignment of blames by not rewriting commit->parents field unless explicitly asked to by the caller. The caller needs to set revs.parents. Signed-off-by: Junio C Hamano <junkio@cox.net> | 06 April 2006, 01:21:17 UTC |
| c5a4c4d | Paul Mackerras | 06 April 2006, 00:20:03 UTC | gitk: Fix incorrect invocation of getmergediffline Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 April 2006, 00:20:03 UTC |
| 3754354 | Pavel Roskin | 05 April 2006, 23:02:50 UTC | [PATCH] gitk: Fix searching for filenames in gitk findcont should not accept any arguments. Signed-off-by: Pavel Roskin <proski@gnu.org> Signed-off-by: Paul Mackerras <paulus@samba.org> | 06 April 2006, 00:19:23 UTC |
| 9cda21d | Junio C Hamano | 05 April 2006, 22:47:29 UTC | Merge branch 'jc/date' into next * jc/date: date parsing: be friendlier to our European friends. Tweaks to make asciidoc play nice. git-commit: document --amend Avoid a crash if realloc returns a different pointer. Avoid a divide by zero if there's no messages to send. [PATCH] Provide configurable UI font for gitk [PATCH] gitk: Use git wrapper to run git-ls-remote. [PATCH] gitk: add key bindings for selecting first and last commit gitk: Add a help menu item to display key bindings [PATCH] gitk: allow goto heads gitk: replace parent and children arrays with lists | 05 April 2006, 22:47:29 UTC |
| 38035cf | Junio C Hamano | 05 April 2006, 22:31:12 UTC | date parsing: be friendlier to our European friends. This does three things, only applies to cases where the user manually tries to override the author/commit time by environment variables, with non-ISO, non-2822 format date-string: - Refuses to use the interpretation to put the date in the future; recent kernel history has a commit made with 10/03/2006 which is recorded as October 3rd. - Adds '.' as the possible year-month-date separator. We learned from our European friends on the #git channel that dd.mm.yyyy is the norm there. - When the separator is '.', we prefer dd.mm.yyyy over mm.dd.yyyy; otherwise mm/dd/yy[yy] takes precedence over dd/mm/yy[yy]. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 22:47:17 UTC |
| 6cbd5d7 | Francis Daly | 05 April 2006, 22:25:17 UTC | Tweaks to make asciidoc play nice. Once the content has been generated, the formatting elves can reorder it to be pretty... Signed-off-by: Francis Daly <francis@daoine.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 22:46:54 UTC |
| 1b83ace | Junio C Hamano | 05 April 2006, 21:26:00 UTC | Merge branch 'jc/blame' into next * jc/blame: blame: use built-in xdiff | 05 April 2006, 21:26:00 UTC |
| 806d097 | Junio C Hamano | 05 April 2006, 21:25:57 UTC | Merge branch 'nh/http' into next * nh/http: Fix compile with expat, but an old curl version | 05 April 2006, 21:25:57 UTC |
| f2f880f | Junio C Hamano | 05 April 2006, 19:23:29 UTC | blame: use built-in xdiff This removes the last use of external diff from core git suite. Also addresses the use of index() -- elsewhere we tend to use strchr(). Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 21:25:25 UTC |
| ae5d847 | Marco Roeland | 05 April 2006, 20:28:28 UTC | git-commit: document --amend The "--amend" option is used to amend the tip of the current branch. This documentation text was copied straight from the commit that implemented it. Some minor format tweaks for asciidoc were taken from work by Francis Daly in commit b0d08a5.. It looks good now also in the html page. [jc: amended further to follow the recommendation by Francis in commit 3070b60]. Signed-off-by: Marco Roeland <marco.roeland@xs4all.nl> Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 21:07:21 UTC |
| 3ffe0c2 | Junio C Hamano | 05 April 2006, 21:06:50 UTC | Merge branch 'jc/clone' * jc/clone: git-clone: fix handling of upsteram whose HEAD does not point at master. | 05 April 2006, 21:06:50 UTC |
| 9b6891f | Junio C Hamano | 05 April 2006, 21:06:26 UTC | Merge branch 'pb/regex' * pb/regex: On some platforms, certain headers need to be included before regex.h Support for pickaxe matching regular expressions | 05 April 2006, 21:06:26 UTC |
| 34c5a9e | Mike McCormack | 05 April 2006, 14:22:19 UTC | Avoid a crash if realloc returns a different pointer. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 20:00:07 UTC |
| 1cd88cc | Mike McCormack | 05 April 2006, 14:22:52 UTC | Avoid a divide by zero if there's no messages to send. Signed-off-by: Junio C Hamano <junkio@cox.net> | 05 April 2006, 20:00:03 UTC |
