summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* parse_decoration_style: drop unused argument `var`ma/parse-maybe-boolMartin Ågren2017-08-071-3/+3
| | | | | | | The previous commit left it unused. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* treewide: deprecate git_config_maybe_bool, use git_parse_maybe_boolMartin Ågren2017-08-0710-13/+17
| | | | | | | | | | | | | The only difference between these is that the former takes an argument `name` which it ignores completely. Still, the callers are quite careful to provide reasonable values for it. Once in-flight topics have landed, we should be able to remove git_config_maybe_bool. In the meantime, document it as deprecated in the technical documentation. While at it, document git_parse_maybe_bool. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: make git_{config,parse}_maybe_bool equivalentMartin Ågren2017-08-072-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Both of these act on a string `value` which they parse as a boolean. The "parse"-variant was introduced as a replacement for the "config"-variant which for historical reasons takes an unused argument `name`. That it was intended as a replacement is not obvious from commit 9a549d43 ("config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool", 2015-08-19), but that is what the background on the mailing list suggests [1]. However, these two functions do not parse `value` in exactly the same way. In particular, git_config_maybe_bool accepts integers (0 for false, non-0 for true). This means there are two slightly different definitions of "maybe_bool" in the code-base, and that every time a call to git_config_maybe_bool is changed to use git_parse_maybe_bool, it risks breaking someone's workflow. Move the implementation of "config" into "parse" and make the latter a trivial wrapper. This also fixes the only user of git_parse_maybe_bool, `git push --signed=..`. [1] https://public-inbox.org/git/xmqq7fotd71o.fsf@gitster.dls.corp.google.com/ Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* config: introduce git_parse_maybe_bool_textMartin Ågren2017-08-071-3/+8
| | | | | | | | | | | | | | | | | | | | | | Commit 9a549d43 ("config.c: rename git_config_maybe_bool_text and export it as git_parse_maybe_bool", 2015-08-19) intended git_parse_maybe_bool to be a replacement for git_config_maybe_bool, which could then be retired. That is not obvious from the commit message, but that is what the background on the mailing list suggests [1]. However, git_{config,parse}_maybe_bool do not handle all input the same. Before the rename, that was by design and there is a caller in config.c which requires git_parse_maybe_bool to behave exactly as it does. Prepare for the next patch by renaming git_parse_maybe_bool to ..._text and reimplementing the first one as a simple call to the second one. Let the existing users in config.c use ..._text, since it does what they need. [1] https://public-inbox.org/git/xmqq7fotd71o.fsf@gitster.dls.corp.google.com/ Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* t5334: document that git push --signed=1 does not workMartin Ågren2017-08-071-0/+7
| | | | | | | | | | | | | | | | When accepting booleans as command-line or config options throughout Git, there are several documented synonyms for true and false. However, one particular user is slightly broken: `git push --signed=..` does not understand the integer synonyms for true and false. This is hardly wanted. The --signed option has a different notion of boolean than all other arguments and config options, including the config option corresponding to it, push.gpgSign. Add a test documenting the failure to handle --signed=1. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Doc/git-{push,send-pack}: correct --sign= to --signed=Martin Ågren2017-08-072-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we're about to touch the behavior of --signed=, do this as a preparatory step. The documentation mentions --sign=, and it works. But that's just because it's an unambiguous abbreviation of --signed, which is how it is actually implemented. This was added in commit 30261094 ("push: support signing pushes iff the server supports it", 2015-08-19). Back when that series was developed [1] [2], there were suggestions about both --sign= and --signed=. The final implementation settled on --signed=, but some of the documentation and commit messages ended up using --sign=. The option is referred to as --signed= in Documentation/config.txt (under push.gpgSign). One could argue that we have promised --sign for two years now, so we should implement it as an alias for --signed. (Then we might also deprecate the latter, something which was considered already then.) That would be a slightly more intrusive change. This minor issue would only be a problem once we want to implement some other option --signfoo, but the earlier we do this step, the better. [1] v1-thread: https://public-inbox.org/git/1439492451-11233-1-git-send-email-dborowitz@google.com/T/#u [2] v2-thread: https://public-inbox.org/git/1439998007-28719-1-git-send-email-dborowitz@google.com/T/#m6533a6c4707a30b0d81e86169ff8559460cbf6eb Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Git 2.12v2.12.0Junio C Hamano2017-02-243-1/+12
| | | | Signed-off-by: Junio C Hamano <gitster@pobox.com>
* Merge branch 'ps/doc-gc-aggressive-depth-update'Junio C Hamano2017-02-241-1/+1
|\ | | | | | | | | | | | | Doc update. * ps/doc-gc-aggressive-depth-update: docs/git-gc: fix default value for `--aggressiveDepth`
| * docs/git-gc: fix default value for `--aggressiveDepth`ps/doc-gc-aggressive-depth-updatePatrick Steinhardt2017-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'bc/worktree-doc-fix-detached'Junio C Hamano2017-02-241-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Doc update. * bc/worktree-doc-fix-detached: Documentation: correctly spell git worktree --detach
| * | Documentation: correctly spell git worktree --detachbc/worktree-doc-fix-detachedbrian m. carlson2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'dr/doc-check-ref-format-normalize'Junio C Hamano2017-02-241-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * dr/doc-check-ref-format-normalize: git-check-ref-format: clarify documentation for --normalize
| * | | git-check-ref-format: clarify documentation for --normalizedr/doc-check-ref-format-normalizeDamien Regad2017-02-211-3/+3
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'gp/document-dotfiles-in-templates-are-not-copied'Junio C Hamano2017-02-241-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * gp/document-dotfiles-in-templates-are-not-copied: init: document dotfiles exclusion on template copy
| * | | init: document dotfiles exclusion on template copygp/document-dotfiles-in-templates-are-not-copiedGrégoire Paris2017-02-171-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge branch 'rt/align-add-i-help-text'Junio C Hamano2017-02-241-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * rt/align-add-i-help-text: git add -i: replace \t with blanks in the help message
| * | | git add -i: replace \t with blanks in the help messagert/align-add-i-help-textRalf Thielow2017-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge branch 'bc/blame-doc-fix'Junio C Hamano2017-02-241-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc update. * bc/blame-doc-fix: Documentation: use brackets for optional arguments
| * | | | Documentation: use brackets for optional argumentsbc/blame-doc-fixbrian m. carlson2017-02-221-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge tag 'l10n-2.12.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-02-2411-16381/+30174
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | | | l10n: zh_CN: for git v2.12.0 l10n round 2Jiang Xin2017-02-251-1446/+2761
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Translate 241 messages (3139t0f0u) for git v2.12.0-rc1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| * | | | l10n: Update Catalan translationJordi Mas2017-02-251-280/+340
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jordi Mas <jmas@softcatala.org>
| * | | | l10n: pt_PT: update Portuguese tranlationVasco Almeida2017-02-231-1634/+2928
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>
| * | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-02-221-168/+176
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3139t0f0u)
| | * | | | l10n: sv.po: Update Swedish translation (3139t0f0u)Peter Krefting2017-02-201-168/+176
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| * | | | | l10n: de.po: translate 241 messagesRalf Thielow2017-02-201-1472/+2859
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Merge branch 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-koJiang Xin2017-02-191-178/+200
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * 'ko/merge-l10n' of https://github.com/changwoo/git-l10n-ko: l10n: ko.po: Update Korean translation
| | * | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-02-191-178/+200
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| * | | | | Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-02-191-169/+177
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: vi.po (3139t): Updated 2 new messages for rc1
| | * | | | | l10n: vi.po (3139t): Updated 2 new messages for rc1Tran Ngoc Quan2017-02-181-169/+177
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| * | | | | l10n: fr.po: v2.12.0 round 2 3139tJean-Noel Avila2017-02-181-192/+234
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| * | | | l10n: git.pot: v2.12.0 round 2 (2 new)Jiang Xin2017-02-181-167/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-02-189-11031/+20680
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | * \ \ \ Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-02-181-1338/+2669
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/vnwildman/git: l10n: vi.po: Updated Vietnamese translation (3137t)
| | | * | | | l10n: vi.po: Updated Vietnamese translation (3137t)Tran Ngoc Quan2017-02-171-1338/+2669
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
| | * | | | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-02-181-1366/+2621
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * 'master' of https://github.com/Softcatala/git-po: l10n: update Catalan translation
| | | * | | | l10n: update Catalan translationJordi Mas2017-02-161-1366/+2621
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jordi Mas <jmas@softcatala.org>
| | * | | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-02-141-1337/+2670
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (3137t0f0u)
| | | * | | | | l10n: sv.po: Update Swedish translation (3137t0f0u)Peter Krefting2017-02-111-1337/+2670
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
| | * | | | | | Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/gitJiang Xin2017-02-141-1344/+2655
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | * | | | | l10n: fr.po: v2.11-rc0 first roundJean-Noel Avila2017-02-111-1337/+2648
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
| | | * | | | | l10n: fr.po: Fix a typo in the French translationAnthony Ramine2017-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Anthony Ramine <n.oxyde@gmail.com>
| | | * | | | | l10n: fr.po: Remove gender specific adjectivesJoachim Jablon2017-02-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joachim Jablon <ewjoachim@gmail.com> Reviewed-by: Jean-Noel Avila <jn.avila@free.fr>
| | | * | | | | l10n: fr.po: Fix typosJoachim Jablon2017-02-041-4/+4
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Joachim Jablon <ewjoachim@gmail.com>
| | * | | | | l10n: ko.po: Update Korean translationChangwoo Ryu2017-02-111-1320/+2617
| | |/ / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Changwoo Ryu <cwryu@debian.org>
| | * | | | l10n: git.pot: v2.12.0 round 1 (239 new, 15 removed)Jiang Xin2017-02-041-1273/+2454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate po/git.pot from v2.12.0-rc0 for git v2.12.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
| | * | | | Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-02-044-3084/+5025
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://github.com/git-l10n/git-po: 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
| | | * | | | l10n: bg: Updated Bulgarian translation (2913t+0f+0u)Alexander Shopov2017-01-311-2761/+4683
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alexander Shopov <ash@kambanaria.org>
| | | * | | | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-01-251-289/+308
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of https://github.com/Softcatala/git-po: l10n: fixes to Catalan translation
| | | | * | | | l10n: fixes to Catalan translationJordi Mas2017-01-031-289/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jordi Mas <jmas@softcatala.org>
View Lorry Controller Status