| 77b96d6 | Junio C Hamano | 18 April 2009, 21:32:02 UTC | Update draft release notes to 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 21:47:22 UTC |
| 4f760b7 | Junio C Hamano | 18 April 2009, 21:46:22 UTC | Merge branch 'lt/bool-on-off' * lt/bool-on-off: Documentation: boolean value may be given by on/off Allow users to un-configure rename detection | 18 April 2009, 21:46:22 UTC |
| 9824a38 | Junio C Hamano | 18 April 2009, 21:46:17 UTC | Merge branch 'lt/pack-object-memuse' * lt/pack-object-memuse: show_object(): push path_name() call further down process_{tree,blob}: show objects without buffering Conflicts: builtin-pack-objects.c builtin-rev-list.c list-objects.c list-objects.h upload-pack.c | 18 April 2009, 21:46:17 UTC |
| 5758b25 | Junio C Hamano | 18 April 2009, 21:46:08 UTC | Merge branch 'nd/archive-attribute' * nd/archive-attribute: archive test: attributes archive: do not read .gitattributes in working directory unpack-trees: do not muck with attributes when we are not checking out attr: add GIT_ATTR_INDEX "direction" archive tests: do not use .gitattributes in working directory | 18 April 2009, 21:46:08 UTC |
| cef5775 | Junio C Hamano | 18 April 2009, 21:45:59 UTC | Merge branch 'maint' * maint: Describe fixes since 1.6.2.3 doc/git-daemon: add missing arguments to max-connections option doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable imap-send: use correct configuration variable in documentation | 18 April 2009, 21:45:59 UTC |
| 67daebf | Junio C Hamano | 18 April 2009, 21:01:50 UTC | Describe fixes since 1.6.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 21:45:29 UTC |
| a51609a | Junio C Hamano | 18 April 2009, 21:43:39 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: | 18 April 2009, 21:43:39 UTC |
| a4d1797 | Junio C Hamano | 18 April 2009, 21:43:24 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | 18 April 2009, 21:43:24 UTC |
| 08e7239 | Junio C Hamano | 18 April 2009, 21:18:32 UTC | Merge branch 'bs/maint-1.6.0-tree-walk-prefix' into maint * bs/maint-1.6.0-tree-walk-prefix: match_tree_entry(): a pathspec only matches at directory boundaries tree_entry_interesting: a pathspec only matches at directory boundary | 18 April 2009, 21:18:32 UTC |
| f392485 | Junio C Hamano | 18 April 2009, 21:18:29 UTC | Merge branch 'js/maint-submodule-checkout' into maint * js/maint-submodule-checkout: Fix 'git checkout <submodule>' to update the index | 18 April 2009, 21:18:29 UTC |
| eb8a1c4 | Junio C Hamano | 18 April 2009, 21:18:25 UTC | Merge branch 'cb/maint-merge-recursive-submodule-fix' into maint * cb/maint-merge-recursive-submodule-fix: simplify output of conflicting merge update cache for conflicting submodule entries add tests for merging with submodules | 18 April 2009, 21:18:25 UTC |
| 2aa3140 | Markus Heidelberg | 18 April 2009, 09:46:06 UTC | doc/git-daemon: add missing arguments to max-connections option Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 20:40:34 UTC |
| d890d3f | Junio C Hamano | 18 April 2009, 20:39:52 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: doc/git-daemon: add missing arguments to options init: Do not segfault on big GIT_TEMPLATE_DIR environment variable | 18 April 2009, 20:39:52 UTC |
| 6285441 | Markus Heidelberg | 18 April 2009, 09:46:06 UTC | doc/git-daemon: add missing arguments to options Also fix some spellings and typos. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 20:39:42 UTC |
| 32d1776 | Frank Lichtenheld | 18 April 2009, 14:14:02 UTC | init: Do not segfault on big GIT_TEMPLATE_DIR environment variable Signed-off-by: Frank Lichtenheld <flichtenheld@astaro.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 20:06:40 UTC |
| 43be7a7 | Paul Bolle | 18 April 2009, 11:26:42 UTC | imap-send: use correct configuration variable in documentation It's imap.pass (not imap.password). Signed-off-by: Paul Bolle <pebolle@tiscali.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 19:54:45 UTC |
| 1a1f063 | Junio C Hamano | 18 April 2009, 04:42:13 UTC | Merge branch 'ac/color-graph' * ac/color-graph: graph API: Added logic for colored edges | 18 April 2009, 04:42:13 UTC |
| 0f9b55b | Junio C Hamano | 18 April 2009, 04:42:13 UTC | Merge branch 'jk/cobdoc' * jk/cobdoc: docs/checkout: clarify what "non-branch" means doc/checkout: split checkout and branch creation in synopsis doc/checkout: refer to git-branch(1) as appropriate doc: refer to tracking configuration as "upstream" doc: clarify --no-track option | 18 April 2009, 04:42:13 UTC |
| fc917ad | Junio C Hamano | 18 April 2009, 04:42:13 UTC | Merge branch 'mk/apply-swap' * mk/apply-swap: builtin-apply: keep information about files to be deleted tests: test applying criss-cross rename patch | 18 April 2009, 04:42:13 UTC |
| 66aae6c | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'mm/add-p-quit' * mm/add-p-quit: Update git-add.txt according to the new possibilities of 'git add -p'. add-interactive: refactor mode hunk handling git add -p: new "quit" command at the prompt. | 18 April 2009, 04:42:12 UTC |
| ef5542c | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'eb/upload-archive-from-git-shell' * eb/upload-archive-from-git-shell: git-shell: Add 'git-upload-archive' to allowed commands. | 18 April 2009, 04:42:12 UTC |
| 1dd9b63 | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'jc/shared-literally' * jc/shared-literally: t1301-shared-repo: fix forced modes test | 18 April 2009, 04:42:12 UTC |
| 1ee28e5 | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'ns/am-to-empty' * ns/am-to-empty: git-am: teach git-am to apply a patch to an unborn branch | 18 April 2009, 04:42:12 UTC |
| a9b772a | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'bw/short-ref-strict' * bw/short-ref-strict: remote.c: use shorten_unambiguous_ref rev-parse: --abbrev-ref option to shorten ref name for-each-ref: utilize core.warnAmbiguousRefs for :short-format shorten_unambiguous_ref(): add strict mode | 18 April 2009, 04:42:12 UTC |
| bd15ef0 | Junio C Hamano | 18 April 2009, 04:42:12 UTC | Merge branch 'da/difftool' * da/difftool: mergetool--lib: simplify API usage by removing more global variables Fix misspelled mergetool.keepBackup difftool/mergetool: refactor commands to use git-mergetool--lib mergetool: use $( ... ) instead of `backticks` bash completion: add git-difftool difftool: add support for a difftool.prompt config variable difftool: add various git-difftool tests difftool: move 'git-difftool' out of contrib difftool/mergetool: add diffuse as merge and diff tool difftool: add a -y shortcut for --no-prompt difftool: use perl built-ins when testing for msys difftool: remove the backup file feature difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff git-mergetool: add new merge tool TortoiseMerge git-mergetool/difftool: make (g)vimdiff workable under Windows doc/merge-config: list ecmerge as a built-in merge tool | 18 April 2009, 04:42:12 UTC |
| 2d430c7 | Junio C Hamano | 18 April 2009, 04:29:15 UTC | Merge branch 'maint' * maint: doc/gitattributes: clarify location of config text Fix buffer overflow in config parser git-apply: fix option description | 18 April 2009, 04:29:15 UTC |
| c4c86d2 | Jeff King | 16 April 2009, 07:17:12 UTC | doc/gitattributes: clarify location of config text The gitattributes documentation has a section on the "diff" attribute, with subsections for each of the things you might want to configure in your diff config section (external diff, hunk headers, etc). The first such subsection specifically notes that the definition of the diff driver should go into $GIT_DIR/config, but subsequent sections do not. This location is implied if you are reading the documentation sequentially, but it is not uncommon for a new user to jump to (or be referred to) a specific section. For a new user who does not know git well enough to recognize the config syntax, it is not clear that those directives don't also go into the gitattributes file. This patch just mentions the config file in each subsection, similar to the way it is mentioned in the first. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:28:07 UTC |
| aed97c6 | Pierre Habouzit | 16 April 2009, 20:00:44 UTC | hook/update: example of how to prevent branch creation Since git doesn't provide a receive.denyBranchCreation or similar, here is an example of how to be sure users cannot create branches remotely by pushing a new reference. This setup has been proven useful to prevent creation of spurious branches because of users having their remote.origin.push set to HEAD, when they use `git push` while being on a local topic branch of theirs instead of the proper one. Signed-off-by: Pierre Habouzit <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:26:11 UTC |
| f7446fc | Junio C Hamano | 18 April 2009, 04:20:58 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Fix buffer overflow in config parser | 18 April 2009, 04:20:58 UTC |
| 0fa0514 | Junio C Hamano | 18 April 2009, 04:06:11 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Fix buffer overflow in config parser | 18 April 2009, 04:06:11 UTC |
| 8aece7f | René Scharfe | 17 April 2009, 22:18:10 UTC | archive test: attributes Add a test script for all archive attributes and their handling in normal and bare repositories. export-ignore and export-subst are tested, as well as the effect of the option --worktree-attributes. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:05:49 UTC |
| ba053ea | Nguyễn Thái Ngọc Duy | 17 April 2009, 22:18:05 UTC | archive: do not read .gitattributes in working directory The old behaviour still remains with --worktree-attributes, and it is always on for the legacy "git tar-tree". Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:05:49 UTC |
| 66985e6 | Junio C Hamano | 17 April 2009, 22:18:01 UTC | unpack-trees: do not muck with attributes when we are not checking out Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:05:49 UTC |
| 4191e80 | Nguyễn Thái Ngọc Duy | 17 April 2009, 22:17:58 UTC | attr: add GIT_ATTR_INDEX "direction" This instructs attr mechanism, not to look into working .gitattributes at all. Needed by tools that does not handle working directory, such as "git archive". Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:05:49 UTC |
| ad94657 | René Scharfe | 17 April 2009, 22:17:49 UTC | archive tests: do not use .gitattributes in working directory We are interested in using archive mostly from a bare repository, so it should not add .gitattributes to the work tree. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 04:05:49 UTC |
| e0b3cc0 | Thomas Jarosch | 17 April 2009, 12:05:11 UTC | Fix buffer overflow in config parser When interpreting a config value, the config parser reads in 1+ space character(s) and puts -one- space character in the buffer as soon as the first non-space character is encountered (if not inside quotes). Unfortunately the buffer size check lacks the extra space character which gets inserted at the next non-space character, resulting in a crash with a specially crafted config entry. The unit test now uses Java to compile a platform independent .NET framework to output the test string in C# :o) Read: Thanks to Johannes Sixt for the correct printf call which replaces the perl invocation. Signed-off-by: Thomas Jarosch <thomas.jarosch@intra2net.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 03:59:01 UTC |
| 45972ff | Michael J Gruber | 16 April 2009, 08:20:44 UTC | remote.c: use shorten_unambiguous_ref Use the new shorten_unambiguous_ref() for simplifying the output of upstream branch names. This affects status and checkout. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 03:53:19 UTC |
| 55f0566 | Nguyễn Thái Ngọc Duy | 16 April 2009, 22:16:23 UTC | get_local_heads(): do not return random pointer if there is no head it's silly to do this: mkdir foo && cd foo && git init && git push somewhere.git but segfault should not happen even in that case. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 03:48:32 UTC |
| 0cbcf7a | Michał Kiedrowicz | 17 April 2009, 20:34:25 UTC | Documentation: boolean value may be given by on/off Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 03:46:43 UTC |
| ae57ec2 | Ulrich Windl | 09 April 2009, 09:12:58 UTC | git-apply: fix option description Do not use non ASCII single quote. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2009, 23:32:17 UTC |
| 595f694 | Matthieu Moy | 16 April 2009, 16:46:23 UTC | Update git-add.txt according to the new possibilities of 'git add -p'. The text is merely cut-and-pasted from git-add--interactive.perl. The cut-and-paste also fixes a typo. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2009, 16:55:15 UTC |
| 0392513 | Jeff King | 16 April 2009, 07:14:15 UTC | add-interactive: refactor mode hunk handling The original implementation considered the mode separately from the rest of the hunks, asking about it outside the main hunk-selection loop. This patch instead places a mode change as the first hunk in the loop. This has two advantages: 1. less duplicated code (since we use the main selection loop). This also cleans up an inconsistency, which is that the main selection loop separates options with a comma, whereas the mode prompt used slashes. 2. users can now skip the mode change and come back to it, search for it (via "/mode"), etc, as they can with other hunks. To facilitate this, each hunk is now marked with a "type". Mode hunks are not considered for splitting (which would make no sense, and also confuses the split_hunk function), nor are they editable. In theory, one could edit the mode lines and change to a new mode. In practice, there are only two modes that git cares about (0644 and 0755), so either you want to move from one to the other or not (and you can do that by staging or not staging). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2009, 08:06:52 UTC |
| 9a7a1e0 | Matthieu Moy | 10 April 2009, 14:57:01 UTC | git add -p: new "quit" command at the prompt. There's already 'd' to stop staging hunks in a file, but no explicit command to stop the interactive staging (for the current files and the remaining ones). Of course you can do 'd' and then ^C, but it would be more intuitive to allow 'quit' action. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2009, 02:41:35 UTC |
| 7fac0ee | Michał Kiedrowicz | 11 April 2009, 19:31:00 UTC | builtin-apply: keep information about files to be deleted Example correct diff generated by `diff -M -B' might look like this: diff --git a/file1 b/file2 similarity index 100% rename from file1 rename to file2 diff --git a/file2 b/file1 similarity index 100% rename from file2 rename to file1 Information about removing `file2' comes after information about creation of new `file2' (renamed from `file1'). Existing implementation isn't able to apply such patch, because it has to know in advance which files will be removed. This patch populates fn_table with information about removal of files before calling check_patch() for each patch to be applied. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2009, 00:47:55 UTC |
| 427fc5b | Allan Caffee | 13 April 2009, 19:53:41 UTC | graph API: Added logic for colored edges Modified the graph drawing logic to colorize edges based on parent-child relationships similiarly to gitk. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2009, 05:41:25 UTC |
| d8c81df | Michał Kiedrowicz | 11 April 2009, 15:26:24 UTC | tests: test applying criss-cross rename patch Originally reported by Linus in $gmane/116198 Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:48:49 UTC |
| a45d346 | Bert Wesarg | 13 April 2009, 11:20:26 UTC | rev-parse: --abbrev-ref option to shorten ref name This applies the shorten_unambiguous_ref function to the object name. Default mode is controlled by core.warnAmbiguousRefs. Else it is given as optional argument to --abbrev-ref={strict|loose}. This should be faster than 'git for-each-ref --format="%(refname:short)" <ref>' for single refs. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:42:55 UTC |
| 2bb9816 | Bert Wesarg | 13 April 2009, 10:25:47 UTC | for-each-ref: utilize core.warnAmbiguousRefs for :short-format core.warnAmbiguousRefs is used to select strict mode for the abbreviation for the ":short" format specifier of "refname" and "upstream". In strict mode, the abbreviated ref will never trigger the 'warn_ambiguous_refs' warning. I.e. for these refs: refs/heads/xyzzy refs/tags/xyzzy the abbreviated forms are: heads/xyzzy tags/xyzzy Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:36:52 UTC |
| 6e7b330 | Bert Wesarg | 13 April 2009, 10:25:46 UTC | shorten_unambiguous_ref(): add strict mode Add the strict mode of abbreviation to shorten_unambiguous_ref(), i.e. the resulting ref won't trigger the ambiguous ref warning. All users of shorten_unambiguous_ref() still use the loose mode. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:36:44 UTC |
| 0808723 | Jeff King | 13 April 2009, 11:21:04 UTC | docs/checkout: clarify what "non-branch" means In the code we literally stick "refs/heads/" on the front and see if it resolves, so that is probably the best explanation. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:08:16 UTC |
| 76cfadf | Jeff King | 13 April 2009, 11:19:33 UTC | doc/checkout: split checkout and branch creation in synopsis These can really be thought of as two different modes, since the "<branch>" parameter is treated differently in the two (in one it is the branch to be checked out, but in the other it is really a start-point for branch creation). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:06:34 UTC |
| 26d22dc | Jeff King | 13 April 2009, 11:18:52 UTC | doc/checkout: refer to git-branch(1) as appropriate Most of description for the branch creation options is simply cut and paste from git-branch. There are two reasons to fix this: 1. It can grow stale with respect to what's in "git branch" (which it is now is). 2. It is not just an implementation detail, but rather the desired mental model for the command that we are using "git branch" here. Being explicit about that can help the user understand what is going on. It also makes sense to strip the branch creation options from the synopsis, as they are making it a long, hard-to-read line. They are still easily discovered by reading the options list, and --track is explicitly referenced when branch creation is described. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:04:50 UTC |
| 167d744 | Jeff King | 13 April 2009, 11:11:56 UTC | doc: refer to tracking configuration as "upstream" The term "tracking" often creates confusion between remote tracking branches and local branches which track a remote branch. The term "upstream" captures more clearly the idea of "branch A is based on branch B in some way", so it makes sense to mention it. At the same time, upstream branches are used for more than just git-pull these days; let's mention that here. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:02:18 UTC |
| 70e9664 | Jeff King | 13 April 2009, 11:11:16 UTC | doc: clarify --no-track option It is not really about ignoring the config option; it is about turning off tracking, _even if_ the config option is set. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 16:01:00 UTC |
| f800b65 | Junio C Hamano | 13 April 2009, 04:15:59 UTC | gitignore git-bisect--helper Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 04:15:59 UTC |
| f79d4c8 | Nanako Shiraishi | 10 April 2009, 00:34:42 UTC | git-am: teach git-am to apply a patch to an unborn branch People sometimes wonder why they cannot apply a patch that only creates new files to an unborn branch. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 01:42:15 UTC |
| 7d5a180 | Junio C Hamano | 13 April 2009, 00:55:18 UTC | Mark t1301 permission test to depend on POSIXPERM This prepares the topic for inclusion to master. | 13 April 2009, 00:56:25 UTC |
| cf2ab91 | Linus Torvalds | 11 April 2009, 01:15:26 UTC | show_object(): push path_name() call further down In particular, pushing the "path_name()" call _into_ the show() function would seem to allow - more clarity into who "owns" the name (ie now when we free the name in the show_object callback, it's because we generated it ourselves by calling path_name()) - not calling path_name() at all, either because we don't care about the name in the first place, or because we are actually happy walking the linked list of "struct name_path *" and the last component. Now, I didn't do that latter optimization, because it would require some more coding, but especially looking at "builtin-pack-objects.c", we really don't even want the whole pathname, we really would be better off with the list of path components. Why? We use that name for two things: - add_preferred_base_object(), which actually _wants_ to traverse the path, and now does it by looking for '/' characters! - for 'name_hash()', which only cares about the last 16 characters of a name, so again, generating the full name seems to be just unnecessary work. Anyway, so I didn't look any closer at those things, but it did convince me that the "show_object()" calling convention was crazy, and we're actually better off doing _less_ in list-objects.c, and giving people access to the internal data structures so that they can decide whether they want to generate a path-name or not. This patch does that, and then for people who did use the name (even if they might do something more clever in the future), it just does the straightforward "name = path_name(path, component); .. free(name);" thing. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:28:31 UTC |
| 8d2dfc4 | Linus Torvalds | 11 April 2009, 00:27:58 UTC | process_{tree,blob}: show objects without buffering Here's a less trivial thing, and slightly more dubious one. I was looking at that "struct object_array objects", and wondering why we do that. I have honestly totally forgotten. Why not just call the "show()" function as we encounter the objects? Rather than add the objects to the object_array, and then at the very end going through the array and doing a 'show' on all, just do things more incrementally. Now, there are possible downsides to this: - the "buffer using object_array" _can_ in theory result in at least better I-cache usage (two tight loops rather than one more spread out one). I don't think this is a real issue, but in theory.. - this _does_ change the order of the objects printed. Instead of doing a "process_tree(revs, commit->tree, &objects, NULL, "");" in the loop over the commits (which puts all the root trees _first_ in the object list, this patch just adds them to the list of pending objects, and then we'll traverse them in that order (and thus show each root tree object together with the objects we discover under it) I _think_ the new ordering actually makes more sense, but the object ordering is actually a subtle thing when it comes to packing efficiency, so any change in order is going to have implications for packing. Good or bad, I dunno. - There may be some reason why we did it that odd way with the object array, that I have simply forgotten. Anyway, now that we don't buffer up the objects before showing them that may actually result in lower memory usage during that whole traverse_commit_list() phase. This is seriously not very deeply tested. It makes sense to me, it seems to pass all the tests, it looks ok, but... Does anybody remember why we did that "object_array" thing? It used to be an "object_list" a long long time ago, but got changed into the array due to better memory usage patterns (those linked lists of obejcts are horrible from a memory allocation standpoint). But I wonder why we didn't do this back then. Maybe there's a reason for it. Or maybe there _used_ to be a reason, and no longer is. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:28:31 UTC |
| c965c02 | Junio C Hamano | 13 April 2009, 00:05:55 UTC | GIT 1.6.3-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:05:55 UTC |
| 54a4749 | Nanako Shiraishi | 10 April 2009, 00:34:40 UTC | Documentation/git.txt: GIT 1.6.2.2 has been out for a while These links inside "stalenotes" section need to be updated on the master branch every time a new stable or maintenance release is made. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2009, 00:04:17 UTC |
| 6f523f6 | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'jk/no-perl' * jk/no-perl: tests: skip perl tests if NO_PERL is defined Makefile: allow building without perl | 12 April 2009, 23:46:42 UTC |
| c736bec | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'sb/doc-upstream-branch' * sb/doc-upstream-branch: Documentation: Introduce "upstream branch" | 12 April 2009, 23:46:42 UTC |
| 3e52eff | Junio C Hamano | 12 April 2009, 23:46:42 UTC | Merge branch 'jk/show-upstream' * jk/show-upstream: branch: show upstream branch when double verbose make get_short_ref a public function for-each-ref: add "upstream" format field for-each-ref: refactor refname handling for-each-ref: refactor get_short_ref function | 12 April 2009, 23:46:42 UTC |
| c276857 | Junio C Hamano | 12 April 2009, 23:46:41 UTC | Merge branch 'fg/remote-prune' * fg/remote-prune: add tests for remote groups git remote update: Fallback to remote if group does not exist remote: New function remote_is_configured() git remote update: Report error for non-existing groups git remote update: New option --prune builtin-remote.c: Split out prune_remote as a separate function. | 12 April 2009, 23:46:41 UTC |
| 07fb030 | Junio C Hamano | 12 April 2009, 23:46:41 UTC | Merge branch 'cc/sha1-bsearch' * cc/sha1-bsearch: sha1-lookup: fix up the assertion message | 12 April 2009, 23:46:41 UTC |
| 6e353a5 | Junio C Hamano | 12 April 2009, 23:46:40 UTC | Merge branch 'cc/bisect-filter' * cc/bisect-filter: (21 commits) rev-list: add "int bisect_show_flags" in "struct rev_list_info" rev-list: remove last static vars used in "show_commit" list-objects: add "void *data" parameter to show functions bisect--helper: string output variables together with "&&" rev-list: pass "int flags" as last argument of "show_bisect_vars" t6030: test bisecting with paths bisect: use "bisect--helper" and remove "filter_skipped" function bisect: implement "read_bisect_paths" to read paths in "$GIT_DIR/BISECT_NAMES" bisect--helper: implement "git bisect--helper" bisect: use the new generic "sha1_pos" function to lookup sha1 rev-list: call new "filter_skip" function patch-ids: use the new generic "sha1_pos" function to lookup sha1 sha1-lookup: add new "sha1_pos" function to efficiently lookup sha1 rev-list: pass "revs" to "show_bisect_vars" rev-list: make "show_bisect_vars" non static rev-list: move code to show bisect vars into its own function rev-list: move bisect related code into its own file rev-list: make "bisect_list" variable local to "cmd_rev_list" refs: add "for_each_ref_in" function to refactor "for_each_*_ref" functions quote: add "sq_dequote_to_argv" to put unwrapped args in an argv array ... | 12 April 2009, 23:46:40 UTC |
| a54c4ed | Junio C Hamano | 12 April 2009, 23:01:25 UTC | Merge branch 'maint' * maint: GIT 1.6.2.3 State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls Conflicts: GIT-VERSION-GEN | 12 April 2009, 23:01:25 UTC |
| 3bd1bb3 | Junio C Hamano | 12 April 2009, 22:43:24 UTC | GIT 1.6.2.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 22:57:58 UTC |
| 1966af8 | Junio C Hamano | 12 April 2009, 22:34:53 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls | 12 April 2009, 22:34:53 UTC |
| bc69776 | Junio C Hamano | 12 April 2009, 22:20:29 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: State the effect of filter-branch on graft explicitly process_{tree,blob}: Remove useless xstrdup calls | 12 April 2009, 22:20:29 UTC |
| 47d6592 | David Aguilar | 12 April 2009, 03:41:56 UTC | mergetool--lib: simplify API usage by removing more global variables The mergetool--lib scriplet was tricky to use because it relied upon the existance of several global shell variables. This removes more global variables so that things are simpler for callers. A side effect is that some variables are recomputed each time run_merge_tool() is called, but the overhead for recomputing them is justified by the simpler implementation. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 22:19:12 UTC |
| c6d8f76 | Daniel Cheng (aka SDiZ) | 10 April 2009, 06:26:49 UTC | State the effect of filter-branch on graft explicitly Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 21:30:40 UTC |
| 2131526 | Linus Torvalds | 10 April 2009, 22:20:18 UTC | process_{tree,blob}: Remove useless xstrdup calls On Wed, 8 Apr 2009, Björn Steinbrink wrote: > > The name of the processed object was duplicated for passing it to > add_object(), but that already calls path_name, which allocates a new > string anyway. So the memory allocated by the xstrdup calls just went > nowhere, leaking memory. Ack, ack. There's another easy 5% or so for the built-in object walker: once we've created the hash from the name, the name isn't interesting any more, and so something trivial like this can help a bit. Does it matter? Probably not on its own. But a few more memory saving tricks and it might all make a difference. Linus Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 21:30:31 UTC |
| 0786882 | Johannes Sixt | 12 April 2009, 19:22:02 UTC | t1301-shared-repo: fix forced modes test This test was added recently (5a688fe, "core.sharedrepository = 0mode" should set, not loosen; 2009-03-28). It checked the result of a sed invocation for emptyness, but in some cases it forgot to print anything at all, so that those checks would never be false. Due to this mistake, it went unnoticed that the files in objects/info are not necessarily 0440, but can also be 0660. Because the 0mode setting tries to guarantee that the files are accessible only to the people they are meant to be used by, we should only make sure that they are readable by the user and the group when the configuration is set to 0660. It is a separate matter from the core.shredrepository settings that w-bit from immutable object files under objects/[0-9a-f][0-9a-f] directories should be dropped. COMMIT_EDITMSG is still world-readable, but it (and any transient files that are meant for repositories with a work tree) does not matter. If you are working on a shared machine and on a sekrit stuff, the root of the work tree would be with mode 0700 (or 0750 to allow peeking by other people in the group), and that would mean that .git/COMMIT_EDITMSG in such a repository would not be readable by the strangers anyway. Also, in the real-world use case, .git/COMMIT_EDITMSG will be given to an arbitrary editor the user happens to use, and we have no guarantee what it does (e.g. it may create a new file with umask and replace, it may rewrite in place, it may leave an editor backup file but use umask to create it, etc.), and the protection of the file lies majorly on the protection of the root of the work tree. This test cannot be run on Windows; it requires POSIXPERM when merged to 'master'. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 20:34:06 UTC |
| ee7ec2f | Ben Walton | 22 March 2009, 13:20:44 UTC | documentation: Makefile accounts for SHELL_PATH setting Ensure that the Makefile that generates and installs the Documentation is aware of any SHELL_PATH setting. Use this value if found or the current setting for SHELL if not. This is an accommodation for systems where sh is not POSIX enough. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 08:35:12 UTC |
| cced5fb | Linus Torvalds | 09 April 2009, 18:46:15 UTC | Allow users to un-configure rename detection I told people on the kernel mailing list to please use "-M" when sending me rename patches, so that I can see what they do while reading email rather than having to apply the patch and then look at the end result. I also told them that if they want to make it the default, they can just add [diff] renames to their ~/.gitconfig file. And while I was thinking about that, I wanted to also check whether you can then mark individual projects to _not_ have that default in the per-repository .git/config file. And you can't. Currently you cannot have a global "enable renames by default" and then a local ".. but not for _this_ project". Why? Because if somebody writes [diff] renames = no we simply ignore it, rather than resetting "diff_detect_rename_default" back to zero. Fixed thusly. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:22:00 UTC |
| 519d05b | Mike Hommey | 09 April 2009, 22:25:37 UTC | Replace ",<,>,& with their respective XML entities in DAV requests If the repo url or the user email contain XML special characters, the remote DAV server is likely to reject the LOCK requests because the XML is then malformed. Signed-off-by: Mike Hommey <mh@glandium.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| d3c9634 | Johannes Schindelin | 09 April 2009, 11:29:57 UTC | git-svn: always initialize with core.autocrlf=false It has been reported time and time again in relation to msysGit that git-svn does not work well when core.autocrlf has any value other than 'false'. So let's make it so by default. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| b6c2991 | Dan McGee | 09 April 2009, 15:45:39 UTC | Update delta compression message to be less misleading In the case of a small repository, pack-objects is smart enough to not start more threads than necessary. However, the output to the user always reports the value of the pack.threads configuration and not the real number of threads to be used. Signed-off-by: Dan McGee <dpmcgee@gmail.com> Acked-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2009, 05:21:59 UTC |
| 88ec205 | Ben Jackson | 11 April 2009, 17:46:18 UTC | git-svn: Save init/clone --ignore-paths in config The --ignored-paths argument is now stored as "svn-remote.$REMOTE_NAME.ignore-paths" in the config file. [ew: edited subject and message] Signed-off-by: Ben Jackson <ben@ben.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:37 UTC |
| 0d8bee7 | Ben Jackson | 11 April 2009, 17:46:17 UTC | git-svn: Add per-svn-remote ignore-paths config The --ignore-paths option to fetch is very useful for working on a subset of a SVN repository. For proper operation, every command that causes a fetch (explicit or implied) must include a matching --ignore-paths option. This patch adds a persistent svn-remote.$repo_id.ignore-paths config by promoting Fetcher::is_path_ignored to a member function and initializing $self->{ignore_regex} in Fetcher::new. Command line --ignore-paths is still recognized and acts in addition to the config value. Signed-off-by: Ben Jackson <ben@ben.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:37 UTC |
| 6ea4203 | Boris Byk | 10 April 2009, 20:32:41 UTC | git-svn: speed up blame command 'git svn blame' now uses the 'git cat-file --batch' command to speed up resolving SVN revision number out of commit SHA by removing fork+exec overhead. [ew: enforced 80-column line wrap] Signed-off-by: Boris Byk <boris.byk@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:55:04 UTC |
| c2abd83 | Jason Merrill | 06 April 2009, 20:37:59 UTC | git-svn: add fetch --parent option Signed-off-by: Jason Merrill <jason@redhat.com> Acked-By: Eric Wong <normalperson@yhbt.net> | 12 April 2009, 00:53:52 UTC |
| 70af4e9 | Ferry Huberts | 10 April 2009, 19:33:57 UTC | Fix misspelled mergetool.keepBackup In several places mergetool.keepBackup was misspelled as merge.keepBackup. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2009, 19:20:17 UTC |
| 79f72b9 | Erik Broes | 09 April 2009, 19:58:52 UTC | git-shell: Add 'git-upload-archive' to allowed commands. This allows for example gitosis to allow use of 'git archive --remote' in a controlled environment. Signed-off-by: Erik Broes <erikbroes@ripe.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2009, 18:01:15 UTC |
| 8f8c6fa | Linus Torvalds | 09 April 2009, 19:40:39 UTC | Allow users to un-configure rename detection On Thu, 9 Apr 2009, Linus Torvalds wrote: > > [diff] > renames = no Btw, while doing this, I also though that "renames = on/off" made more sense, but while we allow yes/no and true/false for booleans, we don't allow on/off. Should we? Maybe. Here's a stupid patch. Linus Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2009, 18:00:45 UTC |
| 27845e9 | Jeff King | 06 April 2009, 20:18:23 UTC | add tests for remote groups This tries to systematically cover existing behavior, and also mark some expect_failure cases for desired behavior. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 08:30:06 UTC |
| e37347b | Junio C Hamano | 09 April 2009, 07:04:17 UTC | Update draft release notes to 1.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 07:04:55 UTC |
| 796b137 | Junio C Hamano | 09 April 2009, 06:41:27 UTC | Merge branch 'maint' * maint: Start 1.6.2.3 preparation process_{tree,blob}: Remove useless xstrdup calls git-pull.sh: better warning message for "git pull" on detached head. Conflicts: RelNotes | 09 April 2009, 06:47:23 UTC |
| db12d97 | Junio C Hamano | 09 April 2009, 06:40:33 UTC | Start 1.6.2.3 preparation Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 06:40:33 UTC |
| bff82d0 | Junio C Hamano | 09 April 2009, 06:23:41 UTC | Merge branch 'jc/shared-literally' into maint * jc/shared-literally: t1301: loosen test for forced modes set_shared_perm(): sometimes we know what the final mode bits should look like move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath Move chmod(foo, 0444) into move_temp_to_file() "core.sharedrepository = 0mode" should set, not loosen | 09 April 2009, 06:23:41 UTC |
| 197cf8d | Junio C Hamano | 09 April 2009, 06:23:17 UTC | Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint * jc/maint-1.6.0-diff-borrow-carefully: diff --cached: do not borrow from a work tree when a path is marked as assume-unchanged | 09 April 2009, 06:23:17 UTC |
| 0122cf6 | Junio C Hamano | 09 April 2009, 06:22:09 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: process_{tree,blob}: Remove useless xstrdup calls | 09 April 2009, 06:22:09 UTC |
| f7af757 | Junio C Hamano | 09 April 2009, 06:22:05 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: process_{tree,blob}: Remove useless xstrdup calls | 09 April 2009, 06:22:05 UTC |
| c3067cb | Junio C Hamano | 09 April 2009, 06:21:10 UTC | Merge branch 'jc/maint-1.6.0-keep-pack' into maint * jc/maint-1.6.0-keep-pack: pack-objects: don't loosen objects available in alternate or kept packs t7700: demonstrate repack flaw which may loosen objects unnecessarily Remove --kept-pack-only option and associated infrastructure pack-objects: only repack or loosen objects residing in "local" packs git-repack.sh: don't use --kept-pack-only option to pack-objects t7700-repack: add two new tests demonstrating repacking flaws is_kept_pack(): final clean-up Simplify is_kept_pack() Consolidate ignore_packed logic more has_sha1_kept_pack(): take "struct rev_info" has_sha1_pack(): refactor "pretend these packs do not exist" interface git-repack: resist stray environment variable Conflicts: t/t7700-repack.sh | 09 April 2009, 06:21:10 UTC |
| bb11eb3 | Junio C Hamano | 09 April 2009, 06:02:17 UTC | Merge branch 'jc/maint-1.6.0-blame-s' into maint-1.6.1 * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c | 09 April 2009, 06:02:17 UTC |
| 1c9f544 | Junio C Hamano | 09 April 2009, 06:01:15 UTC | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint-1.6.1 * bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" | 09 April 2009, 06:01:15 UTC |
| 1f398ee | Junio C Hamano | 09 April 2009, 06:01:10 UTC | Merge branch 'js/maint-1.6.0-exec-path-env' into maint-1.6.1 * js/maint-1.6.0-exec-path-env: Propagate --exec-path setting to external commands via GIT_EXEC_PATH | 09 April 2009, 06:01:10 UTC |
| 5b841d6 | Junio C Hamano | 09 April 2009, 06:00:21 UTC | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint-1.6.1 * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications | 09 April 2009, 06:00:21 UTC |
