| d9c691a | Junio C Hamano | 16 March 2016, 21:00:18 UTC | Git 2.8-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 21:13:37 UTC |
| a0e305c | Junio C Hamano | 16 March 2016, 21:13:25 UTC | Merge branch 'master' of git://bogomips.org/git-svn * 'master' of git://bogomips.org/git-svn: git-svn: fix URL canonicalization during init w/ SVN 1.7+ t9117: test specifying full url to git svn init -T | 16 March 2016, 21:13:25 UTC |
| 3f97853 | Junio C Hamano | 16 March 2016, 20:17:38 UTC | Sync with maint * maint: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow | 16 March 2016, 20:17:38 UTC |
| 2df1363 | Junio C Hamano | 16 March 2016, 20:16:54 UTC | Merge branch 'jc/sane-grep' Recent versions of GNU grep is pickier than before to decide if a file is "binary" and refuse to give line-oriented hits when we expect it to, unless explicitly told with "-a" option. As our scripted Porcelains use sane_grep wrapper for line-oriented data, even when the line may contain non-ASCII payload we took from end-user data, use "grep -a" to implement sane_grep wrapper when using an implementation of "grep" that takes the "-a" option. * jc/sane-grep: rebase-i: clarify "is this commit relevant?" test sane_grep: pass "-a" if grep accepts it | 16 March 2016, 20:16:54 UTC |
| 9e68980 | Junio C Hamano | 16 March 2016, 20:16:40 UTC | Merge branch 'cn/deprecate-ssh-git-url' The two alternative ways to spell "ssh://" transport have been deprecated for a long time. The last mention of them has finally removed from the documentation. * cn/deprecate-ssh-git-url: Disown ssh+git and git+ssh | 16 March 2016, 20:16:40 UTC |
| b557165 | Eric Wong | 16 March 2016, 20:14:08 UTC | git-svn: fix URL canonicalization during init w/ SVN 1.7+ URL canonicalization when full URLs are passed became broken when using SVN::_Core::svn_dirent_canonicalize under SVN 1.7. Ensure we canonicalize paths and URLs with appropriate functions for each type from now on as the path/URL-agnostic SVN::_Core::svn_path_canonicalize function is deprecated in SVN. Tested with the following commands: git svn init -T svn://svn.code.sf.net/p/squirrelmail/code/trunk git svn init -b svn://svn.code.sf.net/p/squirrelmail/code/branches Reported-by: Adam Dinwoodie <adam@dinwoodie.org> http://mid.gmane.org/20160315162344.GM29016@dinwoodie.org Signed-off-by: Eric Wong <normalperson@yhbt.net> | 16 March 2016, 20:16:23 UTC |
| d79db92 | Junio C Hamano | 16 March 2016, 20:15:04 UTC | Merge branch 'jk/path-name-safety-2.7' into maint * jk/path-name-safety-2.7: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow | 16 March 2016, 20:15:04 UTC |
| 4be4d55 | Adam Dinwoodie | 16 March 2016, 19:09:54 UTC | t9117: test specifying full url to git svn init -T According to the documentation, full URLs can be specified in the `-T` argument to `git svn init`. However, the canonicalization of such arguments squashes together consecutive "/"s, which unsurprisingly breaks http://, svn://, etc URLs. Add a failing test case to provide evidence of that. On systems where Subversion provides svn_path_canonicalize but not svn_dirent_canonicalize (Subversion 1.6 and earlier?), this test passes, as svn_path_canonicalize doesn't mangle the consecutive "/"s. [ew: fixed whitespace] Signed-off-by: Adam Dinwoodie <adam@dinwoodie.org> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 16 March 2016, 19:24:37 UTC |
| 55c45a7 | Junio C Hamano | 16 March 2016, 17:42:32 UTC | Merge branch 'jk/path-name-safety-2.6' into jk/path-name-safety-2.7 * jk/path-name-safety-2.6: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow | 16 March 2016, 17:42:32 UTC |
| 717e355 | Junio C Hamano | 16 March 2016, 17:42:02 UTC | Merge branch 'jk/path-name-safety-2.5' into jk/path-name-safety-2.6 * jk/path-name-safety-2.5: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow | 16 March 2016, 17:42:02 UTC |
| 253ce7a | Junio C Hamano | 16 March 2016, 17:41:43 UTC | Merge branch 'jk/path-name-safety-2.4' into jk/path-name-safety-2.5 * jk/path-name-safety-2.4: list-objects: pass full pathname to callbacks list-objects: drop name_path entirely list-objects: convert name_path to a strbuf show_object_with_name: simplify by using path_name() http-push: stop using name_path tree-diff: catch integer overflow in combine_diff_path allocation add helpers for detecting size_t overflow | 16 March 2016, 17:41:43 UTC |
| 2824e18 | Jeff King | 11 February 2016, 22:28:36 UTC | list-objects: pass full pathname to callbacks When we find a blob at "a/b/c", we currently pass this to our show_object_fn callbacks as two components: "a/b/" and "c". Callbacks which want the full value then call path_name(), which concatenates the two. But this is an inefficient interface; the path is a strbuf, and we could simply append "c" to it temporarily, then roll back the length, without creating a new copy. So we could improve this by teaching the callsites of path_name() this trick (and there are only 3). But we can also notice that no callback actually cares about the broken-down representation, and simply pass each callback the full path "a/b/c" as a string. The callback code becomes even simpler, then, as we do not have to worry about freeing an allocated buffer, nor rolling back our modification to the strbuf. This is theoretically less efficient, as some callbacks would not bother to format the final path component. But in practice this is not measurable. Since we use the same strbuf over and over, our work to grow it is amortized, and we really only pay to memcpy a few bytes. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:04 UTC |
| dc06dc8 | Jeff King | 11 February 2016, 22:26:44 UTC | list-objects: drop name_path entirely In the previous commit, we left name_path as a thin wrapper around a strbuf. This patch drops it entirely. As a result, every show_object_fn callback needs to be adjusted. However, none of their code needs to be changed at all, because the only use was to pass it to path_name(), which now handles the bare strbuf. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:03 UTC |
| f3badae | Jeff King | 11 February 2016, 22:26:18 UTC | list-objects: convert name_path to a strbuf The "struct name_path" data is examined in only two places: we generate it in process_tree(), and we convert it to a single string in path_name(). Everyone else just passes it through to those functions. We can further note that process_tree() already keeps a single strbuf with the leading tree path, for use with tree_entry_interesting(). Instead of building a separate name_path linked list, let's just use the one we already build in "base". This reduces the amount of code (especially tricky code in path_name() which did not check for integer overflows caused by deep or large pathnames). It is also more efficient in some instances. Any time we were using tree_entry_interesting, we were building up the strbuf anyway, so this is an immediate and obvious win there. In cases where we were not, we trade off storing "pathname/" in a strbuf on the heap for each level of the path, instead of two pointers and an int on the stack (with one pointer into the tree object). On a 64-bit system, the latter is 20 bytes; so if path components are less than that on average, this has lower peak memory usage. In practice it probably doesn't matter either way; we are already holding in memory all of the tree objects leading up to each pathname, and for normal-depth pathnames, we are only talking about hundreds of bytes. This patch leaves "struct name_path" as a thin wrapper around the strbuf, to avoid disrupting callbacks. We should fix them, but leaving it out makes this diff easier to view. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:03 UTC |
| 8eee9f9 | Jeff King | 11 February 2016, 22:24:18 UTC | show_object_with_name: simplify by using path_name() When "git rev-list" shows an object with its associated path name, it does so by walking the name_path linked list and printing each component (stopping at any embedded NULs or newlines). We'd like to eventually get rid of name_path entirely in favor of a single buffer, and dropping this custom printing code is part of that. As a first step, let's use path_name() to format the list into a single buffer, and print that. This is strictly less efficient than the original, but it's a temporary step in the refactoring; our end game will be to get the fully formatted name in the first place. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:03 UTC |
| c6bd2a1 | Jeff King | 11 February 2016, 22:23:48 UTC | http-push: stop using name_path The graph traversal code here passes along a name_path to build up the pathname at which we find each blob. But we never actually do anything with the resulting names, making it a waste of code and memory. This usage came in aa1dbc9 (Update http-push functionality, 2006-03-07), and originally the result was passed to "add_object" (which stored it, but didn't really use it, either). But we stopped using that function in 1f1e895 (Add "named object array" concept, 2006-06-19) in favor of storing just the objects themselves. Moreover, the generation of the name in process_tree() is buggy. It sticks "name" onto the end of the name_path linked list, and then passes it down again as it recurses (instead of "entry.path"). So it's a good thing this was unused, as the resulting path for "a/b/c/d" would end up as "a/a/a/a". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:02 UTC |
| d770187 | Jeff King | 19 February 2016, 11:21:30 UTC | tree-diff: catch integer overflow in combine_diff_path allocation A combine_diff_path struct has two "flex" members allocated alongside the struct: a string to hold the pathname, and an array of parent pointers. We use an "int" to compute this, meaning we may easily overflow it if the pathname is extremely long. We can fix this by using size_t, and checking for overflow with the st_add helper. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:02 UTC |
| 935de81 | Jeff King | 19 February 2016, 11:21:19 UTC | add helpers for detecting size_t overflow Performing computations on size_t variables that we feed to xmalloc and friends can be dangerous, as an integer overflow can cause us to allocate a much smaller chunk than we realized. We already have unsigned_add_overflows(), but let's add unsigned_mult_overflows() to that. Furthermore, rather than have each site manually check and die on overflow, we can provide some helpers that will: - promote the arguments to size_t, so that we know we are doing our computation in the same size of integer that will ultimately be fed to xmalloc - check and die on overflow - return the result so that computations can be done in the parameter list of xmalloc. These functions are a lot uglier to use than normal arithmetic operators (you have to do "st_add(foo, bar)" instead of "foo + bar"). To at least limit the damage, we also provide multi-valued versions. So rather than: st_add(st_add(a, b), st_add(c, d)); you can write: st_add4(a, b, c, d); This isn't nearly as elegant as a varargs function, but it's a lot harder to get it wrong. You don't have to remember to add a sentinel value at the end, and the compiler will complain if you get the number of arguments wrong. This patch adds only the numbered variants required to convert the current code base; we can easily add more later if needed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2016, 17:41:02 UTC |
| c2c5f6b | Junio C Hamano | 14 March 2016, 18:11:25 UTC | RelNotes for 2.8.0: typofix Helped-by: Max Horn Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2016, 17:58:59 UTC |
| a7206ba | Junio C Hamano | 15 March 2016, 17:32:20 UTC | Merge branch 'svn-glob' of git://bogomips.org/git-svn * 'svn-glob' of git://bogomips.org/git-svn: git-svn: shorten glob error message git-svn: loosen config globs limitations | 15 March 2016, 17:32:20 UTC |
| e7c1132 | Junio C Hamano | 15 March 2016, 17:13:15 UTC | Merge tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.8.0-rnd2 * tag 'l10n-2.8.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: for git v2.8.0 l10n round 3 l10n: git.pot: Add one new message for Git 2.8.0 l10n: zh_CN: for git v2.8.0 l10n round 2 l10n: fr.po v2.8.0 round 2 l10n: ru.po: update Russian translation l10n: ko: Update Korean translation l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t ... | 15 March 2016, 17:13:15 UTC |
| 5c0c220 | Jiang Xin | 15 March 2016, 16:27:40 UTC | l10n: zh_CN: for git v2.8.0 l10n round 3 Update 1 new translations (2530t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 March 2016, 16:27:40 UTC |
| a5a4168 | Jiang Xin | 15 March 2016, 16:20:14 UTC | l10n: git.pot: Add one new message for Git 2.8.0 Add one new message came from this commit: * df22724 wt-status: allow "ahead " to be picked up by l10n Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 March 2016, 16:20:14 UTC |
| 531f756 | Jiang Xin | 15 March 2016, 16:15:59 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 2 l10n: fr.po v2.8.0 round 2 l10n: ru.po: update Russian translation l10n: ko: Update Korean translation l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed) | 15 March 2016, 16:15:59 UTC |
| 3495628 | Jiang Xin | 12 March 2016, 14:09:24 UTC | l10n: zh_CN: for git v2.8.0 l10n round 2 Update 21 new translations (2529t0f0u) for git v2.8.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 15 March 2016, 16:07:06 UTC |
| 62335bb | Eric Wong | 14 January 2016, 03:59:48 UTC | git-svn: shorten glob error message Error messages should attempt to fit within the confines of an 80-column terminal to avoid compatibility and accessibility problems. Furthermore the word "directories" can be misleading when used in the context of git refnames. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 15 March 2016, 01:35:39 UTC |
| e4e5dd9 | Victor Leschuk | 11 January 2016, 14:25:58 UTC | git-svn: loosen config globs limitations Expand the area of globs applicability for branches and tags in git-svn. It is now possible to use globs like 'a*e', or 'release_*'. This allows users to avoid long lines in config like: branches = branches/{release_20,release_21,release_22,...} In favor of: branches = branches/release_* [ew: amended commit message, minor formatting and style fixes] Signed-off-by: Victor Leschuk <vleschuk@accesssoftek.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 15 March 2016, 01:35:38 UTC |
| 7a2c7e5 | Jean-Noel Avila | 14 March 2016, 19:26:53 UTC | l10n: fr.po v2.8.0 round 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 14 March 2016, 19:29:04 UTC |
| db6696f | Junio C Hamano | 14 March 2016, 17:46:17 UTC | Merge branch 'mg/wt-status-mismarked-i18n' * mg/wt-status-mismarked-i18n: wt-status: allow "ahead " to be picked up by l10n | 14 March 2016, 17:46:17 UTC |
| df22724 | Michael J Gruber | 14 March 2016, 15:30:33 UTC | wt-status: allow "ahead " to be picked up by l10n The extra pair of parentheses keeps the l10n engine from picking up the string. Remove them so that "ahead " ends up in git.pot. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2016, 17:45:04 UTC |
| a088237 | Jiang Xin | 13 March 2016, 13:41:46 UTC | Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ru * 'russian-l10n' of https://github.com/DJm00n/git-po-ru: l10n: ru.po: update Russian translation | 13 March 2016, 13:41:46 UTC |
| f3aeef1 | Dimitriy Ryazantcev | 13 March 2016, 00:07:09 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 13 March 2016, 00:07:09 UTC |
| 03ac0e5 | Changwoo Ryu | 12 March 2016, 17:32:52 UTC | l10n: ko: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 12 March 2016, 17:32:52 UTC |
| f1522b2 | Jiang Xin | 12 March 2016, 14:05:35 UTC | l10n: git.pot: v2.8.0 round 2 (21 new, 1 removed) Generate po/git.pot from v2.8.0-rc2 for git v2.8.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 12 March 2016, 14:05:35 UTC |
| 7174c11 | Jiang Xin | 12 March 2016, 14:04:39 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN: for git v2.8.0 l10n round 1 l10n: de.po: translate 48 new messages l10n: de.po: translate "command" as "Befehl" l10n: de.po: fix interactive rebase message l10n: de.po: add space to abbreviation "z. B." l10n: de.po: fix typo l10n: TEAMS: update Ralf Thielow's email address l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" l10n: ko.po: Update Korean translation l10n: ru.po: update Russian translation l10n: vi.po (2509t): Updated Vietnamese translation l10n: fr.po v2.8.0 round 1 2509t l10n: fr.po: Correct case in sentence l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed) | 12 March 2016, 14:04:39 UTC |
| 276ceea | Jiang Xin | 28 February 2016, 12:35:55 UTC | l10n: zh_CN: for git v2.8.0 l10n round 1 Update 48 new translations (2509t0f0u) for git v2.8.0-rc0. Reviewed-by: Ray Chen <oldsharp@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> l10n: zh_CN: review for git v2.8.0 l10n round 1 | 12 March 2016, 14:00:34 UTC |
| 214123c | Junio C Hamano | 08 March 2016, 23:51:36 UTC | rebase-i: clarify "is this commit relevant?" test While I was checking all the call sites of sane_grep and sane_egrep, I noticed this one is somewhat strangely written. The lines in the file sane_grep works on all begin with 40-hex object name, so there is no real risk of confusing "test $(...) = ''" by finding something that begins with a dash, but using the status from sane_grep makes it a lot clearer what is going on. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2016, 23:35:48 UTC |
| 71b4010 | Junio C Hamano | 08 March 2016, 23:47:57 UTC | sane_grep: pass "-a" if grep accepts it Newer versions of GNU grep is reported to be pickier when we feed a non-ASCII input and break some Porcelain scripts. As we know we do not feed random binary file to our own sane_grep wrapper, allow us to always pass "-a" by setting SANE_TEXT_GREP=-a Makefile variable to work it around. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2016, 23:35:43 UTC |
| ed9067f | Junio C Hamano | 10 March 2016, 19:16:23 UTC | Git 2.8-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2016, 19:16:23 UTC |
| 5d1847b | Junio C Hamano | 10 March 2016, 19:15:50 UTC | Sync with 2.7.3 | 10 March 2016, 19:15:50 UTC |
| 594730e | Junio C Hamano | 10 March 2016, 19:13:13 UTC | Git 2.7.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 March 2016, 19:14:08 UTC |
| 2e1e569 | Junio C Hamano | 10 March 2016, 19:13:50 UTC | Merge branch 'ma/update-hooks-sample-typofix' into maint * ma/update-hooks-sample-typofix: templates/hooks: fix minor typo in the sample update-hook | 10 March 2016, 19:13:50 UTC |
| 3e6e43e | Junio C Hamano | 10 March 2016, 19:13:49 UTC | Merge branch 'dt/initial-ref-xn-commit-doc' into maint * dt/initial-ref-xn-commit-doc: refs: document transaction semantics | 10 March 2016, 19:13:49 UTC |
| 4da4026 | Junio C Hamano | 10 March 2016, 19:13:49 UTC | Merge branch 'ps/plug-xdl-merge-leak' into maint * ps/plug-xdl-merge-leak: xdiff/xmerge: fix memory leak in xdl_merge | 10 March 2016, 19:13:49 UTC |
| 08e21c9 | Junio C Hamano | 10 March 2016, 19:13:48 UTC | Merge branch 'ak/git-strip-extension-from-dashed-command' into maint Code simplification. * ak/git-strip-extension-from-dashed-command: git.c: simplify stripping extension of a file in handle_builtin() | 10 March 2016, 19:13:48 UTC |
| c6f399c | Junio C Hamano | 10 March 2016, 19:13:47 UTC | Merge branch 'ak/extract-argv0-last-dir-sep' into maint Code simplification. * ak/extract-argv0-last-dir-sep: exec_cmd.c: use find_last_dir_sep() for code simplification | 10 March 2016, 19:13:47 UTC |
| 80047fa | Junio C Hamano | 10 March 2016, 19:13:46 UTC | Merge branch 'jk/pack-idx-corruption-safety' into maint The code to read the pack data using the offsets stored in the pack idx file has been made more carefully check the validity of the data in the idx. * jk/pack-idx-corruption-safety: sha1_file.c: mark strings for translation use_pack: handle signed off_t overflow nth_packed_object_offset: bounds-check extended offset t5313: test bounds-checks of corrupted/malicious pack/idx files | 10 March 2016, 19:13:46 UTC |
| 0e58b47 | Junio C Hamano | 10 March 2016, 19:13:45 UTC | Merge branch 'js/config-set-in-non-repository' into maint "git config section.var value" to set a value in per-repository configuration file failed when it was run outside any repository, but didn't say the reason correctly. * js/config-set-in-non-repository: git config: report when trying to modify a non-existing repo config | 10 March 2016, 19:13:45 UTC |
| 1191d60 | Junio C Hamano | 10 March 2016, 19:13:45 UTC | Merge branch 'sb/submodule-module-list-fix' into maint A helper function "git submodule" uses since v2.7.0 to list the modules that match the pathspec argument given to its subcommands (e.g. "submodule add <repo> <path>") has been fixed. * sb/submodule-module-list-fix: submodule helper list: respect correct path prefix | 10 March 2016, 19:13:45 UTC |
| 7f18fad | Junio C Hamano | 10 March 2016, 19:13:45 UTC | Merge branch 'jk/grep-binary-workaround-in-test' into maint Recent versions of GNU grep are pickier when their input contains arbitrary binary data, which some of our tests uses. Rewrite the tests to sidestep the problem. * jk/grep-binary-workaround-in-test: t9200: avoid grep on non-ASCII data t8005: avoid grep on non-ASCII data | 10 March 2016, 19:13:45 UTC |
| d4e7b9b | Junio C Hamano | 10 March 2016, 19:13:44 UTC | Merge branch 'mm/push-simple-doc' into maint The documentation did not clearly state that the 'simple' mode is now the default for "git push" when push.default configuration is not set. * mm/push-simple-doc: Documentation/git-push: document that 'simple' is the default | 10 March 2016, 19:13:44 UTC |
| b7a6ec6 | Junio C Hamano | 10 March 2016, 19:13:43 UTC | Merge branch 'jk/tighten-alloc' into maint * jk/tighten-alloc: (23 commits) compat/mingw: brown paper bag fix for 50a6c8e ewah: convert to REALLOC_ARRAY, etc convert ewah/bitmap code to use xmalloc diff_populate_gitlink: use a strbuf transport_anonymize_url: use xstrfmt git-compat-util: drop mempcpy compat code sequencer: simplify memory allocation of get_message test-path-utils: fix normalize_path_copy output buffer size fetch-pack: simplify add_sought_entry fast-import: simplify allocation in start_packfile write_untracked_extension: use FLEX_ALLOC helper prepare_{git,shell}_cmd: use argv_array use st_add and st_mult for allocation size computation convert trivial cases to FLEX_ARRAY macros use xmallocz to avoid size arithmetic convert trivial cases to ALLOC_ARRAY convert manual allocations to argv_array argv-array: add detach function add helpers for allocating flex-array structs harden REALLOC_ARRAY and xcalloc against size_t overflow ... | 10 March 2016, 19:13:43 UTC |
| aa6c22e | Junio C Hamano | 10 March 2016, 19:13:42 UTC | Merge branch 'jk/more-comments-on-textconv' into maint The memory ownership rule of fill_textconv() API, which was a bit tricky, has been documented a bit better. * jk/more-comments-on-textconv: diff: clarify textconv interface | 10 March 2016, 19:13:43 UTC |
| 6044329 | Junio C Hamano | 10 March 2016, 19:13:41 UTC | Merge branch 'jk/no-diff-emit-common' into maint "git merge-tree" used to mishandle "both sides added" conflict with its own "create a fake ancestor file that has the common parts of what both sides have added and do a 3-way merge" logic; this has been updated to use the usual "3-way merge with an empty blob as the fake common ancestor file" approach used in the rest of the system. * jk/no-diff-emit-common: xdiff: drop XDL_EMIT_COMMON merge-tree: drop generate_common strategy merge-one-file: use empty blob for add/add base | 10 March 2016, 19:13:42 UTC |
| 28eec80 | Junio C Hamano | 10 March 2016, 19:13:40 UTC | Merge branch 'jc/am-i-v-fix' into maint The "v(iew)" subcommand of the interactive "git am -i" command was broken in 2.6.0 timeframe when the command was rewritten in C. * jc/am-i-v-fix: am -i: fix "v"iew pager: factor out a helper to prepare a child process to run the pager pager: lose a separate argv[] | 10 March 2016, 19:13:41 UTC |
| 9c17cca | Junio C Hamano | 10 March 2016, 19:13:39 UTC | Merge branch 'nd/git-common-dir-fix' into maint "git rev-parse --git-common-dir" used in the worktree feature misbehaved when run from a subdirectory. * nd/git-common-dir-fix: rev-parse: take prefix into account in --git-common-dir | 10 March 2016, 19:13:40 UTC |
| 8834ea3 | Junio C Hamano | 10 March 2016, 19:13:39 UTC | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maint "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a rev, i.e. the object named by the the pathname with wildcard characters in a tree object. * nd/dwim-wildcards-as-pathspecs: get_sha1: don't die() on bogus search strings check_filename: tighten dwim-wildcard ambiguity checkout: reorder check_filename conditional | 10 March 2016, 19:13:39 UTC |
| fbef03d | Junio C Hamano | 10 March 2016, 19:13:38 UTC | Merge branch 'jk/epipe-in-async' into maint Handling of errors while writing into our internal asynchronous process has been made more robust, which reduces flakiness in our tests. * jk/epipe-in-async: t5504: handle expected output from SIGPIPE death test_must_fail: report number of unexpected signal fetch-pack: ignore SIGPIPE in sideband demuxer write_or_die: handle EPIPE in async threads | 10 March 2016, 19:13:38 UTC |
| 2d5ff66 | Junio C Hamano | 10 March 2016, 19:13:38 UTC | Merge branch 'ps/config-error' into maint Many codepaths forget to check return value from git_config_set(); the function is made to die() to make sure we do not proceed when setting a configuration variable failed. * ps/config-error: config: rename git_config_set_or_die to git_config_set config: rename git_config_set to git_config_set_gently compat: die when unable to set core.precomposeunicode sequencer: die on config error when saving replay opts init-db: die on config errors when initializing empty repo clone: die on config error in cmd_clone remote: die on config error when manipulating remotes remote: die on config error when setting/adding branches remote: die on config error when setting URL submodule--helper: die on config error when cloning module submodule: die on config error when linking modules branch: die on config error when editing branch description branch: die on config error when unsetting upstream branch: report errors in tracking branch setup config: introduce set_or_die wrappers | 10 March 2016, 19:13:38 UTC |
| 9bb7103 | Junio C Hamano | 10 March 2016, 19:13:38 UTC | Merge branch 'mg/work-tree-tests' into maint Traditionally, the tests that try commands that work on the contents in the working tree were named with "worktree" in their filenames, but with the recent addition of "git worktree" subcommand, whose tests are also named similarly, it has become harder to tell them apart. The traditional tests have been renamed to use "work-tree" instead in an attempt to differentiate them. * mg/work-tree-tests: tests: rename work-tree tests to *work-tree* | 10 March 2016, 19:13:38 UTC |
| 33b81b2 | Junio C Hamano | 10 March 2016, 19:13:37 UTC | Merge branch 'sp/remote-curl-ssl-strerror' into maint Help those who debug http(s) part of the system. * sp/remote-curl-ssl-strerror: remote-curl: include curl_errorstr on SSL setup failures | 10 March 2016, 19:13:37 UTC |
| f4a48e8 | Junio C Hamano | 10 March 2016, 18:56:43 UTC | Merge branch 'jx/http-no-proxy' * jx/http-no-proxy: http: honor no_http env variable to bypass proxy | 10 March 2016, 18:56:43 UTC |
| e80aae5 | Junio C Hamano | 10 March 2016, 18:56:43 UTC | Merge branch 'jc/exclusion-doc' * jc/exclusion-doc: gitignore: document that unignoring a directory unignores everything in it | 10 March 2016, 18:56:43 UTC |
| 68846a9 | Junio C Hamano | 10 March 2016, 18:56:42 UTC | Merge branch 'js/close-packs-before-gc' A small future-proofing of a test added recently. * js/close-packs-before-gc: t5510: do not leave changed cwd | 10 March 2016, 18:56:42 UTC |
| 9ed1d90 | Junio C Hamano | 10 March 2016, 18:56:41 UTC | Merge branch 'sb/rebase-summary' * sb/rebase-summary: Documentation: reword rebase summary | 10 March 2016, 18:56:41 UTC |
| 07c7782 | Carlos Martín Nieto | 15 February 2016, 14:29:06 UTC | Disown ssh+git and git+ssh Some people argue that these were silly from the beginning (see http://thread.gmane.org/gmane.comp.version-control.git/285590/focus=285601 for example), but we have to support them for compatibility. That doesn't mean we have to show them in the documentation. These were already left out of the main list, but a reference in the main manpage was left, so remove that. Also add a note to discourage their use if anybody goes looking for them in the source code. Signed-off-by: Carlos Martín Nieto <cmn@dwim.me> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2016, 21:54:38 UTC |
| 6f6d1f4 | Junio C Hamano | 07 March 2016, 23:27:27 UTC | gitignore: document that unignoring a directory unignores everything in it Also document another limitation coming from a bug in handling the basename match with a directory for 're-inclusion'. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2016, 18:10:49 UTC |
| 1d30f89 | Ralf Thielow | 02 March 2016, 17:13:32 UTC | l10n: de.po: translate 48 new messages Translate 48 new messages came from git.pot update in 9eb3984 (l10n: git.pot: v2.8.0 round 1 (48 new, 16 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Matthias Rüster <matthias.ruester@gmail.com> | 05 March 2016, 07:20:16 UTC |
| ae45b9a | Ralf Thielow | 03 March 2016, 18:00:35 UTC | l10n: de.po: translate "command" as "Befehl" Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 05 March 2016, 07:20:16 UTC |
| 28ab8b2 | Ralf Thielow | 02 March 2016, 17:34:19 UTC | l10n: de.po: fix interactive rebase message Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 05 March 2016, 07:20:15 UTC |
| 384905e | Ralf Thielow | 02 March 2016, 17:27:42 UTC | l10n: de.po: add space to abbreviation "z. B." Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 05 March 2016, 07:20:15 UTC |
| 9410812 | Christoph Hoopmann | 02 March 2016, 11:46:26 UTC | l10n: de.po: fix typo Signed-off-by: Christoph Hoopmann <christophhoopmann@gmail.com> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 05 March 2016, 07:20:15 UTC |
| 48f977e | Ralf Thielow | 03 March 2016, 20:48:25 UTC | l10n: TEAMS: update Ralf Thielow's email address Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 05 March 2016, 03:07:28 UTC |
| 7f941a0 | Jiang Xin | 05 March 2016, 02:06:20 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2509t0f0u) l10n: sv.po: Fix inconsistent translation of "progress meter" | 05 March 2016, 02:06:20 UTC |
| 269cbc6 | Jiang Xin | 05 March 2016, 02:05:32 UTC | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation | 05 March 2016, 02:05:32 UTC |
| ab5d01a | Junio C Hamano | 04 March 2016, 21:48:55 UTC | Git 2.8-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2016, 21:48:55 UTC |
| 28ab768 | Junio C Hamano | 04 March 2016, 21:46:44 UTC | Merge branch 'nd/clear-gitenv-upon-use-of-alias' Hotfix for a test breakage made between 2.7 and 'master'. * nd/clear-gitenv-upon-use-of-alias: t0001: fix GIT_* environment variable check under --valgrind | 04 March 2016, 21:46:44 UTC |
| 3978cd0 | Junio C Hamano | 04 March 2016, 21:46:39 UTC | Merge branch 'js/pthread-exit-emu-windows' * js/pthread-exit-emu-windows: Mark win32's pthread_exit() as NORETURN | 04 March 2016, 21:46:39 UTC |
| bbe90e7 | Junio C Hamano | 04 March 2016, 21:46:30 UTC | Merge branch 'sb/submodule-parallel-fetch' Simplify the two callback functions that are triggered when the child process terminates to avoid misuse of the child-process structure that has already been cleaned up. * sb/submodule-parallel-fetch: run-command: do not pass child process data into callbacks | 04 March 2016, 21:46:30 UTC |
| 6dd0a37 | Junio C Hamano | 04 March 2016, 21:46:25 UTC | Merge branch 'jk/tighten-alloc' * jk/tighten-alloc: compat/mingw: brown paper bag fix for 50a6c8e | 04 March 2016, 21:46:25 UTC |
| 49a4352 | Junio C Hamano | 04 March 2016, 21:46:20 UTC | Merge branch 'nd/i18n-2.8.0' * nd/i18n-2.8.0: trailer.c: mark strings for translation ref-filter.c: mark strings for translation builtin/clone.c: mark strings for translation builtin/checkout.c: mark strings for translation | 04 March 2016, 21:46:20 UTC |
| 0194200 | Junio C Hamano | 04 March 2016, 21:46:08 UTC | Merge branch 'tb/avoid-gcc-on-darwin-10-6' Out-of-maintenance gcc on OSX 10.6 fails to compile the code in 'master'; work it around by using clang by default on the platform. * tb/avoid-gcc-on-darwin-10-6: config.mak.uname: use clang for Mac OS X 10.6 | 04 March 2016, 21:46:08 UTC |
| 090de6b | Junio C Hamano | 04 March 2016, 21:45:46 UTC | Merge branch 'jk/pack-idx-corruption-safety' The code to read the pack data using the offsets stored in the pack idx file has been made more carefully check the validity of the data in the idx. * jk/pack-idx-corruption-safety: sha1_file.c: mark strings for translation use_pack: handle signed off_t overflow nth_packed_object_offset: bounds-check extended offset t5313: test bounds-checks of corrupted/malicious pack/idx files | 04 March 2016, 21:45:47 UTC |
| bc0ffd4 | Junio C Hamano | 04 March 2016, 21:45:42 UTC | Merge branch 'mg/httpd-tests-update-for-apache-2.4' The way the test scripts configure the Apache web server has been updated to work also for Apache 2.4 running on RedHat derived distros. * mg/httpd-tests-update-for-apache-2.4: t/lib-httpd: load mod_unixd | 04 March 2016, 21:45:42 UTC |
| 816c193 | Michael J Gruber | 04 March 2016, 10:53:50 UTC | t5510: do not leave changed cwd t5510 carefully keeps the cwd at the test root by using either subshells or explicit cd'ing back to the root. Use a subshell for the last subtest, too. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2016, 18:22:55 UTC |
| 2e7b6af | Junio C Hamano | 04 March 2016, 18:14:39 UTC | Merge branch 'js/mingw-tests' * js/mingw-tests: t9700: fix test for perl older than 5.14 | 04 March 2016, 18:14:39 UTC |
| 839b639 | Jeff King | 04 March 2016, 11:43:21 UTC | t9700: fix test for perl older than 5.14 Commit d53c2c6 (mingw: fix t9700's assumption about directory separators, 2016-01-27) uses perl's "/r" regex modifier to do a non-destructive replacement on a string, leaving the original unmodified and returning the result. This feature was introduced in perl 5.14, but systems with older perl are still common (e.g., CentOS 6.5 still has perl 5.10). Let's work around it by providing a helper function that does the same thing using older syntax. While we're at it, let's switch to using an alternate regex separator, which is slightly more readable. Reported-by: Christian Couder <christian.couder@gmail.com> Helped-by: Dennis Kaarsemaker <dennis@kaarsemaker.net> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2016, 18:14:30 UTC |
| 7f278d8 | Peter Krefting | 04 March 2016, 14:22:46 UTC | l10n: sv.po: Update Swedish translation (2509t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 04 March 2016, 14:22:46 UTC |
| c674d82 | Peter Krefting | 03 February 2016, 19:27:59 UTC | l10n: sv.po: Fix inconsistent translation of "progress meter" Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 04 March 2016, 14:06:59 UTC |
| d285ab0 | Thomas Ackermann | 03 March 2016, 18:43:51 UTC | documentation: fix some typos Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2016, 21:43:36 UTC |
| f3858f8 | Johannes Sixt | 03 March 2016, 06:55:17 UTC | t0001: fix GIT_* environment variable check under --valgrind When a test case is run without --valgrind, the wrap-for-bin.sh helper script inserts the environment variable GIT_TEXTDOMAINDIR, but when run with --valgrind, the variable is missing. A recently introduced test case expects the presence of the variable, though, and fails under --valgrind. Rewrite the test case to strip conditially defined environment variables from both expected and actual output. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2016, 16:55:13 UTC |
| 2072942 | Changwoo Ryu | 03 March 2016, 04:14:28 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 03 March 2016, 04:14:52 UTC |
| b385085 | Stefan Beller | 01 March 2016, 22:49:58 UTC | Documentation: reword rebase summary The wording is introduced in c3f0baaca (Documentation: sync git.txt command list and manual page title, 2007-01-18), but rebase has evolved since then, capture the modern usage by being more generic about the rebase command in the summary. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2016, 23:37:50 UTC |
| 296d673 | Johannes Schindelin | 02 March 2016, 19:11:13 UTC | Mark win32's pthread_exit() as NORETURN The pthread_exit() function is not expected to return. Ever. On Windows, we call ExitThread() whose documentation claims: "Ends the calling thread", i.e. there is no condition in which this function simply returns: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682659 While at it, fix the return type to be void, as per http://pubs.opengroup.org/onlinepubs/9699919799/functions/pthread_exit.html Pointed out by Jeff King, helped by Stefan Naewe, Junio Hamano & Johannes Sixt. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2016, 20:33:43 UTC |
| 03eb39a | Dimitriy Ryazantcev | 02 March 2016, 15:37:55 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 02 March 2016, 15:37:55 UTC |
| 2a73b3d | Stefan Beller | 29 February 2016, 21:57:06 UTC | run-command: do not pass child process data into callbacks The expected way to pass data into the callback is to pass them via the customizable callback pointer. The error reporting in default_{start_failure, task_finished} is not user friendly enough, that we want to encourage using the child data for such purposes. Furthermore the struct child data is cleaned by the run-command API, before we access them in the callbacks, leading to use-after-free situations. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2016, 17:42:01 UTC |
| 13ad56f | Nguyễn Thái Ngọc Duy | 27 February 2016, 06:42:10 UTC | trailer.c: mark strings for translation Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 February 2016, 22:27:58 UTC |
| 1823c61 | Nguyễn Thái Ngọc Duy | 27 February 2016, 06:42:04 UTC | ref-filter.c: mark strings for translation Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 February 2016, 22:27:58 UTC |
| 39ad4f3 | Nguyễn Thái Ngọc Duy | 27 February 2016, 06:41:55 UTC | builtin/clone.c: mark strings for translation Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 February 2016, 22:27:58 UTC |
| 4636f65 | Nguyễn Thái Ngọc Duy | 27 February 2016, 06:41:54 UTC | builtin/checkout.c: mark strings for translation Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 February 2016, 22:27:58 UTC |
