| c74f97a | Junio C Hamano | 18 January 2012, 23:16:43 UTC | Merge branch 'nd/pathspec-recursion-cleanup' * nd/pathspec-recursion-cleanup: diff-index: enable recursive pathspec matching in unpack_trees Document limited recursion pathspec matching with wildcards | 18 January 2012, 23:16:43 UTC |
| 8ef7933 | Junio C Hamano | 18 January 2012, 23:16:23 UTC | Merge branch 'mh/maint-show-ref-doc' * mh/maint-show-ref-doc: git-show-ref doc: typeset regexp in fixed width font git-show-ref: fix escaping in asciidoc source | 18 January 2012, 23:16:23 UTC |
| 05c65cb | Junio C Hamano | 18 January 2012, 23:16:19 UTC | Merge branch 'tr/maint-word-diff-incomplete-line' * tr/maint-word-diff-incomplete-line: word-diff: ignore '\ No newline at eof' marker | 18 January 2012, 23:16:19 UTC |
| b63103e | Junio C Hamano | 17 January 2012, 00:45:56 UTC | Merge branch 'jn/maint-gitweb-grep-fix' * jn/maint-gitweb-grep-fix: gitweb: Harden "grep" search against filenames with ':' gitweb: Fix file links in "grep" search | 17 January 2012, 00:45:56 UTC |
| 4838237 | Nguyen Thai Ngoc Duy | 15 January 2012, 10:03:27 UTC | diff-index: enable recursive pathspec matching in unpack_trees The pathspec structure has a few bits of data to drive various operation modes after we unified the pathspec matching logic in various codepaths. For example, max_depth field is there so that "git grep" can limit the output for files found in limited depth of tree traversal. Also in order to show just the surface level differences in "git diff-tree", recursive field stops us from descending into deeper level of the tree structure when it is set to false, and this also affects pathspec matching when we have wildcards in the pathspec. The diff-index has always wanted the recursive behaviour, and wanted to match pathspecs without any depth limit. But we forgot to do so when we updated tree_entry_interesting() logic to unify the pathspec matching logic. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 January 2012, 22:17:18 UTC |
| 8c69c1f | Nguyễn Thái Ngọc Duy | 14 January 2012, 09:23:22 UTC | Document limited recursion pathspec matching with wildcards It's actually unlimited recursion if wildcards are active regardless --max-depth Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 January 2012, 02:39:04 UTC |
| 87b340b | Michael Haggerty | 13 January 2012, 16:39:16 UTC | git-show-ref doc: typeset regexp in fixed width font Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 17:50:45 UTC |
| 6ab2608 | Michael Haggerty | 13 January 2012, 16:39:15 UTC | git-show-ref: fix escaping in asciidoc source Two "^" characters were incorrectly being interpreted as markup for superscripting. Fix them by writing them as attribute references "{caret}". Although a single "^" character in a paragraph cannot be misinterpreted in this way, also write other "^" characters as "{caret}" in the interest of good hygiene (unless they are in literal paragraphs, of course, in which context attribute references are not recognized). Spell "{}" consistently, namely *not* quoted as "\{\}". Since the braces are empty, they cannot be interpreted as an attribute reference, and either spelling is OK. So arbitrarily choose one variation and use it consistently. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 17:50:17 UTC |
| 6db5c6e | Junio C Hamano | 13 January 2012, 07:43:28 UTC | Git 1.7.9-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:43:28 UTC |
| 478c446 | Junio C Hamano | 13 January 2012, 07:34:30 UTC | Merge branch 'jc/request-pull-show-head-4' * jc/request-pull-show-head-4: request-pull: use the real fork point when preparing the message | 13 January 2012, 07:34:30 UTC |
| b51ffa8 | Junio C Hamano | 13 January 2012, 07:34:26 UTC | Merge branch 'tr/maint-mailinfo' * tr/maint-mailinfo: mailinfo documentation: accurately describe non -k case | 13 January 2012, 07:34:26 UTC |
| 96e3360 | Junio C Hamano | 13 January 2012, 07:34:21 UTC | Merge branch 'ss/maint-msys-cvsexportcommit' * ss/maint-msys-cvsexportcommit: git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS t9200: On MSYS, do not pass Windows-style paths to CVS | 13 January 2012, 07:34:21 UTC |
| bdb8cb5 | Junio C Hamano | 13 January 2012, 07:34:17 UTC | Merge branch 'jk/maint-upload-archive' * jk/maint-upload-archive: archive: re-allow HEAD:Documentation on a remote invocation | 13 January 2012, 07:34:17 UTC |
| c4a01a3 | Junio C Hamano | 13 January 2012, 07:33:39 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.7.8.4 Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:33:39 UTC |
| ab8a780 | Junio C Hamano | 13 January 2012, 07:33:29 UTC | Update draft release notes to 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:33:29 UTC |
| 5a6a939 | Junio C Hamano | 13 January 2012, 07:31:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Update draft release notes to 1.7.7.6 Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:31:46 UTC |
| 8f83acf | Junio C Hamano | 13 January 2012, 07:31:41 UTC | Update draft release notes to 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:31:41 UTC |
| 901c907 | Junio C Hamano | 13 January 2012, 07:31:05 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Update draft release notes to 1.7.6.6 thin-pack: try harder to use preferred base objects as base | 13 January 2012, 07:31:05 UTC |
| 04f6785 | Junio C Hamano | 13 January 2012, 07:30:53 UTC | Update draft release notes to 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:30:53 UTC |
| 15f07e0 | Jeff King | 12 January 2012, 22:32:34 UTC | thin-pack: try harder to use preferred base objects as base When creating a pack using objects that reside in existing packs, we try to avoid recomputing futile delta between an object (trg) and a candidate for its base object (src) if they are stored in the same packfile, and trg is not recorded as a delta already. This heuristics makes sense because it is likely that we tried to express trg as a delta based on src but it did not produce a good delta when we created the existing pack. As the pack heuristics prefer producing delta to remove data, and Linus's law dictates that the size of a file grows over time, we tend to record the newest version of the file as inflated, and older ones as delta against it. When creating a thin-pack to transfer recent history, it is likely that we will try to send an object that is recorded in full, as it is newer. But the heuristics to avoid recomputing futile delta effectively forbids us from attempting to express such an object as a delta based on another object. Sending an object in full is often more expensive than sending a suboptimal delta based on other objects, and it is even more so if we could use an object we know the receiving end already has (i.e. preferred base object) as the delta base. Tweak the recomputation avoidance logic, so that we do not punt on computing delta against a preferred base object. The effect of this change can be seen on two simulated upload-pack workloads. The first is based on 44 reflog entries from my git.git origin/master reflog, and represents the packs that kernel.org sent me git updates for the past month or two. The second workload represents much larger fetches, going from git's v1.0.0 tag to v1.1.0, then v1.1.0 to v1.2.0, and so on. The table below shows the average generated pack size and the average CPU time consumed for each dataset, both before and after the patch: dataset | reflog | tags --------------------------------- before | 53358 | 2750977 size after | 32398 | 2668479 change | -39% | -3% --------------------------------- before | 0.18 | 1.12 CPU after | 0.18 | 1.15 change | +0% | +3% This patch makes a much bigger difference for packs with a shorter slice of history (since its effect is seen at the boundaries of the pack) though it has some benefit even for larger packs. Signed-off-by: Jeff King <peff@peff.net> Acked-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 January 2012, 07:06:20 UTC |
| c7c2bc0 | Thomas Rast | 12 January 2012, 11:15:33 UTC | word-diff: ignore '\ No newline at eof' marker The word-diff logic accumulates + and - lines until another line type appears (normally [ @\]), at which point it generates the word diff. This is usually correct, but it breaks when the preimage does not have a newline at EOF: $ printf "%s" "a a a" >a $ printf "%s\n" "a ab a" >b $ git diff --no-index --word-diff a b diff --git 1/a 2/b index 9f68e94..6a7c02f 100644 --- 1/a +++ 2/b @@ -1 +1 @@ [-a a a-] No newline at end of file {+a ab a+} Because of the order of the lines in a unified diff @@ -1 +1 @@ -a a a \ No newline at end of file +a ab a the '\' line flushed the buffers, and the - and + lines were never matched with each other. A proper fix would defer such markers until the end of the hunk. However, word-diff is inherently whitespace-ignoring, so as a cheap fix simply ignore the marker (and hide it from the output). We use a prefix match for '\ ' to parallel the logic in apply.c:parse_fragment(). We currently do not localize this string (just accept other variants of it in git-apply), but this should be future-proof. Noticed-by: Ivan Shirokoff <shirokoff@yandex-team.ru> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 19:27:41 UTC |
| 0f544ee | Carlos Martín Nieto | 11 January 2012, 12:12:38 UTC | archive: re-allow HEAD:Documentation on a remote invocation The tightening done in (ee27ca4a: archive: don't let remote clients get unreachable commits, 2011-11-17) went too far and disallowed HEAD:Documentation as it would try to find "HEAD:Documentation" as a ref. Only DWIM the "HEAD" part to see if it exists as a ref. Once we're sure that we've been given a valid ref, we follow the normal code path. This still disallows attempts to access commits which are not branch tips. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 03:21:22 UTC |
| 0e1cfc5 | Junio C Hamano | 12 January 2012, 03:11:28 UTC | Merge branch 'maint' * maint: attr: fix leak in free_attr_elem t2203: fix wrong commit command | 12 January 2012, 03:11:28 UTC |
| 113e828 | Junio C Hamano | 12 January 2012, 03:11:13 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: attr: fix leak in free_attr_elem t2203: fix wrong commit command | 12 January 2012, 03:11:13 UTC |
| afb6b56 | Junio C Hamano | 12 January 2012, 03:11:00 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: attr: fix leak in free_attr_elem t2203: fix wrong commit command | 12 January 2012, 03:11:00 UTC |
| 37475f9 | Jeff King | 12 January 2012, 03:05:03 UTC | attr: fix leak in free_attr_elem This function frees the individual "struct match_attr"s we have allocated, but forgot to free the array holding their pointers, leading to a minor memory leak (but it can add up after checking attributes for paths in many directories). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 03:07:23 UTC |
| 37495ee | Sebastian Schuberth | 11 January 2012, 09:21:10 UTC | git-cvsexportcommit: Fix calling Perl's rel2abs() on MSYS Due to MSYS path mangling GIT_DIR contains a Windows-style path when checked inside a Perl script even if GIT_DIR was previously set to an MSYS-style path in a shell script. So explicitly convert to an MSYS-style path before calling Perl's rel2abs() to make it work. This fix was inspired by a very similar patch in WebKit: http://trac.webkit.org/changeset/76255/trunk/Tools/Scripts/commit-log-editor Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Tested-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 02:04:08 UTC |
| 4397c65 | Sebastian Schuberth | 11 January 2012, 09:20:14 UTC | t9200: On MSYS, do not pass Windows-style paths to CVS For details, see the commit message of 4114156ae9. Note that while using $PWD as part of GIT_DIR is not required here, it does no harm and it is more consistent. In addition, on MSYS using an environment variable should be slightly faster than spawning an external executable. Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 02:02:55 UTC |
| 82553cb | Thomas Rast | 11 January 2012, 20:13:42 UTC | mailinfo documentation: accurately describe non -k case Since its very first description of -k, the documentation for git-mailinfo claimed that (in the case without -k) after cleaning up bracketed strings [blah], it would insert [PATCH]. It doesn't; on the contrary, one of the important jobs of mailinfo is to remove those strings. Since we're already there, rewrite the paragraph to give a complete enumeration of all the transformations. Specifically, it was missing the whitespace normalization (run of isspace(c) -> ' ') and the removal of leading ':'. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 January 2012, 01:30:16 UTC |
| 592ed56 | Nguyễn Thái Ngọc Duy | 11 January 2012, 03:21:38 UTC | t2203: fix wrong commit command Add commit message to avoid commit's aborting due to the lack of commit message, not because there are INTENT_TO_ADD entries in index. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2012, 08:09:36 UTC |
| b7e642e | Junio C Hamano | 11 January 2012, 05:45:52 UTC | request-pull: use the real fork point when preparing the message The command takes the "start" argument and computes the merge base between it and the commit to be pulled so that we can show the diffstat, but uses the "start" argument as-is when composing the message The following changes since commit $X are available to tell the integrator which commit the work is based on. Giving "origin" (most of the time it resolves to refs/remotes/origin/master) as the start argument is often convenient, but it is usually not the fork point, and does not help the integrator at all. Use the real fork point, which is the merge base we already compute, when composing that part of the message. Suggested-by: Linus Torvalds Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 January 2012, 05:51:15 UTC |
| 7e52164 | Junio C Hamano | 10 January 2012, 22:46:52 UTC | Merge branch 'bw/maint-t8006-sed-incomplete-line' * bw/maint-t8006-sed-incomplete-line: Use perl instead of sed for t8006-blame-textconv test | 10 January 2012, 22:46:52 UTC |
| e04dc49 | Junio C Hamano | 10 January 2012, 22:46:22 UTC | Sync with maint Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:46:22 UTC |
| be4d292 | Junio C Hamano | 10 January 2012, 22:27:14 UTC | Prepare for 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:27:14 UTC |
| 55dcc2e | Junio C Hamano | 10 January 2012, 22:24:01 UTC | Merge the attributes fix in from maint-1.6.7 branch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:24:01 UTC |
| 804e97f | Junio C Hamano | 10 January 2012, 22:16:49 UTC | Prepare for 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:16:49 UTC |
| 6c65b5e | Junio C Hamano | 10 January 2012, 22:14:26 UTC | Merge the attributes fix in from maint-1.6.6 branch Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 22:14:26 UTC |
| f14f980 | Junio C Hamano | 10 January 2012, 21:11:03 UTC | Prepare for 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 21:11:03 UTC |
| b6fb7fe | Junio C Hamano | 10 January 2012, 14:57:27 UTC | Documentation: rerere's rr-cache auto-creation and rerere.enabled The description of rerere.enabled left the user in the dark as to who might create an rr-cache directory. Add a note that simply invoking rerere does this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:59:31 UTC |
| c432ef9 | Junio C Hamano | 10 January 2012, 20:28:38 UTC | attr.c: clarify the logic to pop attr_stack Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:28:38 UTC |
| 909ca7b | Junio C Hamano | 10 January 2012, 20:27:37 UTC | attr.c: make bootstrap_attr_stack() leave early Thas would de-dent the body of a function that has grown rather large over time, making it a bit easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 20:27:37 UTC |
| 77f7f82 | Jeff King | 10 January 2012, 19:32:06 UTC | attr: drop misguided defensive coding In prepare_attr_stack, we pop the old elements of the stack (which were left from a previous lookup and may or may not be useful to us). Our loop to do so checks that we never reach the top of the stack. However, the code immediately afterwards will segfault if we did actually reach the top of the stack. Fortunately, this is not an actual bug, since we will never pop all of the stack elements (we will always keep the root gitattributes, as well as the builtin ones). So the extra check in the loop condition simply clutters the code and makes the intent less clear. Let's get rid of it. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 19:55:27 UTC |
| 1afca44 | Jeff King | 10 January 2012, 18:08:21 UTC | attr: don't confuse prefixes with leading directories When we prepare the attribute stack for a lookup on a path, we start with the cached stack from the previous lookup (because it is common to do several lookups in the same directory hierarchy). So the first thing we must do in preparing the stack is to pop any entries that point to directories we are no longer interested in. For example, if our stack contains gitattributes for: foo/bar/baz foo/bar foo but we want to do a lookup in "foo/bar/bleep", then we want to pop the top element, but retain the others. To do this we walk down the stack from the top, popping elements that do not match our lookup directory. However, the test do this simply checked strncmp, meaning we would mistake "foo/bar/baz" as a leading directory of "foo/bar/baz_plus". We must also check that the character after our match is '/', meaning we matched the whole path component. There are two special cases to consider: 1. The top of our attr stack has the empty path. So we must not check for '/', but rather special-case the empty path, which always matches. 2. Typically when matching paths in this way, you would also need to check for a full string match (i.e., the character after is '\0'). We don't need to do so in this case, though, because our path string is actually just the directory component of the path to a file (i.e., we know that it terminates with "/", because the filename comes after that). Helped-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 19:25:40 UTC |
| 8b9624c | Ben Walton | 10 January 2012, 02:47:33 UTC | Use perl instead of sed for t8006-blame-textconv test In test 'blame --textconv with local changes' of t8006-blame-textconv, using /usr/xpg4/bin/sed (as set by SANE_TOOL_PATH), an additional newline was added to the output from the 'helper' script. This was noted by sed with a message such as: sed: Missing newline at end of file zero.bin. Sed then exits with status 2 causing the helper script to also exit with status 2. In turn, this was triggering a fatal error from git blame: fatal: unable to read files to diff To work around this difference in sed behaviour, use perl -p instead of sed -e as it exits cleanly and does not insert the additional newline. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 January 2012, 04:43:48 UTC |
| beecc7a | Junio C Hamano | 09 January 2012, 23:58:47 UTC | Merge branch 'jk/credentials' * jk/credentials: credentials: unable to connect to cache daemon | 09 January 2012, 23:58:47 UTC |
| d9af228 | Junio C Hamano | 09 January 2012, 23:58:43 UTC | Merge branch 'mh/ref-api-less-extra-refs' * mh/ref-api-less-extra-refs: write_head_info(): handle "extra refs" locally show_ref(): remove unused "flag" and "cb_data" arguments receive-pack: move more work into write_head_info() | 09 January 2012, 23:58:43 UTC |
| 242ff87 | Junio C Hamano | 09 January 2012, 23:58:30 UTC | Merge branch 'mm/maint-gitweb-project-maxdepth' * mm/maint-gitweb-project-maxdepth: gitweb: accept trailing "/" in $project_list | 09 January 2012, 23:58:30 UTC |
| e1e3c06 | Junio C Hamano | 09 January 2012, 23:56:58 UTC | Merge branch 'maint' * maint: send-email: multiedit is a boolean config option | 09 January 2012, 23:56:58 UTC |
| 829a1c6 | Jeff King | 09 January 2012, 22:55:42 UTC | send-email: multiedit is a boolean config option The sendemail.multiedit variable is meant to be a boolean. However, it is not marked as such in the code, which means we store its value literally. Thus in the do_edit function, perl ends up coercing it to a boolean value according to perl rules, not git rules. This works for "0", but "false", "no", or "off" will erroneously be interpreted as true. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2012, 23:15:28 UTC |
| 98c2924 | Clemens Buchacher | 07 January 2012, 11:54:36 UTC | credentials: unable to connect to cache daemon Error out if we just spawned the daemon and yet we cannot connect. And always release the string buffer. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 January 2012, 22:38:25 UTC |
| eac2d83 | Junio C Hamano | 06 January 2012, 20:48:17 UTC | Git 1.7.9-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:51:09 UTC |
| 5de89d3 | Junio C Hamano | 06 January 2012, 20:44:07 UTC | Merge branch 'jc/show-sig' * jc/show-sig: log --show-signature: reword the common two-head merge case log-tree: show mergetag in log --show-signature output log-tree.c: small refactor in show_signature() commit --amend -S: strip existing gpgsig headers verify_signed_buffer: fix stale comment gpg-interface: allow use of a custom GPG binary pretty: %G[?GS] placeholders test "commit -S" and "log --show-signature" log: --show-signature commit: teach --gpg-sign option Conflicts: builtin/commit-tree.c builtin/commit.c builtin/merge.c notes-cache.c pretty.c | 06 January 2012, 20:44:07 UTC |
| 4a3a1ed | Junio C Hamano | 06 January 2012, 20:44:03 UTC | Merge branch 'jm/stash-diff-disambiguate' * jm/stash-diff-disambiguate: stash: Don't fail if work dir contains file named 'HEAD' | 06 January 2012, 20:44:03 UTC |
| 1067f8d | Junio C Hamano | 06 January 2012, 20:44:01 UTC | Merge branch 'jh/fetch-head-update' * jh/fetch-head-update: write first for-merge ref to FETCH_HEAD first | 06 January 2012, 20:44:01 UTC |
| 8cbfc11 | Junio C Hamano | 06 January 2012, 20:43:59 UTC | Merge branch 'pw/p4-view-updates' * pw/p4-view-updates: git-p4: view spec documentation git-p4: rewrite view handling git-p4: support single file p4 client view maps git-p4: sort client views by reverse View number git-p4: fix test for unsupported P4 Client Views git-p4: test client view handling | 06 January 2012, 20:43:59 UTC |
| 21c6a18 | Junio C Hamano | 06 January 2012, 20:42:48 UTC | Sync with 1.7.8.3 | 06 January 2012, 20:42:48 UTC |
| 5f4d133 | Junio C Hamano | 06 January 2012, 20:41:39 UTC | Git 1.7.8.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:41:39 UTC |
| b15840e | Junio C Hamano | 06 January 2012, 20:36:43 UTC | Merge branch 'jn/maint-gitweb-utf8-fix' into maint * jn/maint-gitweb-utf8-fix: gitweb: Fix fallback mode of to_utf8 subroutine gitweb: Output valid utf8 in git_blame_common('data') gitweb: esc_html() site name for title in OPML gitweb: Call to_utf8() on input string in chop_and_escape_str() | 06 January 2012, 20:36:43 UTC |
| cfdfc5a | Junio C Hamano | 06 January 2012, 20:35:12 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Documentation: rerere.enabled is the primary way to configure rerere | 06 January 2012, 20:35:12 UTC |
| 8769e93 | Junio C Hamano | 06 January 2012, 20:35:05 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: rerere.enabled is the primary way to configure rerere | 06 January 2012, 20:35:05 UTC |
| 07b88a0 | Thomas Rast | 06 January 2012, 13:08:02 UTC | Documentation: rerere.enabled is the primary way to configure rerere The wording seems to suggest that creating the directory is needed and the setting of rerere.enabled is only for disabling the feature by setting it to 'false'. But the configuration is meant to be the primary control and setting it to 'true' will enable it; the rr-cache directory will be created as necessary and the user does not have to create it. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 20:27:59 UTC |
| 85f2510 | Michael Haggerty | 06 January 2012, 14:12:33 UTC | write_head_info(): handle "extra refs" locally The old code basically did: generate array of SHA1s for alternate refs for each unique SHA1 in array: add_extra_ref(".have", sha1) for each ref (including real refs and extra refs): show_ref(refname, sha1) But there is no need to stuff the alternate refs in extra_refs; we can call show_ref() directly when iterating over the array, then handle real refs separately. So change the code to: generate array of SHA1s for alternate refs for each unique SHA1 in array: show_ref(".have", sha1) for each ref (this now only includes real refs): show_ref(refname, sha1) Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 19:26:41 UTC |
| bc98201 | Michael Haggerty | 06 January 2012, 14:12:32 UTC | show_ref(): remove unused "flag" and "cb_data" arguments The function is not used as a callback, so it doesn't need these arguments. Also change its return type to void. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 19:15:04 UTC |
| b7a025d | Michael Haggerty | 06 January 2012, 14:12:31 UTC | receive-pack: move more work into write_head_info() Move some more code from the calling site into write_head_info(), and inline add_alternate_refs() there. (Some more simplification is coming, and it is easier if all this code is in the same place.) Move some helper functions to avoid the need for forward declarations. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 January 2012, 19:12:50 UTC |
| 8e09fd1 | Jakub Narebski | 05 January 2012, 20:32:56 UTC | gitweb: Harden "grep" search against filenames with ':' Run "git grep" in "grep" search with '-z' option, to be able to parse response also for files with filename containing ':' character. The ':' character is otherwise (without '-z') used to separate filename from line number and from matched line. Note that this does not protect files with filename containing embedded newline. This would be hard but doable for text files, and harder or even currently impossible with binary files: git does not quote filename in "Binary file <foo> matches" message, but new `--break` and/or `--header` options to git-grep could help here. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:29:51 UTC |
| ff7f218 | Jakub Narebski | 05 January 2012, 20:26:48 UTC | gitweb: Fix file links in "grep" search There were two bugs in generating file links (links to "blob" view), one hidden by the other. The correct way of generating file link is href(action=>"blob", hash_base=>$co{'id'}, file_name=>$file); It was $co{'hash'} (this key does not exist, and therefore this is undef), and 'hash' instead of 'hash_base'. To have this fix applied in single place, this commit also reduces code duplication by saving file link (which is used for line links) in $file_href. Reported-by: Thomas Perl <th.perl@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:29:50 UTC |
| d041ffa | Junio C Hamano | 05 January 2012, 00:23:12 UTC | log --show-signature: reword the common two-head merge case While identifying the commit merged to our history as "parent #2" is technically correct, we will never say "parent #1" (as that is the tip of our history before the merge is made), and we rarely would say "parent #3" (which would mean the merge is an octopus), especially when responding to a request to pull a signed tag. Treat the most common case to merge a single commit specially, and just say "merged tag '<tagname>'" instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:27 UTC |
| 824958e | Junio C Hamano | 04 January 2012, 21:51:28 UTC | log-tree: show mergetag in log --show-signature output A commit object that merges a signed tag records the "mergetag" extended header. Check the validity of the GPG signature on it, and show it in a way similar to how "gpgsig" extended header is shown. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:27 UTC |
| c6b3ec4 | Junio C Hamano | 04 January 2012, 21:48:45 UTC | log-tree.c: small refactor in show_signature() The next patch needs to show the result of signature verification on a mergetag extended header in a way similar to how embedded signature for the commit object itself is shown. Separate out the logic to go through the message lines and show them in the "error" color (highlighted) or the "correct" color (dim). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| c871a1d | Junio C Hamano | 05 January 2012, 18:54:14 UTC | commit --amend -S: strip existing gpgsig headers Any existing commit signature was made against the contents of the old commit, including its committer date that is about to change, and will become invalid by amending it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| e3f55e0 | Junio C Hamano | 04 January 2012, 20:43:02 UTC | verify_signed_buffer: fix stale comment The function used to take an integer flag to specify where the output should go, but these days we supply a strbuf to receive it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 21:02:26 UTC |
| 9d3d784 | Junio C Hamano | 05 January 2012, 19:00:38 UTC | Merge branch 'jc/signed-commit' and 'jc/pull-signed-tag' They both use the extended headers in commit objects, and the former has necessary infrastructure to show them that is useful to view the result of the latter. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2012, 19:00:49 UTC |
| 247f9d2 | Junio C Hamano | 04 January 2012, 19:21:42 UTC | Merge branch 'maint' * maint: t5550: repack everything into one file Catch invalid --depth option passed to clone or fetch | 04 January 2012, 19:21:42 UTC |
| 1327d83 | Clemens Buchacher | 04 January 2012, 15:55:34 UTC | t5550: repack everything into one file Subsequently we assume that there is only one pack. Currently this is true only by accident. Pass '-a -d' to repack in order to guarantee that assumption to hold true. The prune-packed command is now redundant since repack -d already calls it. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 18:04:59 UTC |
| ac593b7 | Matthieu Moy | 04 January 2012, 10:07:45 UTC | gitweb: accept trailing "/" in $project_list The current code is removing the trailing "/", but computing the string length on the previous value, i.e. with the trailing "/". Later in the code, we do my $path = substr($File::Find::name, $pfxlen + 1); And the "$pfxlen + 1" is supposed to mean "the length of the prefix, plus 1 for the / separating the prefix and the path", but with an incorrect $pfxlen, this basically eats the first character of the path, and yields "404 - No projects found". While we're there, also fix $pfxdepth to use $dir, although a change of 1 in the depth shouldn't really matter. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 17:54:06 UTC |
| 6ea9385 | Junio C Hamano | 04 January 2012, 17:43:26 UTC | Merge branch 'nd/maint-parse-depth' into maint * nd/maint-parse-depth: Catch invalid --depth option passed to clone or fetch | 04 January 2012, 17:43:26 UTC |
| e7622ce | Nguyễn Thái Ngọc Duy | 04 January 2012, 10:01:55 UTC | Catch invalid --depth option passed to clone or fetch Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 17:39:36 UTC |
| 96890f4 | Joey Hess | 26 December 2011, 16:16:56 UTC | write first for-merge ref to FETCH_HEAD first The FETCH_HEAD refname is supposed to refer to the ref that was fetched and should be merged. However all fetched refs are written to .git/FETCH_HEAD in an arbitrary order, and resolve_ref_unsafe simply takes the first ref as the FETCH_HEAD, which is often the wrong one, when other branches were also fetched. The solution is to write the for-merge ref(s) to FETCH_HEAD first. Then, unless --append is used, the FETCH_HEAD refname behaves as intended. If the user uses --append, they presumably are doing so in order to preserve the old FETCH_HEAD. While we are at it, update an old example in the read-tree documentation that implied that each entry in FETCH_HEAD only has the object name, which is not true for quite a while. [jc: adjusted tests] Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2012, 00:13:14 UTC |
| 896a681 | Pete Wyckoff | 02 January 2012, 23:05:54 UTC | git-p4: view spec documentation Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| ecb7cf9 | Pete Wyckoff | 02 January 2012, 23:05:53 UTC | git-p4: rewrite view handling The old code was not very complete or robust. Redo it. This new code should be useful for a few possible additions in the future: - support for * and %%n wildcards - allowing ... inside paths - representing branch specs (not just client specs) - tracking changes to views Mark the remaining 12 tests in t9809 as fixed. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| e3e6864 | Gary Gibbons | 02 January 2012, 23:05:52 UTC | git-p4: support single file p4 client view maps Perforce client views can map individual files, mapping one //depot file path to one //client file path. These mappings contain no meta/masking characters. This patch add support for these file maps to the currently supported '...' view mappings. [pw: one test now suceeds] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:03 UTC |
| df5ed90 | Gary Gibbons | 02 January 2012, 23:05:51 UTC | git-p4: sort client views by reverse View number Correct view sorting to support the Perforce order, where client views are ordered and later views override earlier view mappings. [pw: one test now succeeds] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| b10048d | Gary Gibbons | 02 January 2012, 23:05:50 UTC | git-p4: fix test for unsupported P4 Client Views Change re method in test for unsupported Client View types (containing %% or *) anywhere in the string rather than at the begining. [pw: two tests now succeed] Signed-off-by: Gary Gibbons <ggibbons@perforce.com> Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| c700b68 | Pete Wyckoff | 02 January 2012, 23:05:49 UTC | git-p4: test client view handling Test many aspects of processing p4 client views with the git-p4 option --use-client-spec. 16 out of 22 tests are currently broken. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 22:10:02 UTC |
| 4570aeb | Junio C Hamano | 03 January 2012, 22:09:28 UTC | Merge branch 'pw/p4-docs-and-tests' * pw/p4-docs-and-tests: git-p4: document and test submit options git-p4: test and document --use-client-spec git-p4: test --keep-path git-p4: test --max-changes git-p4: document and test --import-local git-p4: honor --changesfile option and test git-p4: document and test clone --branch git-p4: test cloning with two dirs, clarify doc git-p4: clone does not use --git-dir git-p4: introduce asciidoc documentation rename git-p4 tests | 03 January 2012, 22:09:28 UTC |
| 228c341 | Junio C Hamano | 03 January 2012, 21:48:00 UTC | Merge branch 'maint' * maint: docs: describe behavior of relative submodule URLs fix hang in git fetch if pointed at a 0 length bundle Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:48:00 UTC |
| bc0fe84 | Junio C Hamano | 03 January 2012, 21:47:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: docs: describe behavior of relative submodule URLs Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:47:46 UTC |
| c07aa5b | Junio C Hamano | 03 January 2012, 21:47:15 UTC | Merge branch 'maint-1.7.6' into maint-1.7.7 * maint-1.7.6: Documentation: read-tree --prefix works with existing subtrees Add MYMETA.json to perl/.gitignore | 03 January 2012, 21:47:15 UTC |
| 9e6ed47 | Jens Lehmann | 01 January 2012, 15:13:16 UTC | docs: describe behavior of relative submodule URLs Since the relative submodule URLs have been introduced in f31a522a2d, they do not conform to the rules for resolving relative URIs but rather to those of relative directories. Document that behavior. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 20:47:58 UTC |
| 54440e1 | Brian Harring | 03 January 2012, 13:46:03 UTC | fix hang in git fetch if pointed at a 0 length bundle git-repo if interupted at the exact wrong time will generate zero length bundles- literal empty files. git-repo is wrong here, but git fetch shouldn't effectively spin loop if pointed at a zero length bundle. Signed-off-by: Brian Harring <ferringb@chromium.org> Helped-by: Johannes Sixt Helped-by: Nguyen Thai Ngoc Duy Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 January 2012, 20:13:28 UTC |
| 5c951ef | Clemens Buchacher | 31 December 2011, 11:50:56 UTC | Documentation: read-tree --prefix works with existing subtrees Since 34110cd4 (Make 'unpack_trees()' have a separate source and destination index) it is no longer true that a subdirectory with the same prefix must not exist. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2012, 09:18:53 UTC |
| 44df2e2 | Jonathon Mah | 31 December 2011, 00:14:01 UTC | stash: Don't fail if work dir contains file named 'HEAD' When performing a plain "git stash" (without --patch), git-diff would fail with "fatal: ambiguous argument 'HEAD': both revision and filename". The output was piped into git-update-index, masking the failed exit status. The output is now sent to a temporary file (which is cleaned up by existing code), and the exit status is checked. The "HEAD" arg to the git-diff invocation has been disambiguated too, of course. In patch mode, "git stash -p" would fail harmlessly, leaving the working dir untouched. Interactive adding is fine, but the resulting tree was diffed with an ambiguous 'HEAD' argument. Use >foo (no space) when redirecting output. In t3904, checks and operations on each file are in the order they'll appear when interactively staging. In t3905, fix a bug in "stash save --include-untracked -q is quiet": The redirected stdout file was considered untracked, and so was removed from the working directory. Use test path helper functions where appropriate. Signed-off-by: Jonathon Mah <me@JonathonMah.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 January 2012, 09:11:56 UTC |
| 0eddcbf | Jack Nagel | 29 December 2011, 04:42:05 UTC | Add MYMETA.json to perl/.gitignore ExtUtils::MakeMaker generates MYMETA.json in addition to MYMETA.yml since version 6.57_07. As it suggests, it is just meta information about the build and is cleaned up with 'make clean', so it should be ignored. Signed-off-by: Jack Nagel <jacknagel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2011, 21:08:47 UTC |
| 17b4e93 | Junio C Hamano | 28 December 2011, 20:07:22 UTC | Update draft release notes to 1.7.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:07:22 UTC |
| 48de656 | Junio C Hamano | 28 December 2011, 20:04:25 UTC | Sync with 1.7.8.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:04:25 UTC |
| f3f778d | Junio C Hamano | 28 December 2011, 19:49:09 UTC | Git 1.7.8.2 Contains accumulated fixes since 1.7.8 that have been merged to the 'master' branch in preparation for the 1.7.9 release. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2011, 20:03:24 UTC |
| 9a8e485 | Junio C Hamano | 28 December 2011, 20:03:19 UTC | Merge branch 'jv/maint-config-set' into maint * jv/maint-config-set: Fix an incorrect reference to --set-all. | 28 December 2011, 20:03:19 UTC |
| 0d57085 | Junio C Hamano | 28 December 2011, 19:49:37 UTC | Merge branch 'jk/follow-rename-score' into maint * jk/follow-rename-score: use custom rename score during --follow | 28 December 2011, 19:49:37 UTC |
| 9b0b0b4 | Junio C Hamano | 28 December 2011, 19:44:54 UTC | Merge branch 'jc/checkout-m-twoway' into maint * jc/checkout-m-twoway: t/t2023-checkout-m.sh: fix use of test_must_fail checkout_merged(): squelch false warning from some gcc Test 'checkout -m -- path' checkout -m: no need to insist on having all 3 stages | 28 December 2011, 19:44:54 UTC |
| 00754b2 | Junio C Hamano | 28 December 2011, 19:42:51 UTC | Merge branch 'tr/doc-sh-setup' into maint * tr/doc-sh-setup: git-sh-setup: make require_clean_work_tree part of the interface | 28 December 2011, 19:42:51 UTC |
