| 1f9b620 | Junio C Hamano | 20 April 2009, 00:34:26 UTC | GIT 1.6.2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 00:34:26 UTC |
| 318b847 | Nguyễn Thái Ngọc Duy | 20 April 2009, 00:17:25 UTC | Makefile: remove {fetch,send}-pack from PROGRAMS as they are builtins Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2009, 00:23:42 UTC |
| 4f26c39 | Junio C Hamano | 19 April 2009, 19:40:17 UTC | Merge branch 'ef/maint-fast-export' into maint * ef/maint-fast-export: builtin-fast-export.c: handle nested tags builtin-fast-export.c: fix crash on tagged trees builtin-fast-export.c: turn error into warning test-suite: adding a test for fast-export with tag variants | 19 April 2009, 19:40:17 UTC |
| fe4ce3a | Junio C Hamano | 19 April 2009, 19:40:14 UTC | Merge branch 'mm/maint-add-p-quit' into maint * mm/maint-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. | 19 April 2009, 19:40:14 UTC |
| 84047e0 | Junio C Hamano | 19 April 2009, 19:40:11 UTC | Merge branch 'lt/maint-reflog-expire' into maint * lt/maint-reflog-expire: Speed up reflog pruning of unreachable commits Clean up reflog unreachability pruning decision | 19 April 2009, 19:40:11 UTC |
| 5027acc | Junio C Hamano | 19 April 2009, 19:40:05 UTC | Merge branch 'jc/maint-shared-literally' into maint * jc/maint-shared-literally: Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' t1301-shared-repo: fix forced modes test | 19 April 2009, 19:40:05 UTC |
| cafa567 | 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> | 19 April 2009, 19:35:38 UTC |
| 7535e5a | 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> | 19 April 2009, 19:35:38 UTC |
| cbd3a01 | 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> | 19 April 2009, 19:35:37 UTC |
| 24cb1bb | Junio Hamano | 31 March 2009, 04:34:14 UTC | Speed up reflog pruning of unreachable commits Instead of doing the (potentially very expensive) "in_merge_base()" check for each commit that might be pruned if it is unreachable, do a preparatory reachability graph of the commit space, so that the common case of being reachable can be tested directly. [ Cleaned up a bit and tweaked to actually work. - Linus ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:31:56 UTC |
| 9ffb15d | Linus Torvalds | 31 March 2009, 16:45:22 UTC | Clean up reflog unreachability pruning decision This clarifies the pruning rules for unreachable commits by having a separate helpder function for the unreachability decision. It's preparation for actual bigger changes to come to speed up the decision when the reachability calculations become a bottleneck. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:31:56 UTC |
| aadd444 | Erik Faye-Lund | 23 March 2009, 12:53:09 UTC | builtin-fast-export.c: handle nested tags When tags that points to tags are passed to fast-export, an error is given, saying "Tag [TAGNAME] points nowhere?". This fix calls parse_object() on the object before referencing it's tag, to ensure the tag-info is fully initialized. In addition, it inserts a comment to point out where nested tags are handled. This is consistent with the comment for signed tags. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:29:26 UTC |
| 426193c | Erik Faye-Lund | 23 March 2009, 12:53:08 UTC | builtin-fast-export.c: fix crash on tagged trees If a tag object points to a tree (or another unhandled type), the commit- pointer is left uninitialized and later dereferenced. This patch adds a default case to the switch that issues a warning and skips the object. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:29:26 UTC |
| 38124d8 | Erik Faye-Lund | 23 March 2009, 12:53:07 UTC | builtin-fast-export.c: turn error into warning fast-import doesn't have a syntax to support tree-objects (and some other object-types), so fast-export shouldn't handle them. However, aborting the operation is a bit drastic. This patch turns the error into a warning instead. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:29:26 UTC |
| 1092f6b | Erik Faye-Lund | 23 March 2009, 12:53:06 UTC | test-suite: adding a test for fast-export with tag variants Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2009, 19:29:25 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 |
| 098082f | Johan Herland | 14 April 2009, 13:15:42 UTC | Update docs on behaviour of 'core.sharedRepository' and 'git init --shared' This documentation update is needed to reflect the recent changes where "core.sharedRepository = 0mode" was changed to set, not loosen, the repository permissions. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2009, 19:51:06 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| 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 |
| de551d4 | Björn Steinbrink | 08 April 2009, 11:28:54 UTC | process_{tree,blob}: Remove useless xstrdup calls 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. This reduces the RSS usage for a "rev-list --all --objects" by about 10% on the gentoo repo (fully packed) as well as linux-2.6.git: gentoo: | old | new ----------------|------------------------------- RSS | 1537284 | 1388408 VSZ | 1816852 | 1667952 time elapsed | 1:49.62 | 1:48.99 min. page faults| 417178 | 379919 linux-2.6.git: | old | new ----------------|------------------------------- RSS | 324452 | 292996 VSZ | 491792 | 460376 time elapsed | 0:14.53 | 0:14.28 min. page faults| 89360 | 81613 Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2009, 05:58:43 UTC |
| 61e6108 | Matthieu Moy | 08 April 2009, 07:24:03 UTC | git-pull.sh: better warning message for "git pull" on detached head. Otherwise, git complains about not finding a branch to pull from in 'branch..merge', which is hardly understandable. While we're there, reword the sentences slightly. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 07:39:51 UTC |
| 747f9d3 | Junio C Hamano | 08 April 2009, 06:05:14 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index | 08 April 2009, 06:05:14 UTC |
| 714fddf | Jari Aalto | 21 March 2009, 09:00:54 UTC | Change double quotes to single quotes in message Most of the time when we give branch name in the message, we quote it inside a pair of single-quotes. git-checkout uses double-quotes; this patch corrects the inconsistency. Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 06:04:45 UTC |
| aa41cf8 | Junio C Hamano | 08 April 2009, 05:51:14 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: clarify .gitattributes search git-checkout.txt: clarify that <branch> applies when no path is given. git-checkout.txt: fix incorrect statement about HEAD and index | 08 April 2009, 05:51:14 UTC |
| 20ff3ec | Jason Merrill | 06 April 2009, 15:03:36 UTC | Documentation: clarify .gitattributes search Use the term "toplevel of the work tree" in gitattributes.txt and gitignore.txt to define the limits of the search for those files. Signed-off-by: Jason Merrill <jason@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:58:25 UTC |
| 39470cf | Matthieu Moy | 07 April 2009, 12:43:53 UTC | git-checkout.txt: clarify that <branch> applies when no path is given. Otherwise, the sentence "Defaults to HEAD." can be mis-read to mean that "git checkout -- hello.c" checks-out from HEAD. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:57:12 UTC |
| ce8936c | Matthieu Moy | 06 April 2009, 20:45:21 UTC | git-checkout.txt: fix incorrect statement about HEAD and index The command "git checkout" checks out from the index by default, not HEAD (the introducing comment were correct, but the detailled explanation added below were not). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2009, 04:56:41 UTC |
| 835a3ee | Julien Danjou | 31 March 2009, 15:50:12 UTC | git submodule: fix usage line Actually, you have to set the -b option after the add command. Signed-off-by: Julien Danjou <julien@danjou.info> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 08:16:31 UTC |
| be18f4b | Junio C Hamano | 05 April 2009, 08:04:54 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info | 05 April 2009, 08:04:54 UTC |
| acb0b7b | Junio C Hamano | 05 April 2009, 08:04:38 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: commit: abort commit if interactive add failed git-repack: use non-dashed update-server-info Conflicts: builtin-commit.c | 05 April 2009, 08:04:38 UTC |
| 38b7ccb | Markus Heidelberg | 04 April 2009, 10:35:22 UTC | doc/git-pack-refs: fix two grammar issues Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:39:37 UTC |
| 4f6a32f | Jeff King | 03 April 2009, 19:28:56 UTC | commit: abort commit if interactive add failed Previously we ignored the result of calling add_interactive, which meant that if an error occurred we simply committed whatever happened to be in the index. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:37:32 UTC |
| 39d8e27 | Clemens Buchacher | 05 April 2009, 00:47:00 UTC | simplify output of conflicting merge This simplifies the code without changing the semantics and removes the unhelpful "needs $sha1" part of the conflicting submodule message. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:33 UTC |
| 0eb6574 | Clemens Buchacher | 05 April 2009, 00:46:59 UTC | update cache for conflicting submodule entries When merging merge bases during a recursive merge we do not want to leave any unmerged entries. Otherwise we cannot create a temporary tree for the recursive merge to work with. We failed to do so in case of a submodule conflict between merge bases, causing a NULL pointer dereference in the next step of the recursive merge. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:32 UTC |
| f37ae35 | Clemens Buchacher | 05 April 2009, 00:46:58 UTC | add tests for merging with submodules Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:26:30 UTC |
| e1dc49b | Dan McGee | 04 April 2009, 16:59:55 UTC | git-repack: use non-dashed update-server-info Signed-off-by: Dan McGee <dpmcgee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 April 2009, 07:08:49 UTC |
| bef3894 | Johannes Schindelin | 02 April 2009, 13:30:25 UTC | Fix 'git checkout <submodule>' to update the index While 'git checkout <submodule>' should not update the submodule's working directory, it should update the index. This is in line with how submodules are handled in the rest of Git. While at it, test 'git reset [<commit>] <submodule>', too. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2009, 20:16:42 UTC |
| 3346330 | Junio C Hamano | 02 April 2009, 19:21:57 UTC | GIT 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2009, 19:34:16 UTC |
| 5ab2f7b | Junio C Hamano | 02 April 2009, 19:14:37 UTC | Merge branch 'jc/maint-1.6.0-blame-s' into maint * jc/maint-1.6.0-blame-s: blame: read custom grafts given by -S before calling setup_revisions() Conflicts: builtin-blame.c | 02 April 2009, 19:14:37 UTC |
| cb365a7 | Junio C Hamano | 02 April 2009, 19:02:30 UTC | Merge branch 'js/maint-diff-temp-smudge' into maint * js/maint-diff-temp-smudge: Smudge the files fed to external diff and textconv | 02 April 2009, 19:02:30 UTC |
| 1e7ef02 | Junio C Hamano | 02 April 2009, 19:02:25 UTC | Merge branch 'js/maint-1.6.0-exec-path-env' into maint * js/maint-1.6.0-exec-path-env: Propagate --exec-path setting to external commands via GIT_EXEC_PATH | 02 April 2009, 19:02:25 UTC |
| 8afd317 | Junio C Hamano | 02 April 2009, 19:02:18 UTC | Merge branch 'bc/maint-1.6.1-branch-deleted-was' into maint * bc/maint-1.6.1-branch-deleted-was: git-branch: display "was sha1" on branch deletion rather than just "sha1" Conflicts: builtin-branch.c | 02 April 2009, 19:02:18 UTC |
| b5a1878 | Junio C Hamano | 02 April 2009, 19:00:59 UTC | Merge branch 'tr/maint-1.6.1-doc-format-patch--root' into maint * tr/maint-1.6.1-doc-format-patch--root: Documentation: format-patch --root clarifications | 02 April 2009, 19:00:59 UTC |
| 66c9e7d | Junio C Hamano | 02 April 2009, 18:58:39 UTC | Merge branch 'dm/maint-docco' into maint * dm/maint-docco: Documentation: Remove spurious uses of "you" in git-bisect.txt. Documentation: minor grammatical fix in git-check-ref-format.txt Documentation: minor grammatical fixes in git-check-attr.txt Documentation: minor grammatical fixes in git-cat-file.txt Documentation: minor grammatical fixes and rewording in git-bundle.txt Documentation: remove some uses of the passive voice in git-bisect.txt Documentation: reword example text in git-bisect.txt. Documentation: reworded the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-branch.txt. Documentation: minor grammatical fixes in git-blame.txt. Documentation: reword the "Description" section of git-bisect.txt. Documentation: minor grammatical fixes in git-archive.txt. | 02 April 2009, 18:58:39 UTC |
| 7634817 | Junio C Hamano | 02 April 2009, 05:36:05 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Documentation: Remove an odd "instead" | 02 April 2009, 05:36:05 UTC |
| f054a41 | Junio C Hamano | 02 April 2009, 05:35:57 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: Remove an odd "instead" | 02 April 2009, 05:35:57 UTC |
| 8092bfb | Junio C Hamano | 02 April 2009, 02:34:03 UTC | match_tree_entry(): a pathspec only matches at directory boundaries Previously the code did a simple prefix match, which means that a path in a directory "frotz/" would have matched with pathspec "f". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2009, 02:35:31 UTC |
| f0946cb | Björn Steinbrink | 31 March 2009, 15:05:01 UTC | tree_entry_interesting: a pathspec only matches at directory boundary Previously the code did a simple prefix match, which means that a path in a directory "frotz/" would have matched with pathspec "f". Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 April 2009, 02:35:16 UTC |
| 5bd27eb | Holger Weiß | 31 March 2009, 16:57:01 UTC | Documentation: Remove an odd "instead" Signed-off-by: Holger Weiß <holger@zedat.fu-berlin.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:34:02 UTC |
| 1b89eaa | Jeff King | 31 March 2009, 20:36:00 UTC | t1301: loosen test for forced modes One of the aspects of the test checked explicitly for the g+s bit to be set on created directories. However, this is only the means to an end (the "end" being having the correct group set). And in fact, on systems where DIR_HAS_BSD_GROUP_SEMANTICS is set, we do not even need to use this "means" at all, causing the test to fail. This patch removes that part of the test. In an ideal world it would be replaced by a test to check that the group was properly assigned, but that is difficult to automate because it requires the user running the test suite be a member of multiple groups. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:09:25 UTC |
| fd94836 | Jeff King | 31 March 2009, 12:29:23 UTC | fix portability problem with IS_RUN_COMMAND_ERR Some old versions of gcc don't seem to like us negating an enum constant. Let's work around it by negating the other half of the comparison instead. Reported by Pierre Poissinger on gcc 2.9. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:05:54 UTC |
| bf63780 | Johannes Schindelin | 31 March 2009, 00:18:36 UTC | mailmap: resurrect lower-casing of email addresses Commit 0925ce4(Add map_user() and clear_mailmap() to mailmap) broke the lower-casing of email addresses. This mostly did not matter if your .mailmap has only lower-case email addresses; However, we did not require .mailmap to contain lowercase-only email addresses. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2009, 18:00:54 UTC |
| 8c7f788 | Junio C Hamano | 30 March 2009, 20:29:31 UTC | Update draft release notes to 1.6.2.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 20:29:31 UTC |
| b19293d | Junio C Hamano | 30 March 2009, 20:25:27 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. Conflicts: contrib/completion/git-completion.bash | 30 March 2009, 20:25:27 UTC |
| dcbf041 | Junio C Hamano | 30 March 2009, 20:23:53 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Fix bash completion in path with spaces bash completion: only show 'log --merge' if merging git-tag(1): add hint about commit messages Documentation: update graph api example. | 30 March 2009, 20:23:53 UTC |
| ba7906f | Daniel Cheng (aka SDiZ) | 30 March 2009, 11:27:37 UTC | Fix bash completion in path with spaces Signed-off-by: Daniel Cheng (aka SDiZ) <j16sdiz+freenet@gmail.com> Trivially-acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:07:03 UTC |
| 67f1fe5 | Thomas Rast | 16 February 2009, 16:34:57 UTC | bash completion: only show 'log --merge' if merging The gitk completion only shows --merge if MERGE_HEAD is present. Do it the same way for git-log completion. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:06:48 UTC |
| abfd5fa | Nico -telmich- Schottelius | 30 March 2009, 11:58:21 UTC | git-tag(1): add hint about commit messages If a tag is not annotated, git tag displays the commit message instead. Add this hint to the manpage to unhide this secret. Signed-off-by: Nico Schottelius <nico@ikn.schottelius.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 16:00:04 UTC |
| 7b60d0d | Allan Caffee | 30 March 2009, 14:13:45 UTC | Documentation: update graph api example. As of commit 03300c0 the graph API uses '*' for all nodes including merges. This updates the example in the documentation to match. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 15:59:45 UTC |
| 510a309 | Junio C Hamano | 30 March 2009, 06:11:13 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: import-zips: fix thinko | 30 March 2009, 06:11:13 UTC |
| 8e4f767 | Junio C Hamano | 30 March 2009, 06:11:03 UTC | Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: import-zips: fix thinko | 30 March 2009, 06:11:03 UTC |
| b8fee3a | Eric Wong | 29 March 2009, 06:10:45 UTC | git-svn: fix ls-tree usage with dash-prefixed paths To find the blob object name given a tree and pathname, we were incorrectly calling "git ls-tree" with a "--" argument followed by the pathname of the file we wanted to get. git ls-tree <TREE> -- --dashed/path/name.c Unlike many command-line interfaces, the "--" alone does not symbolize the end of non-option arguments on the command-line. ls-tree interprets the "--" as a prefix to match against, thus the entire contents of the --dashed/* hierarchy would be returned because the "--" matches "--dashed" and every path under it. Thanks to Anton Gyllenberg for pointing me toward the Twisted repository as a real-world example of this case. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 02:58:10 UTC |
| 63801da | Johannes Schindelin | 29 March 2009, 20:42:27 UTC | import-zips: fix thinko Embarrassingly, the common prefix calculation did not work properly, due to a mistake in the assignment: instead of assigning the dirname of the current file name, the dirname of the current common prefix needs to be assigned to common prefix, when the current prefix does not match the current file name. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2009, 02:56:26 UTC |
| 17e61b8 | Junio C Hamano | 28 March 2009, 06:21:00 UTC | set_shared_perm(): sometimes we know what the final mode bits should look like adjust_shared_perm() first obtains the mode bits from lstat(2), expecting to find what the result of applying user's umask is, and then tweaks it as necessary. When the file to be adjusted is created with mkstemp(3), however, the mode thusly obtained does not have anything to do with user's umask, and we would need to start from 0444 in such a case and there is no point running lstat(2) for such a path. This introduces a new API set_shared_perm() to bypass the lstat(2) and instead force setting the mode bits to the desired value directly. adjust_shared_perm() becomes a thin wrapper to the function. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 15:02:15 UTC |
| 3be1f18 | Junio C Hamano | 28 March 2009, 06:14:39 UTC | move_temp_to_file(): do not forget to chmod() in "Coda hack" codepath Now move_temp_to_file() is responsible for doing everything that is necessary to turn a tempfile in $GIT_DIR into its final form, it must make sure "Coda hack" codepath correctly makes the file read-only. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 15:01:21 UTC |
| 9d51564 | Junio C Hamano | 28 March 2009, 07:41:50 UTC | Merge branch 'maint-1.6.1' into maint * maint-1.6.1: test-lib: Clean up comments and Makefile. diff --no-index: Do not generate patch output if other output is requested | 28 March 2009, 07:41:50 UTC |
| 81db4ab | Emil Sit | 28 March 2009, 01:57:18 UTC | test-lib: Clean up comments and Makefile. Bring documentation in test-lib and clean target in Makefile in-line with abc5d372. Signed-off-by: Emil Sit <sit@emilsit.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 07:11:27 UTC |
| fb8b193 | Johan Herland | 26 March 2009, 15:16:47 UTC | Move chmod(foo, 0444) into move_temp_to_file() When writing out a loose object or a pack (index), move_temp_to_file() is called to finalize the resulting file. These files (loose files and packs) should all have permission mode 0444 (modulo adjust_shared_perm()). Therefore, instead of doing chmod(foo, 0444) explicitly from each callsite (or even forgetting to chmod() at all), do the chmod() call from within move_temp_to_file(). Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 05:10:58 UTC |
| 5a688fe | Junio C Hamano | 25 March 2009, 23:19:36 UTC | "core.sharedrepository = 0mode" should set, not loosen This fixes the behaviour of octal notation to how it is defined in the documentation, while keeping the traditional "loosen only" semantics intact for "group" and "everybody". Three main points of this patch are: - For an explicit octal notation, the internal shared_repository variable is set to a negative value, so that we can tell "group" (which is to "OR" in 0660) and 0660 (which is to "SET" to 0660); - git-init did not set shared_repository variable early enough to affect the initial creation of many files, notably copied templates and the configuration. We set it very early when a command-line option specifies a custom value. - Many codepaths create files inside $GIT_DIR by various ways that all involve mkstemp(), and then call move_temp_to_file() to rename it to its final destination. We can add adjust_shared_perm() call here; for the traditional "loosen-only", this would be a no-op for many codepaths because the mode is already loose enough, but with the new behaviour it makes a difference. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2009, 04:51:04 UTC |
| 2d266f9 | Thomas Rast | 26 March 2009, 17:29:25 UTC | Documentation: format-patch --root clarifications Users were confused about the meaning and use of the --root option. Notably, since 68c2ec7 (format-patch: show patch text for the root commit, 2009-01-10), --root has nothing to do with showing the patch text for the root commit any more. Shorten and clarify the corresponding paragraph in the DESCRIPTION section, document --root under OPTIONS, and add an explicit note that root commits are formatted regardless. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 March 2009, 07:38:01 UTC |
| a8fac79 | Carlo Marcelo Arenas Belon | 26 March 2009, 07:08:09 UTC | documentation: update cvsimport description of "-r" for recent clone the "--use-separate-remote" option no longer exists, having since become the default for a clone. Signed-off-by: Carlo Marcelo Arenas Belon <carenas@sajinet.com.pe> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2009, 07:24:26 UTC |
