| ceb8442 | Junio C Hamano | 19 March 2007, 09:28:29 UTC | GIT 1.5.1-rc1 I think we can start to slow down, as we now have covered everything I listed earlier in the short-term release plan. The last release 1.5.0 took painfully too long. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 09:56:29 UTC |
| 843d49a | Junio C Hamano | 19 March 2007, 09:48:37 UTC | Fix merge-index An earlier conversion to run_command() from execlp() forgot that run_command() takes an array that is terminated with NULL. Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 09:48:37 UTC |
| 5d86501 | Linus Torvalds | 18 March 2007, 22:18:30 UTC | Set up for better tree diff optimizations This is mainly just a cleanup patch, and sets up for later changes where the tree-diff.c "interesting()" function can return more than just a yes/no value. In particular, it should be quite possible to say "no subsequent entries in this tree can possibly be interesting any more", and thus allow the callers to short-circuit the tree entirely. In fact, changing the callers to do so is trivial, and is really all this patch really does, because changing "interesting()" itself to say that nothing further is going to be interesting is definitely more complicated, considering that we may have arbitrary pathspecs. But in cleaning up the callers, this actually fixes a potential small performance issue in diff_tree(): if the second tree has a lot of uninterestign crud in it, we would keep on doing the "is it interesting?" check on the first tree for each uninteresting entry in the second one. The answer is obviously not going to change, so that was just not helping. The new code is clearer and simpler and avoids this issue entirely. I also renamed "interesting()" to "tree_entry_interesting()", because I got frustrated by the fact that - we actually had *another* function called "interesting()" in another file, and I couldn't tell from the profiles which one was the one that mattered more. - when rewriting it to return a ternary value, you can't just do if (interesting(...)) ... any more, but want to assign the return value to a local variable. The name of choice for that variable would normally be "interesting", so I just wanted to make the function name be more specific, and avoid that whole issue (even though I then didn't choose that name for either of the users, just to avoid confusion in the patch itself ;) In other words, this doesn't really change anything, but I think it's a good thing to do, and if somebody comes along and writes the logic for "yeah, none of the pathspecs you have are interesting", we now support that trivially. It could easily be a meaningful optimization for things like "blame", where there's just one pathspec, and stopping when you've seen it would allow you to avoid about 50% of the tree traversals on average. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 09:01:39 UTC |
| c711a21 | Linus Torvalds | 18 March 2007, 20:38:19 UTC | Trivial cleanup of track_tree_refs() This makes "track_tree_refs()" use the same "tree_entry()" function for counting the entries as it does for actually traversing them a few lines later. Not a biggie, but the reason I care was that this was the only user of "update_tree_entry()" that didn't actually *extract* the tree entry first. It doesn't matter as things stand now, but it meant that a separate test-patch I had that avoided a few more "strlen()" calls by just saving the entry length in the entry descriptor and using it directly when updating wouldn't work without this patch. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 08:48:56 UTC |
| d55552f | Alexandre Julliard | 17 March 2007, 19:40:12 UTC | git.el: Add support for commit hooks. Run the pre-commit and post-commit hooks at appropriate places, and display their output if any. Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 08:40:27 UTC |
| 94b9816 | Junio C Hamano | 19 March 2007, 05:46:30 UTC | Merge branch 'jb/gc' * jb/gc: Make gc a builtin. | 19 March 2007, 05:46:30 UTC |
| de5e61e | Junio C Hamano | 19 March 2007, 05:44:25 UTC | Merge branch 'fl/cvsserver' * fl/cvsserver: cvsserver: further improve messages on commit and status cvsserver: Be more chatty | 19 March 2007, 05:44:25 UTC |
| 18bdec1 | Shawn O. Pearce | 19 March 2007, 05:14:37 UTC | Limit the size of the new delta_base_cache The new configuration variable core.deltaBaseCacheLimit allows the user to control how much memory they are willing to give to Git for caching base objects of deltas. This is not normally meant to be a user tweakable knob; the "out of the box" settings are meant to be suitable for almost all workloads. We default to 16 MiB under the assumption that the cache is not meant to consume all of the user's available memory, and that the cache's main purpose was to cache trees, for faster path limiters during revision traversal. Since trees tend to be relatively small objects, this relatively small limit should still allow a large number of objects. On the other hand we don't want the cache to start storing 200 different versions of a 200 MiB blob, as this could easily blow the entire address space of a 32 bit process. We evict OBJ_BLOB from the cache first (credit goes to Junio) as we want to favor OBJ_TREE within the cache. These are the objects that have the highest inflate() startup penalty, as they tend to be small and thus don't have that much of a chance to ammortize that penalty over the entire data. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 05:43:37 UTC |
| 3635a18 | Junio C Hamano | 19 March 2007, 05:21:06 UTC | Merge branch 'sp/run-command' * sp/run-command: Use run_command within send-pack Use run_command within receive-pack to invoke index-pack Use run_command within merge-index Use run_command for proxy connections Use RUN_GIT_CMD to run push backends Correct new compiler warnings in builtin-revert Replace fork_with_pipe in bundle with run_command Teach run-command to redirect stdout to /dev/null Teach run-command about stdout redirection | 19 March 2007, 05:21:06 UTC |
| abec100 | J. Bruce Fields | 19 March 2007, 01:37:53 UTC | Make git-send-email aware of Cc: lines. In the Linux kernel, for example, it's common to include Cc: lines for cases when you want to remember to cc someone on a patch without necessarily claiming they signed off on it. Make git-send-email aware of these. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 19 March 2007, 04:10:03 UTC |
| d6678c2 | Theodore Ts'o | 19 March 2007, 02:30:10 UTC | mergetool: print an appropriate warning if merge.tool is unknown Also add support for vimdiff Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> | 19 March 2007, 02:30:10 UTC |
| 9cec653 | James Bowes | 19 March 2007, 02:11:54 UTC | mergetool: Add support for vimdiff. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> | 19 March 2007, 02:13:48 UTC |
| 7976ce1 | Junio C Hamano | 18 March 2007, 22:58:07 UTC | Update main git.html page to point at 1.5.0.5 documentation Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 22:58:07 UTC |
| d54fe39 | Junio C Hamano | 18 March 2007, 22:48:06 UTC | Merge branch 'ar/diff' * ar/diff: Add tests for --quiet option of diff programs try-to-simplify-commit: use diff-tree --quiet machinery. revision.c: explain what tree_difference does Teach --quiet to diff backends. diff --quiet Remove unused diffcore_std_no_resolve Allow git-diff exit with codes similar to diff(1) | 18 March 2007, 22:48:06 UTC |
| 304de2d | Linus Torvalds | 18 March 2007, 03:06:24 UTC | Avoid unnecessary strlen() calls This is a micro-optimization that grew out of the mailing list discussion about "strlen()" showing up in profiles. We used to pass regular C strings around to the low-level tree walking routines, and while this worked fine, it meant that we needed to call strlen() on strings that the caller always actually knew the size of anyway. So pass the length of the string down wih the string, and avoid unnecessary calls to strlen(). Also, when extracting a pathname from a tree entry, use "tree_entry_len()" instead of strlen(), since the length of the pathname is directly calculable from the decoded tree entry itself without having to actually do another strlen(). This shaves off another ~5-10% from some loads that are very tree intensive (notably doing commit filtering by a pathspec). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>" Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 22:36:59 UTC |
| a0cba10 | Nicolas Pitre | 18 March 2007, 01:13:57 UTC | Reuse cached data out of delta base cache. A malloc() + memcpy() will always be faster than mmap() + malloc() + inflate(). If the data is already there it is certainly better to copy it straight away. With this patch below I can do 'git log drivers/scsi/ > /dev/null' about 7% faster. I bet it might be even more on those platforms with bad mmap() support. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 22:36:59 UTC |
| e5e0161 | Linus Torvalds | 17 March 2007, 19:44:06 UTC | Implement a simple delta_base cache This trivial 256-entry delta_base cache improves performance for some loads by a factor of 2.5 or so. Instead of always re-generating the delta bases (possibly over and over and over again), just cache the last few ones. They often can get re-used. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 22:36:59 UTC |
| 62f255a | Linus Torvalds | 17 March 2007, 19:42:15 UTC | Make trivial wrapper functions around delta base generation and freeing This doesn't change any code, it just creates a point for where we'd actually do the caching of delta bases that have been generated. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 22:36:59 UTC |
| 5bb44a5 | Junio C Hamano | 18 March 2007, 22:36:44 UTC | Merge 1.5.0.5 in from 'maint' | 18 March 2007, 22:36:44 UTC |
| 6bf035f | Junio C Hamano | 18 March 2007, 21:40:35 UTC | GIT 1.5.0.5 Signed-off-by: Junio C Hamano <junkio@cox.net> | 18 March 2007, 21:43:29 UTC |
| 6757ada | James Bowes | 14 March 2007, 01:58:22 UTC | Make gc a builtin. Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 07:34:19 UTC |
| 1589e05 | Junio C Hamano | 17 March 2007, 07:33:17 UTC | Merge branch 'maint' * maint: git-merge: finish when git-read-tree fails | 17 March 2007, 07:33:17 UTC |
| 4287307 | Nicolas Pitre | 16 March 2007, 20:42:50 UTC | [PATCH] clean up pack index handling a bit Especially with the new index format to come, it is more appropriate to encapsulate more into check_packed_git_idx() and assume less of the index format in struct packed_git. To that effect, the index_base is renamed to index_data with void * type so it is not used directly but other pointers initialized with it. This allows for a couple pointer cast removal, as well as providing a better generic name to grep for when adding support for new index versions or formats. And index_data is declared const too while at it. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 04:27:36 UTC |
| ac527b0 | Nicolas Pitre | 16 March 2007, 17:50:18 UTC | [PATCH] add test for OFS_DELTA objects Make sure pack-objects with --delta-base-offset works fine, and that it actually produces smaller packs as expected. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 04:27:36 UTC |
| 82868f7 | Nicolas Pitre | 16 March 2007, 17:37:42 UTC | [PATCH] fix t5300-pack-object.sh The 'use packed deltified objects' test was flawed as it failed to remove the pack and index from the previous test, effectively preventing the desired pack from being exercised as objects could be found in that other pack instead. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 04:27:35 UTC |
| e8e91fe | Nicolas Pitre | 16 March 2007, 17:20:19 UTC | [PATCH] local-fetch.c: some error printing cleanup Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 04:27:35 UTC |
| 0d38ab2 | Junio C Hamano | 17 March 2007, 04:22:05 UTC | applymbox: brown paper bag fix. An earlier patch 87ab7992 broke applymbox by blindly copying piece from git-am, causing a harmless but annoying series of error messages. Signed-off-by: Junio C Hamano <junkio@cox.net> | 17 March 2007, 04:22:05 UTC |
| 2be08a8 | Santi Béjar | 16 March 2007, 10:46:09 UTC | git-merge: finish when git-read-tree fails The message formating (commit v1.5.0.3-28-gbe242d5) broke the && chain. Noticed by Dmitry Torokhov. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 March 2007, 11:34:17 UTC |
| 0c66d6b | Alex Riesen | 14 March 2007, 22:57:23 UTC | Add tests for --quiet option of diff programs Signed-off-by: Alex Riesen <raa.lkml@gmail.com> | 16 March 2007, 09:13:27 UTC |
| dbb2b41 | Shawn O. Pearce | 16 March 2007, 01:02:51 UTC | use xstrdup please We generally prefer xstrdup to just plain strdup. Make it so. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 March 2007, 09:12:14 UTC |
| 9debc32 | Paolo Bonzini | 15 March 2007, 08:23:20 UTC | git-fetch, git-branch: Support local --track via a special remote '.' This patch adds support for a dummy remote '.' to avoid having to declare a fake remote like [remote "local"] url = . fetch = refs/heads/*:refs/heads/* Such a builtin remote simplifies the operation of "git-fetch", which will populate FETCH_HEAD but will not pretend that two repositories are in use, will not create a thin pack, and will not perform any useless remapping of names. The speed improvement is around 20%, and it should improve more if "git-fetch" is converted to a builtin. To this end, git-parse-remote is grown with a new kind of remote, 'builtin'. In git-fetch.sh, we treat the builtin remote specially in that it needs no pack/store operations. In fact, doing git-fetch on a builtin remote will simply populate FETCH_HEAD appropriately. The patch also improves of the --track/--no-track support, extending it so that branch.<name>.remote items referring '.' can be created. Finally, it fixes a typo in git-checkout.sh. Signed-off-by: Paolo Bonzini <bonzini@gnu.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 16 March 2007, 09:10:12 UTC |
| dd47aa3 | Junio C Hamano | 14 March 2007, 20:18:15 UTC | try-to-simplify-commit: use diff-tree --quiet machinery. This uses diff-tree --quiet machinery to terminate the internal diff-tree between a commit and its parents via revs.pruning (not revs.diffopt) as soon as we find enough about the tree change. With respect to the optionally given pathspec, we are interested if the tree of commit is identical to the parent's, only adds new paths to the parent's, or there are other differences. As soon as we find out that there is one such other kind of difference, we do not have to compare the rest of the tree. Because we do not call standard diff_addremove/diff_change, we instruct the diff-tree machinery to stop early by setting has_changes when we say we found the trees to be different. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 0a4ba7f | Junio C Hamano | 14 March 2007, 20:12:18 UTC | revision.c: explain what tree_difference does This explains how tree_difference variable is used, and updates two places where the code knows symbolic constant REV_TREE_SAME is 0. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 822cac0 | Junio C Hamano | 14 March 2007, 18:12:51 UTC | Teach --quiet to diff backends. This teaches git-diff-files, git-diff-index and git-diff-tree backends to exit early under --quiet option. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 68aacb2 | Junio C Hamano | 14 March 2007, 18:12:13 UTC | diff --quiet This adds the command line option 'quiet' to tell 'git diff-*' that we are not interested in the actual diff contents but only want to know if there is any change. This option automatically turns --exit-code on, and turns off output formatting, as it does not make much sense to show the first hit we happened to have found. The --quiet option is silently turned off (but --exit-code is still in effect, so is silent output) if postprocessing filters such as pickaxe and diff-filter are used. For all practical purposes I do not think of a reason to want to use these filters and not viewing the diff output. The backends have not been taught about the option with this patch. That is a topic for later rounds. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 3161b4b | Junio C Hamano | 14 March 2007, 17:36:42 UTC | Remove unused diffcore_std_no_resolve This was only used by diff-tree-helper program, whose purpose was to translate a raw diff to a patch. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 41bbf9d | Alex Riesen | 14 March 2007, 00:17:04 UTC | Allow git-diff exit with codes similar to diff(1) This introduces a new command-line option: --exit-code. The diff programs will return 1 for differences, return 0 for equality, and something else for errors. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 23:21:19 UTC |
| 803527f | Junio C Hamano | 14 March 2007, 22:59:04 UTC | Merge GIT 1.5.0.4 | 14 March 2007, 22:59:04 UTC |
| 3d4e193 | Junio C Hamano | 14 March 2007, 22:56:49 UTC | GIT 1.5.0.4 Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 22:56:49 UTC |
| 9debca9 | Yann Dirson | 14 March 2007, 21:08:41 UTC | Clarify doc for git-config --unset-all. Previous formulation could make it appear as removing all lines matching a regexp (at least, I was looking for such a flag, and confused this flag for what I was looking for). Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 21:38:38 UTC |
| 41f5d73 | Junio C Hamano | 14 March 2007, 16:48:13 UTC | git-checkout: fix "eval" used for merge labelling. The symbolic notation of the fork point can contain whitespaces (e.g. "git checkout -m 'HEAD@{9 hours ago}'"). Quote strings properly when using eval to prepare GITHEAD_$new Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 16:48:13 UTC |
| c47e6a4 | Andy Parkins | 14 March 2007, 14:25:52 UTC | update-hook: fix incorrect use of git-describe and sed for finding previous tag Previously git-describe would output lines of the form v1.1.1-gf509d56 The update hook found the dash and stripped it off using sed 's/-g.*//' The remainder was then used as the previous tag name. However, git-describe has changed format. The output is now of the form v1.1.1-23-gf509d56 The above sed fragment doesn't strip the middle "-23", and so the previous tag name used would be "v1.1.1-23". This is incorrect. Since the hook script was written, git-describe now gained support for "--abbrev=0", which it uses as a special flag to tell it not to output anything other than the nearest tag name. This patch fixes the problem, and prevents any future recurrence by using this new flag rather than sed to find the previous tag. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 16:14:51 UTC |
| 392e281 | Frank Lichtenheld | 13 March 2007, 17:25:23 UTC | cvsserver: further improve messages on commit and status commit: Also print the old revision similar to how cvs does it and prepend a line stating the filename so that one can actually understand what happened when commiting more than one file. status: Fix the RCS filename displayed. The directory was printed twice. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 09:09:33 UTC |
| 459bad7 | Frank Lichtenheld | 13 March 2007, 17:25:22 UTC | cvsserver: Be more chatty Submit some additional messages to the client on commit and update. Inspired by the standard CVS server though a little more terse. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 09:09:32 UTC |
| c49b260 | Junio C Hamano | 14 March 2007, 09:08:48 UTC | Merge branch 'jc/repack' * jc/repack: prepare_packed_git(): sort packs by age and localness. | 14 March 2007, 09:08:48 UTC |
| c1f5086 | Junio C Hamano | 14 March 2007, 08:40:19 UTC | Merge branch 'jc/fetch' * jc/fetch: .gitignore: add git-fetch--tool builtin-fetch--tool: fix reflog notes. git-fetch: retire update-local-ref which is not used anymore. builtin-fetch--tool: make sure not to overstep ls-remote-result buffer. fetch--tool: fix uninitialized buffer when reading from stdin builtin-fetch--tool: adjust to updated sha1_object_info(). git-fetch--tool takes flags before the subcommand. Use stdin reflist passing in git-fetch.sh Use stdin reflist passing in parse-remote Allow fetch--tool to read from stdin git-fetch: rewrite expand_ref_wildcard in C git-fetch: rewrite another shell loop in C git-fetch: move more code into C. git-fetch--tool: start rewriting parts of git-fetch in C. git-fetch: split fetch_main into fetch_dumb and fetch_native | 14 March 2007, 08:40:19 UTC |
| 5a27b32 | Junio C Hamano | 14 March 2007, 08:39:19 UTC | Merge branch 'dz/mailinfo' * dz/mailinfo: Add a couple more test cases to the suite. restrict the patch filtering builtin-mailinfo.c infrastrcture changes | 14 March 2007, 08:39:19 UTC |
| c746e44 | Junio C Hamano | 14 March 2007, 08:38:57 UTC | Merge branch 'jb/per-user-exclude' * jb/per-user-exclude: add: Support specifying an excludes file with a configuration variable | 14 March 2007, 08:38:57 UTC |
| c379c4b | Junio C Hamano | 14 March 2007, 08:38:39 UTC | Merge branch 'maint' * maint: cvsserver: asciidoc formatting changes | 14 March 2007, 08:38:39 UTC |
| 36db239 | Junio C Hamano | 14 March 2007, 08:38:28 UTC | Merge branch 'pb/branch-track' * pb/branch-track: Fix broken create_branch() in builtin-branch. git-branch, git-checkout: autosetup for remote branch tracking | 14 March 2007, 08:38:28 UTC |
| 09f2825 | Jim Meyering | 12 March 2007, 12:11:29 UTC | git-grep: don't use sscanf If you use scanf or sscanf to parse integers, your code probably accepts bogus inputs. For example, builtin-grep (aka git-grep) uses sscanf(scan, "%u", &num) to parse the integer argument to -A, -B, -C. Currently, "-C 1,000" and "-C 4294967297" are both treated just like "-C 1": $ git-grep -h -C 4294967297 juggle out and you may find it easier to switch back and forth if you juggle multiple lines of development simultaneously. Of course, you will pay the price of more disk usage to hold The obvious fix is to use strtoul instead. But using a bare strtoul is too messy, at least when done properly, so I've added a wrapper function. The new function in the patch below belongs elsewhere if it would be useful in replacing any of the four remaining uses of sscanf. One final note: With this change, I get a slightly different diagnostic depending on the context size: $ ./git-grep -h -C 4294967296 juggle fatal: 4294967296: invalid context length argument [Exit 128] $ ./git-grep -h -C 4294967295 juggle grep: 4294967295: invalid context length argument [Exit 1] A common convention that makes it easy to identify the source of a diagnostic is to include the program name before the first ":". Whether that should be "git" or "git-grep" is another question. Using "grep" or "fatal" is misleading. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 08:37:50 UTC |
| 6cd7895 | Johannes Schindelin | 11 March 2007, 13:19:07 UTC | Do not output "GEN " when generating perl.mak This fixes the same issue as 8bef6204, which became an issue again after 31d0399c. Besides, it is not really helpful to print just "GEN " (_without_ "perl.mak"). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 08:33:49 UTC |
| 0497c62 | Junio C Hamano | 08 March 2007, 10:12:06 UTC | shortlog: prompt when reading from terminal by mistake I was trying to see who have been active recently to find GSoC mentor candidates by running: $ git shortlog -s -n --since=4.months | head -n 20 After waiting for about 20 seconds, I started getting worried, thinking that the recent revision traversal updates might have had an unintended side effect. Not so. "git shortlog" acts as a filter when no revs are given, unlike "git log" which defaults to HEAD. It was reading from its standard input. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 08:33:41 UTC |
| 86952cd | Junio C Hamano | 14 March 2007, 08:29:26 UTC | Documentation: add git-mergetool to the command list. Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 08:29:26 UTC |
| 4739cea | Junio C Hamano | 14 March 2007, 08:13:39 UTC | Merge branch 'master' of git://repo.or.cz/git/mergetool * 'master' of git://repo.or.cz/git/mergetool: Add git-mergetool to run an appropriate merge conflict resolution program | 14 March 2007, 08:13:39 UTC |
| dee41f3 | Eric Wong | 13 March 2007, 18:40:36 UTC | git-svn: add -l/--local command to "git svn rebase" This avoids fetching new revisions remotely, and is usefuly versus plain "git rebase" because the user does not have to specify which remote head to rebase against. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 04:18:37 UTC |
| ad0f8c9 | Frank Lichtenheld | 13 March 2007, 17:24:26 UTC | cvsserver: asciidoc formatting changes Format some lists really as lists. Improves both html and man output. Signed-off-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 14 March 2007, 04:16:05 UTC |
| c4b4a5a | Theodore Ts'o | 06 March 2007, 05:05:16 UTC | Add git-mergetool to run an appropriate merge conflict resolution program The git-mergetool program can be used to automatically run an appropriate merge resolution program to resolve merge conflicts. It will automatically run one of kdiff3, tkdiff, meld, xxdiff, or emacs emerge programs. Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> | 14 March 2007, 00:14:05 UTC |
| 38b1c66 | Shawn O. Pearce | 12 March 2007, 23:00:29 UTC | Use run_command within send-pack Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| e8016ab | Shawn O. Pearce | 12 March 2007, 23:00:26 UTC | Use run_command within receive-pack to invoke index-pack Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| b49809c | Shawn O. Pearce | 12 March 2007, 23:00:21 UTC | Use run_command within merge-index Maybe unnecessary as the merge-index utility may go away in the future, but its currently here, its shorter to use run_command, and probably will help the MinGW port out. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| 15a1c01 | Shawn O. Pearce | 12 March 2007, 23:00:19 UTC | Use run_command for proxy connections Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| df91ba3 | Shawn O. Pearce | 12 March 2007, 23:00:15 UTC | Use RUN_GIT_CMD to run push backends If we hand run_command RUN_GIT_CMD rather than 0 it will use the execv_git_cmd path rather than execvp at the OS level. This is typically the preferred way of running another Git utility. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| 1a8f274 | Shawn O. Pearce | 12 March 2007, 19:33:18 UTC | Correct new compiler warnings in builtin-revert The new builtin-revert code introduces a few new compiler errors when I'm building with my stricter set of checks enabled in CFLAGS. These all just stem from trying to store a constant string into a non-const char*. Simple fix, make the variables const char*. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:18 UTC |
| b1daf30 | Shawn O. Pearce | 12 March 2007, 23:00:11 UTC | Replace fork_with_pipe in bundle with run_command Now that the run_command family supports all of the redirection modes needed by builtin-bundle, we can use those functions rather than the underlying POSIX primitives. This should help to make the bundle command slightly more portable to other systems, like Windows. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:17 UTC |
| e4507ae | Shawn O. Pearce | 12 March 2007, 18:37:55 UTC | Teach run-command to redirect stdout to /dev/null Some run-command callers may wish to just discard any data that is sent to stdout from the child. This is a lot like our existing no_stdin support, we just open /dev/null and duplicate the descriptor into position. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:17 UTC |
| f4bba25 | Shawn O. Pearce | 12 March 2007, 18:37:45 UTC | Teach run-command about stdout redirection Some potential callers of the run_command family of functions need to control not only the stdin redirection of the child, but also the stdout redirection of the child. This can now be setup much like the already existing stdin redirection. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:40:17 UTC |
| ae1a743 | Don Zickus | 12 March 2007, 19:52:07 UTC | Add a couple more test cases to the suite. They handle cases where there is no attached patch. Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:33:41 UTC |
| f0658cf | Don Zickus | 12 March 2007, 19:52:06 UTC | restrict the patch filtering I have come across many emails that use long strings of '-'s as separators for ideas. This patch below limits the separator to only 3 '-', with the intent that long string of '-'s will stay in the commit msg and not in the patch file. Signed-off-by: Don Zickus <dzickus@redhat.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:33:41 UTC |
| 87ab799 | Don Zickus | 12 March 2007, 19:52:04 UTC | builtin-mailinfo.c infrastrcture changes I am working on a project that required parsing through regular mboxes that didn't necessarily have patches embedded in them. I started by creating my own modified copy of git-am and working from there. Very quickly, I noticed git-mailinfo wasn't able to handle a big chunk of my email. After hacking up numerous solutions and running into more limitations, I decided it was just easier to rewrite a big chunk of it. The following patch has a bunch of fixes and features that I needed in order for me do what I wanted. Note: I'm didn't follow any email rfc papers but I don't think any of the changes I did required much knowledge (besides the boundary stuff). List of major changes/fixes: - can't create empty patch files fix - empty patch files don't fail, this failure will come inside git-am - multipart boundaries are now handled - only output inbody headers if a patch exists otherwise assume those headers are part of the reply and instead output the original headers - decode and filter base64 patches correctly - various other accidental fixes I believe I didn't break any existing functionality or compatibility (other than what I describe above, which is really only the empty patch file). I tested this through various mailing list archives and everything seemed to parse correctly (a couple thousand emails). [jc: squashed in another patch from Don's five patch series to fix the test case, as this patch exposes the bug in the test.] Signed-off-by: Don Zickus <dzickus@redhat.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 06:33:41 UTC |
| 27ebd6e | Junio C Hamano | 13 March 2007, 06:14:07 UTC | Merge branch 'master' of git://repo.or.cz/git-gui * 'master' of git://repo.or.cz/git-gui: git-gui: Support of "make -s" in: do not output anything of the build itself | 13 March 2007, 06:14:07 UTC |
| 9550a9c | Junio C Hamano | 13 March 2007, 06:13:01 UTC | Merge branch 'maint' * maint: Don't package the git-gui credits file anymore git-gui: Allow 'git gui version' outside of a repository git-gui: Revert "git-gui: Display all authors of git-gui." git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." git-gui: Allow committing empty merges | 13 March 2007, 06:13:01 UTC |
| f8a0665 | Junio C Hamano | 13 March 2007, 06:10:23 UTC | Merge branch 'master' of git://repo.or.cz/git/fastimport * 'master' of git://repo.or.cz/git/fastimport: Remove unnecessary casts from fast-import New fast-import test case for valid tree sorting fast-import: grow tree storage more aggressively | 13 March 2007, 06:10:23 UTC |
| 65d61e5 | Junio C Hamano | 13 March 2007, 06:08:27 UTC | Merge branch 'maint' of git://repo.or.cz/git/fastimport into maint * 'maint' of git://repo.or.cz/git/fastimport: fast-import: grow tree storage more aggressively | 13 March 2007, 06:08:27 UTC |
| 6016e35 | Shawn O. Pearce | 12 March 2007, 22:59:16 UTC | Fix t5510-fetch's use of sed POSIX says sed may add a trailing LF if there isn't already one there. We shouldn't rely on it not adding that LF, as some systems (Mac OS X for example) will add it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 13 March 2007, 00:37:30 UTC |
| 9dc09c7 | Shawn O. Pearce | 12 March 2007, 18:37:28 UTC | Simplify closing two fds at once in run-command.c I started hacking on a change to add stdout redirection support to the run_command family, but found I was using a lot of close calls on two pipes in an array (such as for pipe). So I'm doing a tiny bit of refactoring first to make the next set of changes clearer. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 23:31:35 UTC |
| 061e35c | Shawn O. Pearce | 12 March 2007, 19:48:37 UTC | Remove unnecessary casts from fast-import Jeff King pointed out that these casts are quite unnecessary, as the compiler should be doing them anyway, and may cause problems in the future if the size of the argument for to_atom were to ever be increased. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 19:48:37 UTC |
| 7f09ac4 | Shawn O. Pearce | 12 March 2007, 19:04:46 UTC | Merge branch 'maint' * maint: fast-import: grow tree storage more aggressively | 12 March 2007, 19:04:46 UTC |
| e741130 | Jeff King | 12 March 2007, 18:58:50 UTC | New fast-import test case for valid tree sorting The Git tree sorting convention is more complex than just the name, it needs to include the mode too to make sure trees sort as though their name ends with "/". This is a simple test case that verifies fast-import keeps the tree ordering correct after editing the same tree twice in a single input stream. A recent proposed patch series (that has not yet been applied) will cause this test to fail, due to a bug in the way the series handles sorting within the trees. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 19:02:13 UTC |
| f022f85 | Jeff King | 11 March 2007, 02:39:17 UTC | fast-import: grow tree storage more aggressively When building up a tree for a commit, fast-import dynamically allocates memory for the tree entries. When more space is needed, the allocated memory is increased by a constant amount. For very large trees, this means re-allocating and memcpy()ing the memory O(n) times. To compound this problem, releasing the previous tree resource does not free the memory; it is kept in a pool for future trees. This means that each of the O(n) allocations will consume increasing amounts of memory, giving O(n^2) memory consumption. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 19:01:44 UTC |
| 115f0fe | Shawn O. Pearce | 12 March 2007, 17:40:31 UTC | Don't package the git-gui credits file anymore Since git-gui 0.6.4 the credits file is no longer produced. This file was removed from git-gui due to build issues that a lot of users and Git developers have reported running into. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 18:44:46 UTC |
| 3ed02de | Junio C Hamano | 12 March 2007, 18:43:22 UTC | Merge branch 'maint' of git://repo.or.cz/git-gui into maint * 'maint' of git://repo.or.cz/git-gui: git-gui: Allow 'git gui version' outside of a repository git-gui: Revert "git-gui: Display all authors of git-gui." git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." git-gui: Allow committing empty merges | 12 March 2007, 18:43:22 UTC |
| 1358e7d | Linus Torvalds | 12 March 2007, 18:30:38 UTC | Re-fix get_sha1_oneline() What the function wants to return is not if we saw any return from pop_most_recent_commit(), but if we found what was asked for. Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 18:30:38 UTC |
| 2ec0cb7 | Shawn O. Pearce | 12 March 2007, 17:26:59 UTC | Merge branch 'maint' * maint: git-gui: Allow 'git gui version' outside of a repository git-gui: Revert "git-gui: Display all authors of git-gui." git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." git-gui: Allow committing empty merges | 12 March 2007, 17:26:59 UTC |
| 756d846 | Shawn O. Pearce | 12 March 2007, 17:24:10 UTC | git-gui: Allow 'git gui version' outside of a repository I got a little surprise one day when I tried to run 'git gui version' outside of a Git repository to determine what version of git-gui was installed on that system. Turns out we were doing the repository check long before we got around to command line argument handling. We now look to see if the only argument we have been given is 'version' or '--version', and if so, print out the version and exit immediately; long before we consider looking at the Git version or working directory. This way users can still get to the git-gui version number even if Git's version cannot be read. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:26:06 UTC |
| bb616dd | Shawn O. Pearce | 12 March 2007, 17:26:04 UTC | git-gui: Revert "git-gui: Display all authors of git-gui." This reverts commit 871f4c97ad7e021d1a0a98c80c5da77fcf70e4af. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. This revert will finish that series. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:26:04 UTC |
| 56a7fde | Shawn O. Pearce | 12 March 2007, 17:25:58 UTC | git-gui: Revert "Don't modify CREDITS-FILE if it hasn't changed." This reverts commit 92446aba47b0e0db28f7b858ea387efcca30ab44. Too many users have complained about the credits generator in git-gui, so I'm backing the entire thing out. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:25:58 UTC |
| c7bafad | Shawn O. Pearce | 12 March 2007, 17:03:47 UTC | git-gui: Allow committing empty merges Johannes Sixt noticed that git-gui would not let the user commit a merge created by `git merge -s ours` as the ours strategy does not alter the tree (that is HEAD^1^{tree} = HEAD^{tree} after the merge). The same issue arises from amending such a merge commit. We now permit an empty commit (no changed files) if we are doing a merge commit. Core Git does this with its command line based git-commit tool, so it makes sense for the GUI to do the same. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 12 March 2007, 17:03:47 UTC |
| 34572ed | Johannes Schindelin | 09 March 2007, 16:30:15 UTC | git-bundle: only die if pack would be empty, warn if ref is skipped A use case for git-bundle expected to be quite common is this: $ git bundle create daily.bundle --since=10.days.ago --all The expected outcome is _not_ to error out if only a couple of the refs were not changed during the last 10 days. This patch complains loudly about refs which are skipped due to the pack not containing the corresponding objects, but dies only if no objects would be in the pack _at all_. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:55:46 UTC |
| 4a62d3f | Avi Kivity | 11 March 2007, 17:19:44 UTC | git-send-email: configurable bcc and chain-reply-to Chain-reply-to is a personal perference, and is unlikely to change from patchset to patchset. Similarly, bcc is likely to have the same values every invocation is one likes to bcc oneself. So, allow both to be set via configuration variables. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:53:57 UTC |
| 240c77c | Junio C Hamano | 12 March 2007, 06:53:52 UTC | Merge branch 'maint' * maint: git-send-email: Document configuration options git-merge: warn when -m provided on a fast forward | 12 March 2007, 06:53:52 UTC |
| fc09524 | Avi Kivity | 11 March 2007, 17:19:43 UTC | git-send-email: Document configuration options Wishing to implement an email aliases file, I found that they were already implmented. Document them for the next user. Signed-off-by: Avi Kivity <avi@qumranet.com> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:52:03 UTC |
| be242d5 | J. Bruce Fields | 11 March 2007, 16:28:56 UTC | git-merge: warn when -m provided on a fast forward Warn the user that the "-m" option is ignored in the case of a fast forward. That may save some confusion in the case where the user doesn't know about fast forwards yet and may not realize that the behavior here is intentional. Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 06:49:20 UTC |
| 2422f1c | Junio C Hamano | 12 March 2007, 06:02:52 UTC | Merge branch 'jc/boundary' * jc/boundary: git-bundle: prevent overwriting existing bundles git-bundle: die if a given ref is not included in bundle git-bundle: handle thin packs in subcommand "unbundle" git-bundle: Make thin packs git-bundle: avoid packing objects which are in the prerequisites bundle: fix wrong check of read_header()'s return value & add tests revision --boundary: fix uncounted case. revision --boundary: fix stupid typo git-bundle: make verify a bit more chatty. revision traversal: SHOWN means shown git-bundle: various fixups revision traversal: retire BOUNDARY_SHOW revision walker: Fix --boundary when limited | 12 March 2007, 06:02:52 UTC |
| f43cd49 | Shawn O. Pearce | 10 March 2007, 08:28:16 UTC | Change {pre,post}-receive hooks to use stdin Sergey Vlasov, Andy Parkins and Alex Riesen all pointed out that it is possible for a single invocation of receive-pack to be given more refs than the OS might allow us to pass as command line parameters to a single hook invocation. We don't want to break these up into multiple invocations (like xargs might do) as that makes it impossible for the pre-receive hook to verify multiple related ref updates occur at the same time, and it makes it harder for post-receive to send out a single batch notification. Instead we pass the reference data on a pipe connected to the hook's stdin, supplying one ref per line to the hook. This way a single hook invocation can obtain an infinite amount of ref data, without bumping into any operating system limits. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:56:03 UTC |
| 1d9e8b5 | Shawn O. Pearce | 10 March 2007, 08:28:13 UTC | Split back out update_hook handling in receive-pack Since we have decided to change the calling conventions for the pre-receive and post-receive hooks to take the ref data on stdin rather than on the command line we cannot use the same logic to invoke the update hook anymore. So we take a small step backwards towards what we used to have, and create a specialized function for executing just the update hook. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:49:46 UTC |
| 6c319a2 | Shawn O. Pearce | 10 March 2007, 08:28:11 UTC | Refactor run_command error handling in receive-pack I'm pulling the error handling used to decode the result of run_command up into a new function so that I can reuse it. No changes, just a simple code movement. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:49:43 UTC |
| 4919bf0 | Shawn O. Pearce | 10 March 2007, 08:28:08 UTC | Teach run_command how to setup a stdin pipe Sometimes callers trying to use run_command to execute a child process will want to setup a pipe or file descriptor to redirect into the child's stdin. This idea is completely stolen from builtin-bundle's fork_with_pipe, written by Johannes Schindelin. All credit (and blame) should lie with Dscho. ;-) Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:49:40 UTC |
| ebcb5d1 | Shawn O. Pearce | 10 March 2007, 08:28:05 UTC | Split run_command into two halves (start/finish) If the calling process wants to send data to stdin of a child process it will need to arrange for a pipe and get the child process running, feed data to it, then wait for the child process to finish. So we split the run function into two halves, allowing callers to first start the child then later finish it. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:49:37 UTC |
| f100089 | Shawn O. Pearce | 10 March 2007, 08:28:00 UTC | Start defining a more sophisticated run_command There are a number of places where we do some variation of fork()+exec() but we also need to setup redirection in the process, much like what run_command does for us already with its option flags. It would be nice to reuse more of the run_command logic, especially as that non-fork API helps us to port to odd platforms like Win32. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net> | 12 March 2007, 05:49:34 UTC |
