67f2825 | Jonathan Tan | 02 March 2017, 19:50:41 UTC | t/perf: export variable used in other blocks In p0001, a variable was created in a test_expect_success block to be used in later test_perf blocks, but was not exported. This caused the variable to not appear in those blocks (this can be verified by writing 'test -n "$commit"' in those blocks), resulting in a slightly different invocation than what was intended. Export that variable. Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2017, 18:54:42 UTC |
e7e07d5 | Junio C Hamano | 24 February 2017, 18:49:58 UTC | Git 2.12 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2017, 18:49:58 UTC |
cca4f20 | Junio C Hamano | 24 February 2017, 18:48:10 UTC | Merge branch 'ps/doc-gc-aggressive-depth-update' Doc update. * ps/doc-gc-aggressive-depth-update: docs/git-gc: fix default value for `--aggressiveDepth` | 24 February 2017, 18:48:10 UTC |
dc9ded4 | Junio C Hamano | 24 February 2017, 18:48:10 UTC | Merge branch 'bc/worktree-doc-fix-detached' Doc update. * bc/worktree-doc-fix-detached: Documentation: correctly spell git worktree --detach | 24 February 2017, 18:48:10 UTC |
c6788b1 | Junio C Hamano | 24 February 2017, 18:48:09 UTC | Merge branch 'dr/doc-check-ref-format-normalize' Doc update. * dr/doc-check-ref-format-normalize: git-check-ref-format: clarify documentation for --normalize | 24 February 2017, 18:48:09 UTC |
eccf97c | Junio C Hamano | 24 February 2017, 18:48:09 UTC | Merge branch 'gp/document-dotfiles-in-templates-are-not-copied' Doc update. * gp/document-dotfiles-in-templates-are-not-copied: init: document dotfiles exclusion on template copy | 24 February 2017, 18:48:09 UTC |
c0588fd | Junio C Hamano | 24 February 2017, 18:48:08 UTC | Merge branch 'rt/align-add-i-help-text' Doc update. * rt/align-add-i-help-text: git add -i: replace \t with blanks in the help message | 24 February 2017, 18:48:08 UTC |
af4027f | Junio C Hamano | 24 February 2017, 18:48:07 UTC | Merge branch 'bc/blame-doc-fix' Doc update. * bc/blame-doc-fix: Documentation: use brackets for optional arguments | 24 February 2017, 18:48:08 UTC |
7e82388 | Patrick Steinhardt | 24 February 2017, 08:46:45 UTC | docs/git-gc: fix default value for `--aggressiveDepth` In commit 07e7dbf0d (gc: default aggressive depth to 50, 2016-08-11), the default aggressive depth of git-gc has been changed to 50. While git-config(1) has been updated to represent the new default value, git-gc(1) still mentions the old value. This patch fixes it. Signed-off-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2017, 17:59:12 UTC |
cc24d7d | Junio C Hamano | 24 February 2017, 17:55:41 UTC | Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po l10n-2.12.0-rnd2 * tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-po: (22 commits) l10n: zh_CN: for git v2.12.0 l10n round 2 l10n: Update Catalan translation l10n: pt_PT: update Portuguese tranlation l10n: sv.po: Update Swedish translation (3139t0f0u) l10n: de.po: translate 241 messages l10n: ko.po: Update Korean translation l10n: vi.po (3139t): Updated 2 new messages for rc1 l10n: fr.po: v2.12.0 round 2 3139t l10n: git.pot: v2.12.0 round 2 (2 new) l10n: vi.po: Updated Vietnamese translation (3137t) l10n: update Catalan translation l10n: sv.po: Update Swedish translation (3137t0f0u) l10n: fr.po: v2.11-rc0 first round l10n: ko.po: Update Korean translation l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed) l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation ... | 24 February 2017, 17:55:41 UTC |
1a79b2f | Jiang Xin | 27 January 2017, 14:50:57 UTC | l10n: zh_CN: for git v2.12.0 l10n round 2 Translate 241 messages (3139t0f0u) for git v2.12.0-rc1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 24 February 2017, 16:19:14 UTC |
a14eee8 | Jordi Mas | 21 February 2017, 17:32:29 UTC | l10n: Update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 24 February 2017, 16:14:55 UTC |
e06cdf1 | Vasco Almeida | 05 February 2017, 18:43:34 UTC | l10n: pt_PT: update Portuguese tranlation Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt> | 23 February 2017, 17:14:55 UTC |
e519ecc | Ralf Thielow | 22 February 2017, 18:46:27 UTC | git add -i: replace \t with blanks in the help message Within the help message of 'git add -i', the 'diff' command uses one tab character and blanks to create the space between the name and the description while the others use blanks only. So if the tab size is not at 4 characters, this description will not be in range. Replace the tab character with blanks. Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2017, 20:51:00 UTC |
2b35a9f | brian m. carlson | 22 February 2017, 12:25:46 UTC | Documentation: use brackets for optional arguments The documentation for git blame used vertical bars for optional arguments to -M and -C, which is unusual and potentially confusing. Since most man pages use brackets for optional items, and that's consistent with how we document the same options for git diff and friends, use brackets here, too. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2017, 18:22:15 UTC |
9993a7c | brian m. carlson | 22 February 2017, 12:34:42 UTC | Documentation: correctly spell git worktree --detach The option is “--detach”, but we accidentally spelled it “--detached” at one point in the man page. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Reported-by: Casey Rodarmor <casey@rodarmor.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2017, 18:08:38 UTC |
115a40a | Damien Regad | 19 February 2017, 22:32:32 UTC | git-check-ref-format: clarify documentation for --normalize Use of 'iff' may be confusing to people not familiar with this term. Improving the --normalize option's documentation to remove the use of 'iff', and clearly describe what happens when the condition is not met. Signed-off-by: Damien Regad <dregad@mantisbt.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2017, 21:02:42 UTC |
28159ae | Jiang Xin | 21 February 2017, 16:06:44 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 (3139t0f0u) | 21 February 2017, 16:06:44 UTC |
80ba04e | Junio C Hamano | 21 February 2017, 06:01:59 UTC | Merge branch 'svn-escape-backslash' of git://bogomips.org/git-svn * 'svn-escape-backslash' of git://bogomips.org/git-svn: git-svn: escape backslashes in refnames | 21 February 2017, 06:01:59 UTC |
806f276 | Peter Krefting | 20 February 2017, 18:40:11 UTC | l10n: sv.po: Update Swedish translation (3139t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 20 February 2017, 18:40:11 UTC |
af4cf7e | Ralf Thielow | 20 February 2017, 17:40:36 UTC | l10n: de.po: translate 241 messages Translate 241 messages came from git.pot update in 673bfad09 (l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)) and a4d94835a (l10n: git.pot: v2.12.0 round 2 (2 new)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Phillip Sz <phillip.szelat@gmail.com> | 20 February 2017, 17:40:36 UTC |
c245125 | Jiang Xin | 19 February 2017, 14:08:05 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 | 19 February 2017, 14:08:05 UTC |
7cbeff0 | Jiang Xin | 19 February 2017, 14:04:41 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po (3139t): Updated 2 new messages for rc1 | 19 February 2017, 14:04:41 UTC |
7d6d957 | Changwoo Ryu | 19 February 2017, 10:34:24 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 19 February 2017, 10:35:37 UTC |
5271df1 | Tran Ngoc Quan | 18 February 2017, 00:18:54 UTC | l10n: vi.po (3139t): Updated 2 new messages for rc1 Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 18 February 2017, 00:18:54 UTC |
133f0a2 | Grégoire Paris | 17 February 2017, 23:37:00 UTC | init: document dotfiles exclusion on template copy Not just . and .., but any path that begins with dot is not copied when copying the template directory to a new repository. You can customize the template directory, copying some dotfiles might make sense, but it's actually a good thing not to, because you would not want to have your git directory copied in every git directory that is created should you decide to put your template directory under version control, for example. Plus, it might be used as a feature by people who would want to exclude some files. Signed-off-by: Grégoire Paris <postmaster@greg0ire.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2017, 23:57:21 UTC |
3d5f390 | Jean-Noel Avila | 17 February 2017, 23:10:04 UTC | l10n: fr.po: v2.12.0 round 2 3139t Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 17 February 2017, 23:12:26 UTC |
2076907 | Junio C Hamano | 17 February 2017, 22:00:19 UTC | Git 2.12-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2017, 22:00:19 UTC |
a4d9483 | Jiang Xin | 17 February 2017, 17:00:54 UTC | l10n: git.pot: v2.12.0 round 2 (2 new) Generate po/git.pot from v2.12.0-rc1 for git v2.12.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 17 February 2017, 17:00:54 UTC |
53f7473 | Jiang Xin | 17 February 2017, 16:59:51 UTC | Merge branch 'master' of git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: vi.po: Updated Vietnamese translation (3137t) l10n: update Catalan translation l10n: sv.po: Update Swedish translation (3137t0f0u) l10n: fr.po: v2.11-rc0 first round l10n: ko.po: Update Korean translation l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed) l10n: bg: Updated Bulgarian translation (2913t+0f+0u) l10n: fixes to Catalan translation l10n: zh_CN: review for git v2.11.0 l10n l10n: New Catalan translation maintainer | 17 February 2017, 16:59:51 UTC |
84b3ceb | Jiang Xin | 17 February 2017, 16:54:49 UTC | Merge branch 'master' of https://github.com/vnwildman/git * 'master' of https://github.com/vnwildman/git: l10n: vi.po: Updated Vietnamese translation (3137t) | 17 February 2017, 16:54:49 UTC |
8b22a8e | Jiang Xin | 17 February 2017, 16:49:06 UTC | Merge branch 'master' of https://github.com/Softcatala/git-po * 'master' of https://github.com/Softcatala/git-po: l10n: update Catalan translation | 17 February 2017, 16:49:06 UTC |
a1da87b | Tran Ngoc Quan | 17 February 2017, 06:51:34 UTC | l10n: vi.po: Updated Vietnamese translation (3137t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 17 February 2017, 06:52:11 UTC |
076c053 | Junio C Hamano | 16 February 2017, 22:46:35 UTC | Hopefully the final batch of mini-topics before the final Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2017, 22:46:35 UTC |
c5b22b8 | Junio C Hamano | 16 February 2017, 22:45:15 UTC | Merge branch 'jk/tempfile-ferror-fclose-confusion' Code clean-up. * jk/tempfile-ferror-fclose-confusion: tempfile: avoid "ferror | fclose" trick | 16 February 2017, 22:45:15 UTC |
62fef5c | Junio C Hamano | 16 February 2017, 22:45:15 UTC | Merge branch 'dp/submodule-doc-markup-fix' Doc fix. * dp/submodule-doc-markup-fix: config.txt: fix formatting of submodule.alternateErrorStrategy section | 16 February 2017, 22:45:15 UTC |
1f73ff0 | Junio C Hamano | 16 February 2017, 22:45:14 UTC | Merge branch 'jk/reset-to-break-a-commit-doc-updated' Doc update. * jk/reset-to-break-a-commit-doc-updated: reset: add an example of how to split a commit into two | 16 February 2017, 22:45:14 UTC |
bf5f119 | Junio C Hamano | 16 February 2017, 22:45:14 UTC | Merge branch 'jk/reset-to-break-a-commit-doc' Doc update. * jk/reset-to-break-a-commit-doc: Revert "reset: add an example of how to split a commit into two" | 16 February 2017, 22:45:14 UTC |
e048a25 | Junio C Hamano | 16 February 2017, 22:45:13 UTC | Merge branch 'js/mingw-isatty' A hotfix for a topic already in 'master'. * js/mingw-isatty: mingw: make stderr unbuffered again | 16 February 2017, 22:45:13 UTC |
1e00c41 | Junio C Hamano | 16 February 2017, 22:45:13 UTC | Merge branch 'rs/strbuf-cleanup-in-rmdir-recursively' Code clean-up. * rs/strbuf-cleanup-in-rmdir-recursively: rm: reuse strbuf for all remove_dir_recursively() calls, again | 16 February 2017, 22:45:13 UTC |
a3b3c9c | Junio C Hamano | 16 February 2017, 22:45:13 UTC | Merge branch 'rs/ls-files-partial-optim' "ls-files" run with pathspec has been micro-optimized to avoid having to memmove(3) unnecessary bytes. * rs/ls-files-partial-optim: ls-files: move only kept cache entries in prune_cache() ls-files: pass prefix length explicitly to prune_cache() | 16 February 2017, 22:45:13 UTC |
0078a75 | Junio C Hamano | 16 February 2017, 22:45:13 UTC | Merge branch 'rs/cocci-check-free-only-null' A new coccinelle rule that catches a check of !pointer before the pointer is free(3)d, which most likely is a bug. * rs/cocci-check-free-only-null: cocci: detect useless free(3) calls | 16 February 2017, 22:45:13 UTC |
5a98255 | Junio C Hamano | 16 February 2017, 22:45:12 UTC | Merge branch 'ls/p4-path-encoding' When "git p4" imports changelist that removes paths, it failed to convert pathnames when the p4 used encoding different from the one used on the Git side. This has been corrected. * ls/p4-path-encoding: git-p4: fix git-p4.pathEncoding for removed files | 16 February 2017, 22:45:12 UTC |
0838cbc | Jeff King | 16 February 2017, 21:31:40 UTC | tempfile: avoid "ferror | fclose" trick The current code wants to record an error condition from either ferror() or fclose(), but makes sure that we always call both functions. So it can't use logical-OR "||", which would short-circuit when ferror() is true. Instead, it uses bitwise-OR "|" to evaluate both functions and set one or more bits in the "err" flag if they reported a failure. Unlike logical-OR, though, bitwise-OR does not introduce a sequence point, and the order of evaluation for its operands is unspecified. So a compiler would be free to generate code which calls fclose() first, and then ferror() on the now-freed filehandle. There's no indication that this has happened in practice, but let's write it out in a way that follows the standard. Noticed-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2017, 22:15:55 UTC |
8ab9740 | David Pursehouse | 16 February 2017, 05:05:35 UTC | config.txt: fix formatting of submodule.alternateErrorStrategy section Add missing `::` after the title. Signed-off-by: David Pursehouse <dpursehouse@collab.net> Acked-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2017, 21:46:20 UTC |
f94baa4 | Jacob Keller | 16 February 2017, 00:22:12 UTC | reset: add an example of how to split a commit into two It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git-reset documentation which shows an example process for how to use git add -p and git commit -c HEAD@{1} to interactively break a commit apart and re-use the original commit message as a starting point when making the new commit message. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2017, 21:38:02 UTC |
ae86372 | Junio C Hamano | 16 February 2017, 21:35:50 UTC | Revert "reset: add an example of how to split a commit into two" This reverts commit 7326451bedaa67d29afe02184b166e28d9393c91; a better rewrite will be queued separately. | 16 February 2017, 21:35:50 UTC |
2f61b3a | Jordi Mas | 16 February 2017, 04:10:04 UTC | l10n: update Catalan translation Signed-off-by: Jordi Mas <jmas@softcatala.org> | 16 February 2017, 04:10:04 UTC |
d09b692 | Junio C Hamano | 15 February 2017, 22:58:25 UTC | A bit more for -rc2 | 15 February 2017, 22:58:25 UTC |
57f7345 | Junio C Hamano | 15 February 2017, 22:56:41 UTC | Merge branch 'tg/stash-doc-cleanup' The documentation explained what "git stash" does to the working tree (after stashing away the local changes) in terms of "reset --hard", which was exposing an unnecessary implementation detail. * tg/stash-doc-cleanup: Documentation/stash: remove mention of git reset --hard | 15 February 2017, 22:56:41 UTC |
3e23116 | Junio C Hamano | 15 February 2017, 22:56:40 UTC | Merge branch 'jk/doc-submodule-markup-fix' Doc markup fix. * jk/doc-submodule-markup-fix: docs/git-submodule: fix unbalanced quote | 15 February 2017, 22:56:40 UTC |
8c00b7e | Junio C Hamano | 15 February 2017, 22:56:40 UTC | Merge branch 'jk/doc-remote-helpers-markup-fix' Doc markup fix. * jk/doc-remote-helpers-markup-fix: docs/gitremote-helpers: fix unbalanced quotes | 15 February 2017, 22:56:40 UTC |
153a33f | Junio C Hamano | 15 February 2017, 20:54:20 UTC | Merge branch 'sb/doc-unify-bottom' Doc clean-up. * sb/doc-unify-bottom: Documentation: unify bottom "part of git suite" lines | 15 February 2017, 20:54:20 UTC |
ca3c2b8 | Junio C Hamano | 15 February 2017, 20:54:19 UTC | Merge branch 'sb/push-options-via-transport' The push-options given via the "--push-options" option were not passed through to external remote helpers such as "smart HTTP" that are invoked via the transport helper. * sb/push-options-via-transport: push options: pass push options to the transport helper | 15 February 2017, 20:54:19 UTC |
3f4ccb5 | Junio C Hamano | 15 February 2017, 20:54:19 UTC | Merge branch 'cw/completion' More command line completion (in contrib/) for recent additions. * cw/completion: completion: recognize more long-options completion: teach remote subcommands to complete options completion: teach replace to complete options completion: teach ls-remote to complete options completion: improve bash completion for git-add completion: add subcommand completion for rerere completion: teach submodule subcommands to complete options | 15 February 2017, 20:54:19 UTC |
cbf1860 | Junio C Hamano | 15 February 2017, 20:54:19 UTC | Merge branch 'rs/swap' Code clean-up. * rs/swap: graph: use SWAP macro diff: use SWAP macro use SWAP macro apply: use SWAP macro add SWAP macro | 15 February 2017, 20:54:19 UTC |
2f4e87d | Junio C Hamano | 15 February 2017, 20:54:18 UTC | Merge branch 'sb/submodule-doc' Doc updates. * sb/submodule-doc: submodule update documentation: don't repeat ourselves submodule documentation: add options to the subcommand | 15 February 2017, 20:54:18 UTC |
a4d92d5 | Johannes Schindelin | 13 February 2017, 22:34:06 UTC | mingw: make stderr unbuffered again When removing the hack for isatty(), we actually removed more than just an isatty() hack: we removed the hack where internal data structures of the MSVC runtime are modified in order to redirect stdout/stderr. Instead of using that hack (that does not work with newer versions of the runtime, anyway), we replaced it by reopening the respective file descriptors. What we forgot was to mark stderr as unbuffered again. Reported by Hannes Sixt. Fixed with Jeff Hostetler's assistance. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Tested-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2017, 18:54:21 UTC |
590fc05 | René Scharfe | 11 February 2017, 19:51:08 UTC | rm: reuse strbuf for all remove_dir_recursively() calls, again Don't throw the memory allocated for remove_dir_recursively() away after a single call, use it for the other entries as well instead. This change was done before in deb8e15a (rm: reuse strbuf for all remove_dir_recursively() calls), but was reverted as a side-effect of 55856a35 (rm: absorb a submodules git dir before deletion). Reinstate the optimization. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 22:33:32 UTC |
20a7e06 | Thomas Gummerer | 12 February 2017, 21:54:14 UTC | Documentation/stash: remove mention of git reset --hard Don't mention git reset --hard in the documentation for git stash save. It's an implementation detail that doesn't matter to the end user and thus shouldn't be exposed to them. In addition it's not quite true for git stash -p, and will not be true when a filename argument to limit the stash to a few files is introduced. Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 22:20:38 UTC |
e91461b | Jeff King | 13 February 2017, 21:05:49 UTC | docs/git-submodule: fix unbalanced quote The documentation gives an example of the submodule foreach command that uses both backticks and single-quotes. We stick the whole thing inside "+" markers to make it monospace, but the inside punctuation still needs escaping. We handle the backticks with "{backtick}", and use backslash-escaping for the single-quotes. But we missed the escaping on the second quote. Fortunately, asciidoc renders this unbalanced quote as we want (showing the quote), but asciidoctor does not. We could fix it by adding the missing backslash. However, let's take a step back. Even when rendered correctly, it's hard to read a long command stuck into the middle of a paragraph, and the important punctuation is hard to notice. Let's instead bump it into its own single-line code block. That makes both the source and the rendered result more readable, and as a bonus we don't have to worry about quoting at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 22:05:40 UTC |
2aaf37b | Jeff King | 13 February 2017, 20:38:35 UTC | docs/gitremote-helpers: fix unbalanced quotes Each of these options is missing the closing single-quote on the option name. This understandably confuses asciidoc, which ends up rendering a stray quote, like: option cloning {'true|false} Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 20:55:36 UTC |
96f6d3f | René Scharfe | 10 February 2017, 20:03:30 UTC | ls-files: move only kept cache entries in prune_cache() prune_cache() first identifies those entries at the start of the sorted array that can be discarded. Then it moves the rest of the entries up. Last it identifies the unwanted trailing entries among the moved ones and cuts them off. Change the order: Identify both start *and* end of the range to keep first and then move only those entries to the top. The resulting code is slightly shorter and a bit more efficient. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 20:06:10 UTC |
7b4158a | René Scharfe | 10 February 2017, 19:42:28 UTC | ls-files: pass prefix length explicitly to prune_cache() The function prune_cache() relies on the fact that it is only called on max_prefix and sneakily uses the matching global variable max_prefix_len directly. Tighten its interface by passing both the string and its length as parameters. While at it move the NULL check into the function to collect all cache-pruning related logic in one place. Signed-off-by: Rene Scharfe <l.s.r@web.de> Reviewed-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2017, 20:06:08 UTC |
b02312b | Jiang Xin | 13 February 2017, 16:19:11 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 (3137t0f0u) | 13 February 2017, 16:19:11 UTC |
0b0891c | Jiang Xin | 13 February 2017, 16:17:21 UTC | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git * 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git: l10n: fr.po: v2.11-rc0 first round l10n: fr.po: Fix a typo in the French translation l10n: fr.po: Remove gender specific adjectives l10n: fr.po: Fix typos | 13 February 2017, 16:17:21 UTC |
ec6cd14 | René Scharfe | 11 February 2017, 13:58:44 UTC | cocci: detect useless free(3) calls Add a semantic patch for removing checks that cause free(3) to only be called with a NULL pointer, as that must be a programming mistake. Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2017, 19:29:12 UTC |
5676f96 | Peter Krefting | 11 February 2017, 19:19:48 UTC | l10n: sv.po: Update Swedish translation (3137t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 11 February 2017, 19:21:33 UTC |
71ca3ba | Jean-Noel Avila | 08 February 2017, 20:36:33 UTC | l10n: fr.po: v2.11-rc0 first round Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 11 February 2017, 14:09:59 UTC |
dcf07e2 | Changwoo Ryu | 11 February 2017, 02:29:32 UTC | l10n: ko.po: Update Korean translation Signed-off-by: Changwoo Ryu <cwryu@debian.org> | 11 February 2017, 02:32:27 UTC |
a8b0516 | Lars Schneider | 09 February 2017, 15:06:56 UTC | git-p4: fix git-p4.pathEncoding for removed files In a9e38359e3 we taught git-p4 a way to re-encode path names from what was used in Perforce to UTF-8. This path re-encoding worked properly for "added" paths. "Removed" paths were not re-encoded and therefore different from the "added" paths. Consequently, these files were not removed in a git-p4 cloned Git repository because the path names did not match. Fix this by moving the re-encoding to a place that affects "added" and "removed" paths. Add a test to demonstrate the issue. Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Reviewed-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2017, 22:33:13 UTC |
5588dbf | Junio C Hamano | 10 February 2017, 20:54:23 UTC | Git 2.12-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2017, 20:54:23 UTC |
653078b | Junio C Hamano | 10 February 2017, 20:52:27 UTC | Merge branch 'nd/rev-list-all-includes-HEAD-doc' Doc update. * nd/rev-list-all-includes-HEAD-doc: rev-list-options.txt: update --all about HEAD | 10 February 2017, 20:52:27 UTC |
c1462b8 | Junio C Hamano | 10 February 2017, 20:52:27 UTC | Merge branch 'rs/fill-directory-optim' Code clean-up. * rs/fill-directory-optim: dir: avoid allocation in fill_directory() | 10 February 2017, 20:52:27 UTC |
e53c7f8 | Junio C Hamano | 10 February 2017, 20:52:26 UTC | Merge branch 'jk/log-graph-name-only' "git log --graph" did not work well with "--name-only", even though other forms of "diff" output were handled correctly. * jk/log-graph-name-only: diff: print line prefix for --name-only output | 10 February 2017, 20:52:27 UTC |
dd19bca | Junio C Hamano | 10 February 2017, 20:52:26 UTC | Merge branch 'da/t7800-cleanup' Test updates. * da/t7800-cleanup: t7800: replace "wc -l" with test_line_count | 10 February 2017, 20:52:26 UTC |
0ffe1c9 | Junio C Hamano | 10 February 2017, 20:52:26 UTC | Merge branch 'dl/difftool-doc-no-gui-option' Doc update. * dl/difftool-doc-no-gui-option: Document the --no-gui option in difftool | 10 February 2017, 20:52:26 UTC |
163d24d | Junio C Hamano | 10 February 2017, 20:52:25 UTC | Merge branch 'js/difftool-builtin' A few hot-fixes to C-rewrite of "git difftool". * js/difftool-builtin: t7800: simplify basic usage test difftool: fix bug when printing usage | 10 February 2017, 20:52:25 UTC |
cf36a4d | Junio C Hamano | 10 February 2017, 20:52:25 UTC | Merge branch 'rs/p5302-create-repositories-before-tests' Adjust a perf test to new world order where commands that do require a repository are really strict about having a repository. * rs/p5302-create-repositories-before-tests: p5302: create repositories for index-pack results explicitly | 10 February 2017, 20:52:25 UTC |
65fecf0 | Junio C Hamano | 10 February 2017, 20:52:25 UTC | Merge branch 'ps/worktree-prune-help-fix' Incorrect usage help message for "git worktree prune" has been fixed. * ps/worktree-prune-help-fix: worktree: fix option descriptions for `prune` | 10 February 2017, 20:52:25 UTC |
f7490fd | Junio C Hamano | 10 February 2017, 20:52:24 UTC | Merge branch 'ew/complete-svn-authorship-options' Correct command line completion (in contrib/) on "git svn" * ew/complete-svn-authorship-options: completion: fix git svn authorship switches | 10 February 2017, 20:52:24 UTC |
5c40e9c | Junio C Hamano | 10 February 2017, 20:52:23 UTC | Merge branch 'jk/reset-to-break-a-commit-doc' A minor doc update. * jk/reset-to-break-a-commit-doc: reset: add an example of how to split a commit into two | 10 February 2017, 20:52:24 UTC |
8e7c1f3 | Junio C Hamano | 10 February 2017, 20:52:23 UTC | Merge branch 'bw/push-submodule-only' Add missing documentation update to a recent topic. * bw/push-submodule-only: completion: add completion for --recurse-submodules=only doc: add doc for git-push --recurse-submodules=only | 10 February 2017, 20:52:23 UTC |
941b9c5 | Stefan Beller | 09 February 2017, 01:29:30 UTC | Documentation: unify bottom "part of git suite" lines We currently have 168 man pages that mention they are part of Git, you can check yourself easily via: $ git grep "Part of the linkgit:git\[1\] suite" |wc -l 168 However some have a trailing period, i.e. $ git grep "Part of the linkgit:git\[1\] suite." |wc -l 8 Unify the bottom line in all man pages to not end with a period. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2017, 23:14:01 UTC |
438fc68 | Stefan Beller | 08 February 2017, 22:04:00 UTC | push options: pass push options to the transport helper When using non-builtin protocols relying on a transport helper (such as http), push options are not propagated to the helper. The user could ask for push options and a push would seemingly succeed, but the push options would never be transported to the server, misleading the users expectation. Fix this by propagating the push options to the transport helper. This is only addressing the first issue of (1) the helper protocol does not propagate push-option (2) the http helper is not prepared to handle push-option Once we fix (2), the http transport helper can make use of push options as well, but that happens as a follow up. (1) is a bug fix, whereas (2) is a feature, which is why we only do (1) here. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 23:45:01 UTC |
f5022b5 | Jeff King | 08 February 2017, 20:31:15 UTC | diff: print line prefix for --name-only output If you run "git log --graph --name-only", the pathnames are not indented to go along with their matching commits (unlike all of the other diff formats). We need to output the line prefix for each item before writing it. The tests cover both --name-status and --name-only. The former actually gets this right already, because it builds on the --raw format functions. It's only --name-only which uses its own code (and this fix mirrors the code in diff_flush_raw()). Note that the tests don't follow our usual style of setting up the "expect" output inside the test block. This matches the surrounding style, but more importantly it is easier to read: we don't have to worry about embedded single-quotes, and the leading indentation is more obvious. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:39:57 UTC |
bec5ab8 | René Scharfe | 07 February 2017, 22:04:25 UTC | dir: avoid allocation in fill_directory() Pass the match member of the first pathspec item directly to read_directory() instead of using common_prefix() to duplicate it first, thus avoiding memory duplication, strlen(3) and free(3). Signed-off-by: Rene Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:38:41 UTC |
209df26 | Nguyễn Thái Ngọc Duy | 08 February 2017, 06:06:41 UTC | rev-list-options.txt: update --all about HEAD This is the document patch for f0298cf1c6 (revision walker: include a detached HEAD in --all - 2009-01-16). Even though that commit is about detached HEAD, as Jeff pointed out, always adding HEAD in that case may have subtle differences with --source or --exclude. So the document mentions nothing about the detached-ness. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:37:32 UTC |
1ce515f | David Aguilar | 07 February 2017, 09:17:00 UTC | t7800: replace "wc -l" with test_line_count Make t7800 easier to debug by capturing output into temporary files and using test_line_count to make assertions on those files. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:36:07 UTC |
a83c2d2 | Junio C Hamano | 08 February 2017, 21:36:03 UTC | Merge branch 'da/difftool-dir-diff-fix' into da/t7800-cleanup * da/difftool-dir-diff-fix: difftool: fix dir-diff index creation when in a subdirectory | 08 February 2017, 21:36:03 UTC |
e66adca | David Aguilar | 07 February 2017, 09:16:59 UTC | t7800: simplify basic usage test Use "test_line_count" instead of "wc -l", use "git -C" instead of a subshell, and use test_expect_code when calling difftool. Ease debugging by capturing output into temporary files. Suggested-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:31:20 UTC |
56c2da5 | Denton Liu | 07 February 2017, 06:32:07 UTC | Document the --no-gui option in difftool Prior to this, the `--no-gui` option was not documented in the manpage. This commit introduces this into the manpage Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2017, 21:30:28 UTC |
2488dca | Patrick Steinhardt | 06 February 2017, 13:13:59 UTC | worktree: fix option descriptions for `prune` The `verbose` and `expire` options of the `git worktree prune` subcommand have wrong descriptions in that they pretend to relate to objects. But as the git-worktree(1) correctly states, these options have nothing to do with objects but only with worktrees. Fix the description accordingly. Signed-off-by: Patrick Steinhardt <patrick.steinhardt@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2017, 18:59:25 UTC |
c86000c | René Scharfe | 05 February 2017, 11:43:29 UTC | p5302: create repositories for index-pack results explicitly Before 7176a314 (index-pack: complain when --stdin is used outside of a repo) index-pack silently created a non-existing target directory; now the command refuses to work unless it's used against a valid repository. That causes p5302 to fail, which relies on the former behavior. Fix it by setting up the destinations for its performance tests using git init. Signed-off-by: Rene Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2017, 18:55:25 UTC |
2cbad17 | Eric Wong | 05 February 2017, 02:18:57 UTC | completion: fix git svn authorship switches --add-author-from and --use-log-author are for "git svn dcommit", not "git svn (init|clone)" Signed-off-by: Eric Wong <e@80x24.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2017, 18:40:39 UTC |
d81345c | David Aguilar | 05 February 2017, 21:23:38 UTC | difftool: fix bug when printing usage "git difftool -h" reports an error: fatal: BUG: setup_git_env called without repository Defer repository setup so that the help option processing happens before the repository is initialized. Add tests to ensure that the basic usage works inside and outside of a repository. Signed-off-by: David Aguilar <davvid@gmail.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2017, 18:13:48 UTC |
c0ea09b | Anthony Ramine | 01 January 2017, 12:56:46 UTC | l10n: fr.po: Fix a typo in the French translation Signed-off-by: Anthony Ramine <n.oxyde@gmail.com> | 04 February 2017, 14:10:39 UTC |
98992e9 | Joachim Jablon | 16 December 2016, 15:56:31 UTC | l10n: fr.po: Remove gender specific adjectives Signed-off-by: Joachim Jablon <ewjoachim@gmail.com> Reviewed-by: Jean-Noel Avila <jn.avila@free.fr> | 04 February 2017, 14:10:39 UTC |
e1df01c | Joachim Jablon | 18 December 2016, 01:16:06 UTC | l10n: fr.po: Fix typos Reviewed-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Joachim Jablon <ewjoachim@gmail.com> | 04 February 2017, 14:10:39 UTC |
7326451 | Jacob Keller | 03 February 2017, 20:28:33 UTC | reset: add an example of how to split a commit into two It is often useful to break a commit into multiple parts that are more logical separations. This can be tricky to learn how to do without the brute-force method if re-writing code or commit messages from scratch. Add a section to the git-reset documentation which shows an example process for how to use git add -p and git commit -c HEAD@{1} to interactively break a commit apart and re-use the original commit message as a starting point when making the new commit message. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2017, 06:31:47 UTC |