| cb5918a | Junio C Hamano | 30 October 2017, 05:00:44 UTC | Git 2.15 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 October 2017, 05:00:44 UTC |
| af103b3 | Junio C Hamano | 30 October 2017, 00:32:54 UTC | Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-po l10n for Git 2.15.0 round 2 with Catalan updates * tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-po: l10n: Update Catalan translation | 30 October 2017, 00:32:54 UTC |
| 3f86f68 | Jordi Mas | 25 October 2017, 17:50:59 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 29 October 2017, 02:04:12 UTC |
| 2f89985 | Junio C Hamano | 28 October 2017, 01:20:30 UTC | Hopefully final batch before 2.15 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 October 2017, 01:20:30 UTC |
| d8f3074 | Junio C Hamano | 28 October 2017, 01:18:42 UTC | Merge branch 'sg/rev-list-doc-reorder-fix' Doc flow fix. * sg/rev-list-doc-reorder-fix: rev-list-options.txt: use correct directional reference | 28 October 2017, 01:18:42 UTC |
| 986ffdc | Junio C Hamano | 28 October 2017, 01:18:40 UTC | Merge branch 'sb/rev-parse-show-superproject-root' Doc markup fix. * sb/rev-parse-show-superproject-root: docs: fix formatting of rev-parse's --show-superproject-working-tree | 28 October 2017, 01:18:40 UTC |
| fd052e4 | Junio C Hamano | 28 October 2017, 01:18:39 UTC | Merge branch 'ao/path-use-xmalloc' A possible oom error is now caught as a fatal error, instead of continuing and dereferencing NULL. * ao/path-use-xmalloc: path.c: use xmalloc() in add_to_trie() | 28 October 2017, 01:18:40 UTC |
| 2d8f12d | Junio C Hamano | 28 October 2017, 01:18:39 UTC | Merge branch 'np/config-path-doc' Doc update. * np/config-path-doc: config doc: clarify "git config --path" example | 28 October 2017, 01:18:39 UTC |
| e38c681 | Sebastian Schuberth | 26 October 2017, 11:53:37 UTC | docs: fix formatting of rev-parse's --show-superproject-working-tree Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2017, 01:31:46 UTC |
| 4f851dc | SZEDER Gábor | 26 October 2017, 15:26:37 UTC | rev-list-options.txt: use correct directional reference The descriptions of the options '--parents', '--children' and '--graph' say "see 'History Simplification' below", although the referred section is in fact above the description of these options. Send readers in the right direction by saying "above" instead of "below". Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 October 2017, 01:29:38 UTC |
| 4e40fb3 | Junio C Hamano | 26 October 2017, 03:29:23 UTC | Merge branch 'mh/ref-locking-fix' Transactions to update multiple references that involves a deletion was quite broken in an error codepath and did not abort everything correctly. * mh/ref-locking-fix: files_transaction_prepare(): fix handling of ref lock failure t1404: add a bunch of tests of D/F conflicts | 26 October 2017, 03:29:23 UTC |
| 55d7d15 | Andrey Okoshkin | 24 October 2017, 15:15:05 UTC | path.c: use xmalloc() in add_to_trie() Add usage of xmalloc() instead of malloc() in add_to_trie() as xmalloc wraps and checks memory allocation result. Signed-off-by: Andrey Okoshkin <a.okoshkin@samsung.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 October 2017, 07:16:22 UTC |
| da5267f | Michael Haggerty | 24 October 2017, 15:16:25 UTC | files_transaction_prepare(): fix handling of ref lock failure Since dc39e09942 (files_ref_store: use a transaction to update packed refs, 2017-09-08), failure to lock a reference has been handled incorrectly by `files_transaction_prepare()`. If `lock_ref_for_update()` fails in the lock-acquisition loop of that function, it sets `ret` then breaks out of that loop. Prior to dc39e09942, that was OK, because the only thing following the loop was the cleanup code. But dc39e09942 added another blurb of code between the loop and the cleanup. That blurb sometimes resets `ret` to zero, making the cleanup code think that the locking was successful. Specifically, whenever * One or more reference deletions have been processed successfully in the lock-acquisition loop. (Processing the first such reference causes a packed-ref transaction to be initialized.) * Then `lock_ref_for_update()` fails for a subsequent reference. Such a failure can happen for a number of reasons, such as the old SHA-1 not being correct, lock contention, etc. This causes a `break` out of the lock-acquisition loop. * The `packed-refs` lock is acquired successfully and `ref_transaction_prepare()` succeeds for the packed-ref transaction. This has the effect of resetting `ret` back to 0, and making the cleanup code think that lock acquisition was successful. In that case, any reference updates that were processed prior to breaking out of the loop would be carried out (loose and packed), but the reference that couldn't be locked and any subsequent references would silently be ignored. This can easily cause data loss if, for example, the user was trying to push a new name for an existing branch while deleting the old name. After the push, the branch could be left unreachable, and could even subsequently be garbage-collected. This problem was noticed in the context of deleting one reference and creating another in a single transaction, when the two references D/F conflict with each other, like git update-ref --stdin <<EOF delete refs/foo create refs/foo/bar HEAD EOF This triggers the above bug because the deletion is processed successfully for `refs/foo`, then the D/F conflict causes `lock_ref_for_update()` to fail when `refs/foo/bar` is processed. In this case the transaction *should* fail, but instead it causes `refs/foo` to be deleted without creating `refs/foo`. This could easily result in data loss. The fix is simple: instead of just breaking out of the loop, jump directly to the cleanup code. This fixes some tests in t1404 that were added in the previous commit. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 October 2017, 06:08:26 UTC |
| 2e9de01 | Michael Haggerty | 24 October 2017, 15:16:24 UTC | t1404: add a bunch of tests of D/F conflicts It is currently not allowed, in a single transaction, to add one reference and delete another reference if the two reference names D/F conflict with each other (e.g., like `refs/foo/bar` and `refs/foo`). The reason is that the code would need to take locks $GIT_DIR/refs/foo.lock $GIT_DIR/refs/foo/bar.lock But the latter lock couldn't coexist with the loose reference file $GIT_DIR/refs/foo , because `$GIT_DIR/refs/foo` cannot be both a directory and a file at the same time (hence the name "D/F conflict). Add a bunch of tests that we cleanly reject such transactions. In fact, many of the new tests currently fail. They will be fixed in the next commit along with an explanation. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 October 2017, 06:08:26 UTC |
| ba78f39 | Junio C Hamano | 24 October 2017, 02:44:52 UTC | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po l10n for Git 2.15.0 round 2 * tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2 l10n: de.po: fix typos l10n: de.po: translate 70 new messages l10n: ru.po: update Russian translation l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: fr.po: v2.15.0 round 2 l10n: fr.po change translation of "First, rewinding" l10n: fr.po fix some mistakes l10n: Update Catalan translation l10n: ko.po: Update Korean translation l10n: es.po: v2.15.0 round 2 l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed) l10n: ru.po: update Russian translation l10n: bg.po: Updated Bulgarian translation (3245t) l10n: sv.po: Update Swedish translation (3245t0f0u) l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 l10n: es.po: Update translation v2.15.0 round 1 l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed) ... | 24 October 2017, 02:44:52 UTC |
| 1165e3c | Jiang Xin | 24 October 2017, 02:11:48 UTC | Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git * 'jx/zh_CN-proposed' of github.com:jiangxin/git: l10n: zh_CN: review for git v2.15.0 l10n round 2 l10n: zh_CN: for git v2.15.0 l10n round 2 | 24 October 2017, 02:11:48 UTC |
| 493a932 | Ray Chen | 23 October 2017, 16:17:59 UTC | l10n: zh_CN: review for git v2.15.0 l10n round 2 Signed-off-by: Ray Chen <oldsharp@gmail.com> | 24 October 2017, 02:06:39 UTC |
| 6937cb4 | Jiang Xin | 08 October 2017, 07:29:11 UTC | l10n: zh_CN: for git v2.15.0 l10n round 2 Translate 69 messages (3245t0f0u) for git v2.15.0-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Reviewed-by: 依云 <lilydjwg@gmail.com> | 24 October 2017, 01:56:58 UTC |
| 466b0d8 | Jiang Xin | 24 October 2017, 01:56:09 UTC | Merge branch 'master' of https://github.com/ralfth/git-po-de * 'master' of https://github.com/ralfth/git-po-de: l10n: de.po: fix typos l10n: de.po: translate 70 new messages | 24 October 2017, 01:56:09 UTC |
| 27e3e09 | Andre Hinrichs | 19 October 2017, 06:25:25 UTC | l10n: de.po: fix typos Signed-off-by: Andre Hinrichs <andre.hinrichs@gmx.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 23 October 2017, 16:42:01 UTC |
| 38178d7 | Ralf Thielow | 11 October 2017, 10:48:48 UTC | l10n: de.po: translate 70 new messages Translate 70 new messages came from git.pot update in 25eab542b (l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)) and 9c07fab78 (l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 23 October 2017, 16:41:51 UTC |
| c52ca88 | Junio C Hamano | 23 October 2017, 05:54:30 UTC | Sync with 2.14.3 | 23 October 2017, 05:54:30 UTC |
| fc849d8 | Junio C Hamano | 23 October 2017, 05:44:17 UTC | Git 2.14.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 October 2017, 05:44:17 UTC |
| 95c1a79 | Junio C Hamano | 23 October 2017, 05:40:00 UTC | Merge branch 'jk/info-alternates-fix' into maint A regression fix for 2.11 that made the code to read the list of alternate object stores overrun the end of the string. * jk/info-alternates-fix: read_info_alternates: warn on non-trivial errors read_info_alternates: read contents into strbuf | 23 October 2017, 05:40:00 UTC |
| 9fc7bc6 | Junio C Hamano | 23 October 2017, 05:39:08 UTC | Merge branch 'jc/fetch-refspec-doc-update' into maint "git fetch <there> <src>:<dst>" allows an object name on the <src> side when the other side accepts such a request since Git v2.5, but the documentation was left stale. * jc/fetch-refspec-doc-update: fetch doc: src side of refspec could be full SHA-1 | 23 October 2017, 05:39:08 UTC |
| 96c6bb5 | Junio C Hamano | 23 October 2017, 05:37:21 UTC | Merge branch 'jk/write-in-full-fix' into maint Many codepaths did not diagnose write failures correctly when disks go full, due to their misuse of write_in_full() helper function, which have been corrected. * jk/write-in-full-fix: read_pack_header: handle signed/unsigned comparison in read result config: flip return value of store_write_*() notes-merge: use ssize_t for write_in_full() return value pkt-line: check write_in_full() errors against "< 0" convert less-trivial versions of "write_in_full() != len" avoid "write_in_full(fd, buf, len) != len" pattern get-tar-commit-id: check write_in_full() return against 0 config: avoid "write_in_full(fd, buf, len) < len" pattern | 23 October 2017, 05:37:22 UTC |
| 7186408 | Junio C Hamano | 23 October 2017, 05:20:18 UTC | Merge branch 'rj/no-sign-compare' into maint Many codepaths have been updated to squelch -Wsign-compare warnings. * rj/no-sign-compare: ALLOC_GROW: avoid -Wsign-compare warnings cache.h: hex2chr() - avoid -Wsign-compare warnings commit-slab.h: avoid -Wsign-compare warnings git-compat-util.h: xsize_t() - avoid -Wsign-compare warnings | 23 October 2017, 05:20:18 UTC |
| dd3bfe4 | Junio C Hamano | 23 October 2017, 05:19:02 UTC | Merge branch 'ma/ts-cleanups' into maint Assorted bugfixes and clean-ups. * ma/ts-cleanups: ThreadSanitizer: add suppressions strbuf_setlen: don't write to strbuf_slopbuf pack-objects: take lock before accessing `remaining` convert: always initialize attr_action in convert_attrs | 23 October 2017, 05:19:02 UTC |
| a37b73e | Junio C Hamano | 23 October 2017, 05:17:53 UTC | Merge branch 'ls/travis-scriptify' into maint The scripts to drive TravisCI has been reorganized and then an optimization to avoid spending cycles on a branch whose tip is tagged has been implemented. * ls/travis-scriptify: travis-ci: fix "skip_branch_tip_with_tag()" string comparison travis: dedent a few scripts that are indented overly deeply travis-ci: skip a branch build if equal tag is present travis-ci: move Travis CI code into dedicated scripts | 23 October 2017, 05:17:53 UTC |
| 031062d | Junio C Hamano | 23 October 2017, 05:17:27 UTC | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maint The checkpoint command "git fast-import" did not flush updates to refs and marks unless at least one object was created since the last checkpoint, which has been corrected, as these things can happen without any new object getting created. * er/fast-import-dump-refs-on-checkpoint: fast-import: checkpoint: dump branches/tags/marks even if object_count==0 | 23 October 2017, 05:17:27 UTC |
| 120ce97 | Junio C Hamano | 23 October 2017, 05:14:51 UTC | Merge branch 'jt/fast-export-copy-modify-fix' into maint "git fast-export" with -M/-C option issued "copy" instruction on a path that is simultaneously modified, which was incorrect. * jt/fast-export-copy-modify-fix: fast-export: do not copy from modified file | 23 October 2017, 05:14:51 UTC |
| 5253ad1 | Junio C Hamano | 23 October 2017, 05:14:16 UTC | Merge branch 'nd/worktree-kill-parse-ref' into maint "git branch -M a b" while on a branch that is completely unrelated to either branch a or branch b misbehaved when multiple worktree was in use. This has been fixed. * nd/worktree-kill-parse-ref: branch: fix branch renaming not updating HEADs correctly | 23 October 2017, 05:14:16 UTC |
| c8e2301 | Dimitriy Ryazantcev | 22 October 2017, 17:35:13 UTC | l10n: ru.po: update Russian translation Signed-off-by: Dimitriy Ryazantcev <dimitriy.ryazantcev@gmail.com> | 22 October 2017, 17:35:13 UTC |
| 1129cf6 | Jiang Xin | 22 October 2017, 11:01:07 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 | 22 October 2017, 11:01:07 UTC |
| 4843cde | Junio C Hamano | 19 October 2017, 05:49:17 UTC | Git 2.15-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2017, 05:49:17 UTC |
| a4ebf9e | Junio C Hamano | 19 October 2017, 05:45:45 UTC | Merge branch 'jc/branch-force-doc-readability-fix' Doc update. * jc/branch-force-doc-readability-fix: branch doc: sprinkle a few commas for readability | 19 October 2017, 05:45:45 UTC |
| e336afd | Junio C Hamano | 19 October 2017, 05:45:45 UTC | Merge branch 'dg/filter-branch-filter-order-doc' Update the documentation for "git filter-branch" so that the filter options are listed in the same order as they are applied, as described in an earlier part of the doc. * dg/filter-branch-filter-order-doc: doc: list filter-branch subdirectory-filter first | 19 October 2017, 05:45:45 UTC |
| 39a2aea | Junio C Hamano | 19 October 2017, 05:45:44 UTC | Merge branch 'jc/fetch-refspec-doc-update' "git fetch <there> <src>:<dst>" allows an object name on the <src> side when the other side accepts such a request since Git v2.5, but the documentation was left stale. * jc/fetch-refspec-doc-update: fetch doc: src side of refspec could be full SHA-1 | 19 October 2017, 05:45:45 UTC |
| 9f8468b | Junio C Hamano | 19 October 2017, 05:45:43 UTC | Merge branch 'wk/merge-options-gpg-sign-doc' Doc updates. * wk/merge-options-gpg-sign-doc: Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull' | 19 October 2017, 05:45:43 UTC |
| 32fceba | Nathan Payre | 18 October 2017, 20:27:16 UTC | config doc: clarify "git config --path" example Change the word "bla" to "section.variable"; "bla" is a placeholder for a variable name but it wasn't clear for everyone. While we're here, also reformat this sample command line to use monospace instead of italics, to better match the rest of the file. Use a space instead of a dash in "git config", as is common in the rest of Git's documentation. Reported-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: MOY Matthieu <matthieu.moy@univ-lyon1.fr> Signed-off-by: Daniel Bensoussan <daniel.bensoussan--bohm@etu.univ-lyon1.fr> Signed-off-by: Timothee Albertin <timothee.albertin@etu.univ-lyon1.fr> Signed-off-by: Nathan Payre <nathan.payre@etu.univ-lyon1.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 October 2017, 04:52:49 UTC |
| f0d56fb | Jiang Xin | 19 October 2017, 00:17:23 UTC | Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git * 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git: l10n: fr.po: v2.15.0 round 2 l10n: fr.po change translation of "First, rewinding" l10n: fr.po fix some mistakes | 19 October 2017, 00:17:23 UTC |
| c84ba21 | Jiang Xin | 19 October 2017, 00:16:30 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 (3245t0f0u) | 19 October 2017, 00:16:30 UTC |
| 56714a9 | Jiang Xin | 19 October 2017, 00:14:55 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po * 'master' of https://github.com/Softcatala/git-po: l10n: Update Catalan translation | 19 October 2017, 00:14:55 UTC |
| c271fa4 | Jiang Xin | 19 October 2017, 00:13:29 UTC | Merge branch 'translation' of https://github.com/ChrisADR/git-po * 'translation' of https://github.com/ChrisADR/git-po: l10n: es.po: v2.15.0 round 2 | 19 October 2017, 00:13:29 UTC |
| c744f54 | Tran Ngoc Quan | 19 October 2017, 00:08:04 UTC | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 19 October 2017, 00:08:04 UTC |
| 51d32e4 | Peter Krefting | 18 October 2017, 18:35:32 UTC | l10n: sv.po: Update Swedish translation (3245t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 18 October 2017, 18:35:32 UTC |
| 26ce3a3 | Jean-Noel Avila | 08 October 2017, 12:37:52 UTC | l10n: fr.po: v2.15.0 round 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 18 October 2017, 18:28:33 UTC |
| 9de197e | Nicolas Cornu | 19 September 2017, 07:37:34 UTC | l10n: fr.po change translation of "First, rewinding" Signed-off-by: Nicolas Cornu <nicolac76@yahoo.fr> | 18 October 2017, 18:25:57 UTC |
| 285d1b4 | Jean-Noel Avila | 14 September 2017, 12:05:41 UTC | l10n: fr.po fix some mistakes Reported-by: Christophe Jaillet <christophe.jaillet@wanadoo.fr> Signed-off-by: Jean-Noel Avila <jean-noel.avila@scantech.fr> | 18 October 2017, 18:25:57 UTC |
| 660fb3d | Junio C Hamano | 18 October 2017, 05:26:53 UTC | Sync with maint * maint: Prepare for 2.14.3 | 18 October 2017, 05:32:17 UTC |
| 4c2224e | Junio C Hamano | 18 October 2017, 05:24:09 UTC | Prepare for 2.14.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2017, 05:24:09 UTC |
| e3e3c6a | Junio C Hamano | 18 October 2017, 05:20:43 UTC | Merge branch 'jk/ref-filter-colors-fix' into maint This is the "theoretically more correct" approach of simply stepping back to the state before plumbing commands started paying attention to "color.ui" configuration variable. * jk/ref-filter-colors-fix: tag: respect color.ui config Revert "color: check color.ui in git_default_config()" Revert "t6006: drop "always" color config tests" Revert "color: make "always" the same as "auto" in config" color: make "always" the same as "auto" in config provide --color option for all ref-filter users t3205: use --color instead of color.branch=always t3203: drop "always" color test t6006: drop "always" color config tests t7502: use diff.noprefix for --verbose test t7508: use test_terminal for color output t3701: use test-terminal to collect color output t4015: prefer --color to -c color.diff=always test-terminal: set TERM=vt100 | 18 October 2017, 05:20:43 UTC |
| 4e4a0c6 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'jc/doc-checkout' into maint Doc update. * jc/doc-checkout: checkout doc: clarify command line args for "checkout paths" mode | 18 October 2017, 05:19:14 UTC |
| 3087fea | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'tb/complete-describe' into maint Docfix. * tb/complete-describe: completion: add --broken and --dirty to describe | 18 October 2017, 05:19:14 UTC |
| ac86677 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'rs/rs-mailmap' into maint * rs/rs-mailmap: .mailmap: normalize name for René Scharfe | 18 October 2017, 05:19:14 UTC |
| b0e5269 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'rs/fsck-null-return-from-lookup' into maint Improve behaviour of "git fsck" upon finding a missing object. * rs/fsck-null-return-from-lookup: fsck: handle NULL return of lookup_blob() and lookup_tree() | 18 October 2017, 05:19:14 UTC |
| eeed979 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'jk/sha1-loose-object-info-fix' into maint Leakfix and futureproofing. * jk/sha1-loose-object-info-fix: sha1_loose_object_info: handle errors from unpack_sha1_rest | 18 October 2017, 05:19:14 UTC |
| a116022 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maint * sb/branch-avoid-repeated-strbuf-release: branch: reset instead of release a strbuf | 18 October 2017, 05:19:14 UTC |
| 4bf90c1 | Junio C Hamano | 18 October 2017, 05:19:14 UTC | Merge branch 'rs/qsort-s' into maint * rs/qsort-s: test-stringlist: avoid buffer underrun when sorting nothing | 18 October 2017, 05:19:14 UTC |
| 3c905dd | Junio C Hamano | 18 October 2017, 05:19:13 UTC | Merge branch 'jn/strbuf-doc-re-reuse' into maint * jn/strbuf-doc-re-reuse: strbuf doc: reuse after strbuf_release is fine | 18 October 2017, 05:19:13 UTC |
| 116d1d4 | Junio C Hamano | 18 October 2017, 05:19:13 UTC | Merge branch 'rs/run-command-use-alloc-array' into maint Code clean-up. * rs/run-command-use-alloc-array: run-command: use ALLOC_ARRAY | 18 October 2017, 05:19:13 UTC |
| 073a1fd | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'rs/tag-null-pointer-arith-fix' into maint Code clean-up. * rs/tag-null-pointer-arith-fix: tag: avoid NULL pointer arithmetic | 18 October 2017, 05:19:12 UTC |
| ff35d2a | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'rs/cocci-de-paren-call-params' into maint Code clean-up. * rs/cocci-de-paren-call-params: coccinelle: remove parentheses that become unnecessary | 18 October 2017, 05:19:12 UTC |
| 1fa0526 | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'ad/doc-markup-fix' into maint Docfix. * ad/doc-markup-fix: doc: correct command formatting | 18 October 2017, 05:19:12 UTC |
| 8a19eee | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'mr/doc-negative-pathspec' into maint Doc updates. * mr/doc-negative-pathspec: docs: improve discoverability of exclude pathspec | 18 October 2017, 05:19:12 UTC |
| 41052b1 | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'jk/validate-headref-fix' into maint Code clean-up. * jk/validate-headref-fix: validate_headref: use get_oid_hex for detached HEADs validate_headref: use skip_prefix for symref parsing validate_headref: NUL-terminate HEAD buffer | 18 October 2017, 05:19:12 UTC |
| 7f607f6 | Junio C Hamano | 18 October 2017, 05:19:12 UTC | Merge branch 'ks/doc-use-camelcase-for-config-name' into maint Doc update. * ks/doc-use-camelcase-for-config-name: doc: camelCase the config variables to improve readability | 18 October 2017, 05:19:12 UTC |
| e1a05be | Junio C Hamano | 18 October 2017, 05:19:11 UTC | Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maint A docfix. * jk/doc-read-tree-table-asciidoctor-fix: doc: put literal block delimiter around table | 18 October 2017, 05:19:11 UTC |
| 9554e71 | Junio C Hamano | 18 October 2017, 05:19:11 UTC | Merge branch 'hn/typofix' into maint * hn/typofix: submodule.h: typofix | 18 October 2017, 05:19:11 UTC |
| 8e81361 | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'ks/test-readme-phrasofix' into maint Doc updates. * ks/test-readme-phrasofix: t/README: fix typo and grammatically improve a sentence | 18 October 2017, 05:19:10 UTC |
| 0c52150 | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'ez/doc-duplicated-words-fix' into maint Typofix. * ez/doc-duplicated-words-fix: doc: fix minor typos (extra/duplicated words) | 18 October 2017, 05:19:10 UTC |
| 5a4ec5c | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'kd/doc-for-each-ref' into maint Doc update. * kd/doc-for-each-ref: doc/for-each-ref: explicitly specify option names doc/for-each-ref: consistently use '=' to between argument names and values | 18 October 2017, 05:19:10 UTC |
| 1c45e39 | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'cc/subprocess-handshake-missing-capabilities' into maint Finishing touches to a topic already in 'master'. * cc/subprocess-handshake-missing-capabilities: subprocess: loudly die when subprocess asks for an unsupported capability | 18 October 2017, 05:19:10 UTC |
| 110a642 | Junio C Hamano | 18 October 2017, 05:19:10 UTC | Merge branch 'jk/system-path-cleanup' into maint Code clean-up. * jk/system-path-cleanup: git_extract_argv0_path: do nothing without RUNTIME_PREFIX system_path: move RUNTIME_PREFIX to a sub-function | 18 October 2017, 05:19:10 UTC |
| 28a925b | Junio C Hamano | 18 October 2017, 05:19:09 UTC | Merge branch 'bb/doc-eol-dirty' into maint Doc update. * bb/doc-eol-dirty: Documentation: mention that `eol` can change the dirty status of paths | 18 October 2017, 05:19:09 UTC |
| 0445bd7 | Junio C Hamano | 18 October 2017, 05:19:09 UTC | Merge branch 'mg/timestamp-t-fix' into maint A mismerge fix. * mg/timestamp-t-fix: name-rev: change ULONG_MAX to TIME_MAX | 18 October 2017, 05:19:09 UTC |
| 6da2d14 | Junio C Hamano | 18 October 2017, 05:19:08 UTC | Merge branch 'ma/pkt-line-leakfix' into maint A leakfix. * ma/pkt-line-leakfix: pkt-line: re-'static'-ify buffer in packet_write_fmt_1() | 18 October 2017, 05:19:08 UTC |
| 96d14cb | Junio C Hamano | 18 October 2017, 05:19:07 UTC | Merge branch 'jk/config-lockfile-leak-fix' into maint A leakfix. * jk/config-lockfile-leak-fix: config: use a static lock_file struct | 18 October 2017, 05:19:08 UTC |
| f77196e | Junio C Hamano | 18 October 2017, 05:19:07 UTC | Merge branch 'dw/diff-highlight-makefile-fix' into maint Build clean-up. * dw/diff-highlight-makefile-fix: diff-highlight: add clean target to Makefile | 18 October 2017, 05:19:07 UTC |
| 7c9375d | Junio C Hamano | 18 October 2017, 05:19:06 UTC | Merge branch 'jk/drop-sha1-entry-pos' into maint Code clean-up. * jk/drop-sha1-entry-pos: sha1-lookup: remove sha1_entry_pos() from header file sha1_file: drop experimental GIT_USE_LOOKUP search | 18 October 2017, 05:19:06 UTC |
| d9e8586 | Junio C Hamano | 18 October 2017, 05:19:06 UTC | Merge branch 'tb/ref-filter-empty-modifier' into maint In the "--format=..." option of the "git for-each-ref" command (and its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)" (e.g. "%(refname:)", "%(body:)" used to error out. Instead, treat them as if the colon and an empty string that follows it were not there. * tb/ref-filter-empty-modifier: ref-filter.c: pass empty-string as NULL to atom parsers | 18 October 2017, 05:19:06 UTC |
| 96d4b17 | Junio C Hamano | 18 October 2017, 05:19:05 UTC | Merge branch 'rb/compat-poll-fix' into maint Backports a moral equivalent of 2015 fix to the poll emulation from the upstream gnulib to fix occasional breakages on HPE NonStop. * rb/compat-poll-fix: poll.c: always set revents, even if to zero | 18 October 2017, 05:19:05 UTC |
| dd5c88a | Junio C Hamano | 18 October 2017, 05:19:04 UTC | Merge branch 'tg/memfixes' into maint Fixes for a handful memory access issues identified by valgrind. * tg/memfixes: sub-process: use child_process.args instead of child_process.argv http-push: fix construction of hex value from path path.c: fix uninitialized memory access | 18 October 2017, 05:19:05 UTC |
| d9f5ea4 | Junio C Hamano | 18 October 2017, 05:19:04 UTC | Merge branch 'ar/request-pull-phrasofix' into maint Spell the name of our system as "Git" in the output from request-pull script. * ar/request-pull-phrasofix: request-pull: capitalise "Git" to make it a proper noun | 18 October 2017, 05:19:04 UTC |
| 77cdf8c | Junio C Hamano | 18 October 2017, 05:19:03 UTC | Merge branch 'jc/merge-x-theirs-docfix' into maint The documentation for '-X<option>' for merges was misleadingly written to suggest that "-s theirs" exists, which is not the case. * jc/merge-x-theirs-docfix: merge-strategies: avoid implying that "-s theirs" exists | 18 October 2017, 05:19:03 UTC |
| 01ae81e | Junio C Hamano | 18 October 2017, 05:19:03 UTC | Merge branch 'rs/mailinfo-qp-decode-fix' into maint "git mailinfo" was loose in decoding quoted printable and produced garbage when the two letters after the equal sign are not hexadecimal. This has been fixed. * rs/mailinfo-qp-decode-fix: mailinfo: don't decode invalid =XY quoted-printable sequences | 18 October 2017, 05:19:03 UTC |
| b8a4e89 | Junio C Hamano | 18 October 2017, 05:19:02 UTC | Merge branch 'ik/userdiff-html-h-element-fix' into maint The built-in pattern to detect the "function header" for HTML did not match <H1>..<H6> elements without any attributes, which has been fixed. * ik/userdiff-html-h-element-fix: userdiff: fix HTML hunk header regexp | 18 October 2017, 05:19:02 UTC |
| 16ba0f4 | Junio C Hamano | 18 October 2017, 05:19:01 UTC | Merge branch 'jk/diff-blob' into maint "git cat-file --textconv" started segfaulting recently, which has been corrected. * jk/diff-blob: cat-file: handle NULL object_context.path | 18 October 2017, 05:19:01 UTC |
| 501ec0d | Junio C Hamano | 18 October 2017, 05:19:01 UTC | Merge branch 'jk/describe-omit-some-refs' into maint "git describe --match" learned to take multiple patterns in v2.13 series, but the feature ignored the patterns after the first one and did not work at all. This has been fixed. * jk/describe-omit-some-refs: describe: fix matching to actually match all patterns | 18 October 2017, 05:19:01 UTC |
| 8dc1d0b | Junio C Hamano | 18 October 2017, 05:19:00 UTC | Merge branch 'mh/for-each-string-list-item-empty-fix' into maint Code cmp.std.c nitpick. * mh/for-each-string-list-item-empty-fix: for_each_string_list_item: avoid undefined behavior for empty list | 18 October 2017, 05:19:00 UTC |
| 181f145 | Junio C Hamano | 18 October 2017, 05:18:59 UTC | Merge branch 'tb/test-lint-echo-e' into maint The test linter has been taught that we do not like "echo -e". * tb/test-lint-echo-e: test-lint: echo -e (or -E) is not portable | 18 October 2017, 05:19:00 UTC |
| 14431c7 | Junio C Hamano | 18 October 2017, 05:18:59 UTC | Merge branch 'aw/gc-lockfile-fscanf-fix' into maint "git gc" tries to avoid running two instances at the same time by reading and writing pid/host from and to a lock file; it used to use an incorrect fscanf() format when reading, which has been corrected. * aw/gc-lockfile-fscanf-fix: gc: call fscanf() with %<len>s, not %<len>c, when reading hostname | 18 October 2017, 05:18:59 UTC |
| 0f21375 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'tg/refs-allowed-flags' into maint API error-proofing which happens to also squelch warnings from GCC. * tg/refs-allowed-flags: refs: strip out not allowed flags from ref_transaction_update | 18 October 2017, 05:18:59 UTC |
| 550e41c | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'rs/archive-excluded-directory' into maint "git archive", especially when used with pathspec, stored an empty directory in its output, even though Git itself never does so. This has been fixed. * rs/archive-excluded-directory: archive: don't add empty directories to archives | 18 October 2017, 05:18:58 UTC |
| aec2eb8 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'rk/commit-tree-make-F-verbatim' into maint Unlike "git commit-tree < file", "git commit-tree -F file" did not pass the contents of the file verbatim and instead completed an incomplete line at the end, if exists. The latter has been updated to match the behaviour of the former. * rk/commit-tree-make-F-verbatim: commit-tree: do not complete line in -F input | 18 October 2017, 05:18:58 UTC |
| 6b89503 | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'mh/packed-ref-store-prep' into maint Fix regression to "gitk --bisect" by a recent update. * mh/packed-ref-store-prep: rev-parse: don't trim bisect refnames | 18 October 2017, 05:18:58 UTC |
| 05e408d | Junio C Hamano | 18 October 2017, 05:18:58 UTC | Merge branch 'mm/send-email-cc-cruft' into maint In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft" was taught to "git send-email" as a valid way to tell it that it needs to also send a carbon copy to <a@dd.re.ss> in the trailer section. * mm/send-email-cc-cruft: send-email: don't use Mail::Address, even if available send-email: fix garbage removal after address | 18 October 2017, 05:18:58 UTC |
| 6c9d195 | Junio C Hamano | 18 October 2017, 05:18:57 UTC | Merge branch 'rs/strbuf-getwholeline-fix' into maint A helper function to read a single whole line into strbuf mistakenly triggered OOM error at EOF under certain conditions, which has been fixed. * rs/strbuf-getwholeline-fix: strbuf: clear errno before calling getdelim(3) | 18 October 2017, 05:18:58 UTC |
| e61cb19 | Junio C Hamano | 18 October 2017, 02:34:31 UTC | branch doc: sprinkle a few commas for readability The "--force" option can also be used when the named branch does not yet exist, and the point of the option is the user can (re)point the branch to the named commit even if it does. Add 'even' before 'if' to clarify. Also, insert another comma after "Without -f" before "the command refuses..." to make the text easier to parse. Incidentally, this change should help certain versions of docbook-xsl-stylesheets that render the original without any whitespace between "-f" and "git". Noticed-by: Lars Schneider <larsxschneider@gmail.com> Helped-by: Jeff King <peff@peff.net> Helped-by: Andreas Schwab <schwab@suse.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2017, 04:26:57 UTC |
| 25baa8e | Junio C Hamano | 18 October 2017, 01:27:06 UTC | Preparing for rc2 continues Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 October 2017, 01:27:06 UTC |
