d9f5ef7 | Junio C Hamano | 26 April 2012, 16:59:22 UTC | Git 1.7.8.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 April 2012, 17:14:45 UTC |
aba5f57 | Junio C Hamano | 26 April 2012, 16:52:33 UTC | Sync with 1.7.7.7 | 26 April 2012, 16:52:33 UTC |
8258858 | Junio C Hamano | 26 April 2012, 16:41:52 UTC | Git 1.7.7.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 April 2012, 16:41:52 UTC |
97afde1 | Jonathan Nieder | 26 April 2012, 05:53:59 UTC | bundle: remove stray single-quote from error message After running rev-list --boundary to retrieve the list of boundary commits, "git bundle create" runs its own revision walk. If in this stage git encounters an unfamiliar option, it writes a message with an unbalanced quotation mark: error: unrecognized argument: --foo' Drop the stray quote to match the "unrecognized argument: %s" message used elsewhere and save translators some work. This is mostly a futureproofing measure: for now, the "rev-list --boundary" command catches most strange arguments on its own and the above message is not seen unless you try something esoteric like "git bundle create test.bundle --header HEAD". Reported-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 April 2012, 15:08:07 UTC |
b1bcfbe | Junio C Hamano | 09 April 2012, 20:43:16 UTC | Merge branch 'jc/maint-verify-objects-remove-pessimism' into maint-1.7.8 * jc/maint-verify-objects-remove-pessimism: fetch/receive: remove over-pessimistic connectivity check | 09 April 2012, 20:43:16 UTC |
795283c | Junio C Hamano | 09 April 2012, 20:42:56 UTC | Merge branch 'dw/gitweb-doc-grammo' into maint-1.7.8 * dw/gitweb-doc-grammo: Documentation/gitweb: trivial English fixes | 09 April 2012, 20:42:56 UTC |
6d5c16a | Junio C Hamano | 09 April 2012, 20:40:32 UTC | Merge branch 'tr/cache-tree' into maint-1.7.8 * tr/cache-tree: t0090: be prepared that 'wc -l' writes leading blanks reset: update cache-tree data when appropriate commit: write cache-tree data when writing index anyway Refactor cache_tree_update idiom from commit Test the current state of the cache-tree optimization Add test-scrap-cache-tree | 09 April 2012, 20:40:32 UTC |
00fb2d2 | Junio C Hamano | 09 April 2012, 20:38:41 UTC | Merge branch 'cb/maint-t5541-make-server-port-portable' into maint-1.7.8 * cb/maint-t5541-make-server-port-portable: t5541: check error message against the real port number used remote-curl: Fix push status report when all branches fail | 09 April 2012, 20:38:41 UTC |
fc2d99f | Junio C Hamano | 09 April 2012, 20:36:44 UTC | Merge branch 'cn/maint-rev-list-doc' into maint-1.7.8 * cn/maint-rev-list-doc: Documentation: use {asterisk} in rev-list-options.txt when needed | 09 April 2012, 20:36:44 UTC |
50c9403 | Junio C Hamano | 09 April 2012, 20:36:26 UTC | Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8 * tr/maint-bundle-boundary: bundle: keep around names passed to add_pending_object() t5510: ensure we stay in the toplevel test dir t5510: refactor bundle->pack conversion | 09 April 2012, 20:36:26 UTC |
8502a77 | Junio C Hamano | 09 April 2012, 20:36:20 UTC | Merge branch 'tr/maint-bundle-long-subject' into maint-1.7.8 * tr/maint-bundle-long-subject: t5704: match tests to modern style strbuf: improve strbuf_get*line documentation bundle: use a strbuf to scan the log for boundary commits bundle: put strbuf_readline_fd in strbuf.c with adjustments | 09 April 2012, 20:36:20 UTC |
dbdc07f | Junio C Hamano | 09 April 2012, 20:34:09 UTC | Merge branch 'ph/rerere-doc' into maint-1.7.8 * ph/rerere-doc: rerere: Document 'rerere remaining' | 09 April 2012, 20:34:09 UTC |
c32c959 | D Waitzman | 23 March 2012, 15:02:43 UTC | Documentation/gitweb: trivial English fixes Change "it's" to "its" where a possessive is intended. Also add two missing "the" that were noticed by Ben Walton. Signed-off-by: David Waitzman <djw@bbn.com> | 23 March 2012, 18:22:04 UTC |
d4c813d | Junio C Hamano | 20 March 2012, 22:26:19 UTC | Merge branch 'ks/sort-wildcard-in-makefile' into maint-1.7.8 * ks/sort-wildcard-in-makefile: t/Makefile: Use $(sort ...) explicitly where needed | 20 March 2012, 22:26:19 UTC |
39af789 | Junio C Hamano | 20 March 2012, 22:25:38 UTC | Merge branch 'jc/advise-i18n' into maint-1.7.8 * jc/advise-i18n: i18n of multi-line advice messages | 20 March 2012, 22:25:38 UTC |
bd193f4 | Junio C Hamano | 20 March 2012, 22:24:23 UTC | Merge branch 'jn/gitweb-unspecified-action' into maint-1.7.8 * jn/gitweb-unspecified-action: gitweb: Fix actionless dispatch for non-existent objects | 20 March 2012, 22:24:23 UTC |
d21c463 | Junio C Hamano | 15 March 2012, 21:57:02 UTC | fetch/receive: remove over-pessimistic connectivity check Git 1.7.8 introduced an object and history re-validation step after "fetch" or "push" causes new history to be added to a receiving repository. This is to protect a malicious server or pushing client from corrupting the repository by taking advantage of an existing corrupt object that is unconnected to existing history. But this check is way over-pessimistic. During "fetch" or "receive-pack" (the server side of "push"), unpack-objects and index-pack already validate individual objects that are received, and the only thing we would want to catch are corrupted objects that already happen to exist in our repository but are not referenced from our refs. Such objects must have been written by an earlier run of our codepaths that write out loose objects or packfiles, and they must have done the validation of individual objects when they did so. The only thing left to worry about is the connectivity integrity, which can be checked with "rev-list --objects", which is much cheaper. We have been paying the 5x to 8x runtime overhead the --verify-objects often adds for no real gain. Revert check_everything_connected() not to use this over-pessimistic check. Credit goes to Nguyễn Thái Ngọc Duy, who originally identified the performance regression and endured multiple rounds of reviews to fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2012, 22:23:17 UTC |
3e7a1df | Phil Hord | 08 March 2012, 21:08:50 UTC | rerere: Document 'rerere remaining' This adds the 'remaining' command to the documentation of 'git rerere'. This command was added in ac49f5ca (Feb 16 2011; Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>) but it was never documented. Touch up the other rerere commands to reduce noise. First noticed by Vincent van Ravesteijn. Signed-off-by: Phil Hord <phil.hord@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2012, 22:40:44 UTC |
e521850 | Junio C Hamano | 06 March 2012, 20:04:48 UTC | Merge branch 'maint-1.7.7' into maint-1.7.8 By Thomas Rast * maint-1.7.7: Document the --histogram diff option | 06 March 2012, 20:04:48 UTC |
d909e07 | Thomas Rast | 06 March 2012, 13:15:02 UTC | Document the --histogram diff option Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2012, 19:53:29 UTC |
efe4be1 | Thomas Rast | 01 March 2012, 21:40:51 UTC | bundle: keep around names passed to add_pending_object() The 'name' field passed to add_pending_object() is used to later deduplicate in object_array_remove_duplicates(). git-bundle had a bug in this area since 18449ab (git-bundle: avoid packing objects which are in the prerequisites, 2007-03-08): it passed the name of each boundary object in a static buffer. In other words, all that object_array_remove_duplicates() saw was the name of the *last* added boundary object. The recent switch to a strbuf in bc2fed4 (bundle: use a strbuf to scan the log for boundary commits, 2012-02-22) made this slightly worse: we now free the buffer at the end, so it is not even guaranteed that it still points into addressable memory by the time object_array_remove_ duplicates looks at it. On the plus side however, it was now detectable by valgrind. The fix is easy: pass a copy of the string to add_pending_object. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2012, 22:34:42 UTC |
aa98285 | Thomas Rast | 01 March 2012, 21:40:49 UTC | t5510: ensure we stay in the toplevel test dir The last test descended into a subdir without ever re-emerging, which is not so nice to the next test writer. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2012, 22:34:14 UTC |
61821aa | Thomas Rast | 01 March 2012, 21:40:48 UTC | t5510: refactor bundle->pack conversion It's not so much a conversion as a "strip everything up to and including the first blank line", but it will come in handy again. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2012, 22:25:57 UTC |
e34bb2e | Carlos Martín Nieto | 28 February 2012, 15:35:48 UTC | Documentation: use {asterisk} in rev-list-options.txt when needed Text between two '*' is emphasized in AsciiDoc and makes explanations in rev-list-options.txt on glob-related options very confusing, as the rendered text would be missing two asterisks and the text between them would be emphasized instead. Use '{asterisk}' where needed to make them show up as asterisks in the rendered text. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2012, 21:17:14 UTC |
c524ceb | Junio C Hamano | 27 February 2012, 00:40:20 UTC | Git 1.7.8.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2012, 00:40:20 UTC |
fba4f12 | Michał Kiedrowicz | 25 February 2012, 09:24:28 UTC | grep -P: Fix matching ^ and $ When "git grep" is run with -P/--perl-regexp, it doesn't match ^ and $ at the beginning/end of the line. This is because PCRE normally matches ^ and $ at the beginning/end of the whole text, not for each line, and "git grep" passes a large chunk of text (possibly containing many lines) to pcre_exec() and then splits the text into lines. This makes "git grep -P" behave differently from "git grep -E" and also from "grep -P" and "pcregrep": $ cat file a b $ git grep --no-index -P '^ ' file $ git grep --no-index -E '^ ' file file: b $ grep -c -P '^ ' file b $ pcregrep -c '^ ' file b Reported-by: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2012, 00:34:03 UTC |
f0c5793 | Jim Meyering | 25 February 2012, 17:34:26 UTC | am: don't infloop for an empty input file git-am.sh's check_patch_format function would attempt to preview the patch to guess its format, but would go into an infinite loop when the patch file happened to be empty. The solution: exit the loop when "read" fails, not when the line var, "$l1" becomes empty. Signed-off-by: Jim Meyering <meyering@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2012, 00:32:54 UTC |
ad687b4 | Andrew Wong | 25 February 2012, 04:31:22 UTC | rebase -m: only call "notes copy" when rewritten exists and is non-empty This prevents a shell error complaining rebase-merge/rewritten doesn't exist. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2012, 00:32:37 UTC |
39cb644 | Dmitry V. Levin | 24 February 2012, 23:42:42 UTC | Makefile: add thread-utils.h to LIB_H Starting with commit v1.7.8-165-g0579f91, grep.h includes thread-utils.h, so the latter has to be added to LIB_H. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2012, 22:31:26 UTC |
8a557bb | Thomas Rast | 23 February 2012, 09:42:23 UTC | t5704: match tests to modern style The test did not adhere to the current style on several counts: . empty lines around the test blocks, but within the test string . ': > file' or even just '> file' with an extra space . inconsistent indentation . hand-rolled commits instead of using test_commit Fix all of them. There's a catch to the last point: test_commit creates a tag, which the original test did not create. We still change it to test_commit, and explicitly delete the tags, so as to highlight that the test relies on not having them. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2012, 21:53:27 UTC |
1c5f93b | Thomas Rast | 23 February 2012, 09:42:21 UTC | strbuf: improve strbuf_get*line documentation Clarify strbuf_getline() documentation, and add the missing documentation for strbuf_getwholeline() and strbuf_getwholeline_fd(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2012, 21:52:11 UTC |
bc2fed4 | Thomas Rast | 22 February 2012, 19:34:23 UTC | bundle: use a strbuf to scan the log for boundary commits The first part of the bundle header contains the boundary commits, and could be approximated by # v2 git bundle $(git rev-list --pretty=oneline --boundary <ARGS> | grep ^-) git-bundle actually spawns exactly this rev-list invocation, and does the grepping internally. There was a subtle bug in the latter step: it used fgets() with a 1024-byte buffer. If the user has sufficiently long subjects (e.g., by not adhering to the git oneline-subject convention in the first place), the 'oneline' format can easily overflow the buffer. fgets() then returns the rest of the line in the next call(s). If one of these remaining parts started with '-', git-bundle would mistakenly insert it into the bundle thinking it was a boundary commit. Fix it by using strbuf_getwholeline() instead, which handles arbitrary line lengths correctly. Note that on the receiving side in parse_bundle_header() we were already using strbuf_getwholeline_fd(), so that part is safe. Reported-by: Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2012, 17:36:44 UTC |
5e8617f | Thomas Rast | 22 February 2012, 19:34:22 UTC | bundle: put strbuf_readline_fd in strbuf.c with adjustments The comment even said that it should eventually go there. While at it, match the calling convention and name of the function to the strbuf_get*line family. So it now is strbuf_getwholeline_fd. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2012, 02:58:16 UTC |
d202a51 | Clemens Buchacher | 13 February 2012, 20:17:14 UTC | t5541: check error message against the real port number used Otherwise the test cannot be run with custom port set to LIB_HTTPD_PORT. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2012, 21:25:40 UTC |
d0482e8 | Junio C Hamano | 06 February 2012, 07:52:53 UTC | Sync with 1.7.6.6 * maint-1.7.7: Git 1.7.6.6 imap-send: remove dead code | 06 February 2012, 07:52:53 UTC |
110c511 | Junio C Hamano | 06 February 2012, 07:52:25 UTC | Sync with 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:52:25 UTC |
f174a25 | Junio C Hamano | 06 February 2012, 07:46:44 UTC | Git 1.7.6.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:50:52 UTC |
28b22f8 | Jeff King | 06 February 2012, 06:29:37 UTC | imap-send: remove dead code The imap-send code was adapted from another project, and still contains many unused bits of code. One of these bits contains a type "struct string_list" which bears no resemblence to the "struct string_list" we use elsewhere in git. This causes the compiler to complain if git's string_list ever becomes part of cache.h. Let's just drop the dead code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2012, 07:44:56 UTC |
aae5239 | Kirill Smelkov | 03 September 2011, 20:41:21 UTC | t/Makefile: Use $(sort ...) explicitly where needed Starting from GNU Make 3.82 $(wildcard ...) no longer sorts the result (from NEWS): * WARNING: Backward-incompatibility! Wildcards were not documented as returning sorted values, but the results have been sorted up until this release.. If your makefiles require sorted results from wildcard expansions, use the $(sort ...) function to request it explicitly. http://repo.or.cz/w/make.git/commitdiff/2a59dc32aaf0681dec569f32a9d7ab88a379d34f I usually watch test progress visually, and if tests are sorted, even with make -j4 they go more or less incrementally by their t number. On the other side, without sorting, tests are executed in seemingly random order even for -j1. Let's please maintain sane tests order for perceived prettyness. Another note is that in GNU Make sort also works as uniq, so after sort being removed, we might expect e.g. $(wildcard *.sh a.*) to produce duplicates for e.g. "a.sh". From this point of view, adding sort could be seen as hardening t/Makefile from accidentally introduced dups. It turned out that prevous releases of GNU Make did not perform full sort in $(wildcard), only sorting results for each pattern, that's why explicit sort-as-uniq is relevant even for older makes. Signed-off-by: Kirill Smelkov <kirr@navytux.spb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2012, 22:55:16 UTC |
5238cbf | Shawn O. Pearce | 20 January 2012, 03:12:09 UTC | remote-curl: Fix push status report when all branches fail The protocol between transport-helper.c and remote-curl requires remote-curl to always print a blank line after the push command has run. If the blank line is ommitted, transport-helper kills its container process (the git push the user started) with exit(128) and no message indicating a problem, assuming the helper already printed reasonable error text to the console. However if the remote rejects all branches with "ng" commands in the report-status reply, send-pack terminates with non-zero status, and in turn remote-curl exited with non-zero status before outputting the blank line after the helper status printed by send-pack. No error messages reach the user. This caused users to see the following from git push over HTTP when the remote side's update hook rejected the branch: $ git push http://... master Counting objects: 4, done. Delta compression using up to 6 threads. Compressing objects: 100% (2/2), done. Writing objects: 100% (3/3), 301 bytes, done. Total 3 (delta 0), reused 0 (delta 0) $ Always print a blank line after the send-pack process terminates, ensuring the helper status report (if it was output) will be correctly parsed by the calling transport-helper.c. This ensures the helper doesn't abort before the status report can be shown to the user. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 January 2012, 18:14:32 UTC |
c572f49 | Junio C Hamano | 18 January 2012, 23:51:00 UTC | Git 1.7.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:51:00 UTC |
d899cf5 | Junio C Hamano | 18 January 2012, 23:48:46 UTC | Merge branch 'maint-1.7.7' into maint * maint-1.7.7: Git 1.7.7.6 diff-index: enable recursive pathspec matching in unpack_trees Conflicts: GIT-VERSION-GEN | 18 January 2012, 23:48:46 UTC |
0065343 | Junio C Hamano | 18 January 2012, 23:46:31 UTC | Git 1.7.7.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 January 2012, 23:46:31 UTC |
5c8eeb8 | 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> | 18 January 2012, 23:44:02 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 |
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 |
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 |
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 |
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 |
18ab83e | Jakub Narebski | 07 January 2012, 10:47:38 UTC | gitweb: Fix actionless dispatch for non-existent objects When gitweb URL does not provide action explicitly, e.g. http://git.example.org/repo.git/branch dispatch() tries to guess action (view to be used) based on remaining parameters. Among others it is based on the type of requested object, which gave problems when asking for non-existent branch or file (for example misspelt name). Now undefined $action from dispatch() should not result in problems. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 January 2012, 21:30:59 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 |
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 |
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 |
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 |
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 |
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 |
b42e81a | Junio C Hamano | 28 December 2011, 19:42:46 UTC | Merge branch 'jk/maint-strbuf-missing-init' into maint * jk/maint-strbuf-missing-init: commit, merge: initialize static strbuf | 28 December 2011, 19:42:46 UTC |
4a242d6 | Junio C Hamano | 28 December 2011, 19:42:42 UTC | Merge branch 'jk/maint-push-v-is-verbose' into maint * jk/maint-push-v-is-verbose: make "git push -v" actually verbose | 28 December 2011, 19:42:42 UTC |
b5c1279 | Junio C Hamano | 28 December 2011, 19:42:37 UTC | Merge branch 'jk/http-push-to-empty' into maint * jk/http-push-to-empty: remote-curl: don't pass back fake refs Conflicts: remote-curl.c | 28 December 2011, 19:42:37 UTC |
81eaa06 | Junio C Hamano | 28 December 2011, 19:42:33 UTC | Merge branch 'jk/doc-fsck' into maint * jk/doc-fsck: docs: brush up obsolete bits of git-fsck manpage | 28 December 2011, 19:42:33 UTC |
23838b8 | Junio C Hamano | 28 December 2011, 19:42:27 UTC | Merge branch 'jc/maint-lf-to-crlf-keep-crlf' into maint * jc/maint-lf-to-crlf-keep-crlf: lf_to_crlf_filter(): resurrect CRLF->CRLF hack | 28 December 2011, 19:42:27 UTC |
e8f6b51 | Junio C Hamano | 28 December 2011, 19:42:24 UTC | Merge branch 'ef/setenv-putenv' into maint * ef/setenv-putenv: compat/setenv.c: error if name contains '=' compat/setenv.c: update errno when erroring out | 28 December 2011, 19:42:24 UTC |
3c06ab6 | Junio C Hamano | 28 December 2011, 19:32:39 UTC | Merge branch 'jc/advice-doc' into maint * jc/advice-doc: advice: Document that they all default to true | 28 December 2011, 19:32:39 UTC |
770dd00 | Junio C Hamano | 28 December 2011, 19:32:39 UTC | Merge branch 'jn/maint-sequencer-fixes' into maint * jn/maint-sequencer-fixes: revert: stop creating and removing sequencer-old directory Revert "reset: Make reset remove the sequencer state" revert: do not remove state until sequence is finished revert: allow single-pick in the middle of cherry-pick sequence revert: pass around rev-list args in already-parsed form revert: allow cherry-pick --continue to commit before resuming revert: give --continue handling its own function | 28 December 2011, 19:32:39 UTC |
7fc1495 | Junio C Hamano | 28 December 2011, 19:32:38 UTC | Merge branch 'jk/maint-snprintf-va-copy' into maint * jk/maint-snprintf-va-copy: compat/snprintf: don't look at va_list twice | 28 December 2011, 19:32:38 UTC |
f1c12e1 | Junio C Hamano | 28 December 2011, 19:32:37 UTC | Merge branch 'jk/maint-push-over-dav' into maint * jk/maint-push-over-dav: http-push: enable "proactive auth" t5540: test DAV push with authentication | 28 December 2011, 19:32:37 UTC |
699eb54 | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'jk/maint-mv' into maint * jk/maint-mv: mv: be quiet about overwriting mv: improve overwrite warning mv: make non-directory destination error more clear mv: honor --verbose flag docs: mention "-k" for both forms of "git mv" | 28 December 2011, 19:32:36 UTC |
7a5638a | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'jk/fetch-no-tail-match-refs' into maint * jk/fetch-no-tail-match-refs: connect.c: drop path_match function fetch-pack: match refs exactly t5500: give fully-qualified refs to fetch-pack drop "match" parameter from get_remote_heads | 28 December 2011, 19:32:36 UTC |
2cb1ff9 | Junio C Hamano | 28 December 2011, 19:32:36 UTC | Merge branch 'ew/keepalive' into maint * ew/keepalive: enable SO_KEEPALIVE for connected TCP sockets | 28 December 2011, 19:32:36 UTC |
4742949 | Junio C Hamano | 28 December 2011, 19:32:35 UTC | Merge branch 'ci/stripspace-docs' into maint * ci/stripspace-docs: Update documentation for stripspace | 28 December 2011, 19:32:35 UTC |
9ddb7ea | Junio C Hamano | 28 December 2011, 19:32:35 UTC | Merge branch 'jh/fast-import-notes' into maint * jh/fast-import-notes: fast-import: Fix incorrect fanout level when modifying existing notes refs t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling t9301: Fix testcase covering up a bug in fast-import's notes fanout handling | 28 December 2011, 19:32:35 UTC |