summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2015-01-21l10n: correct indentation of show-branch usageLibravatar Jiang Xin6-64/+62
An indentation error was found right after we started l10n round 2, and commit d6589d1 (show-branch: fix indentation of usage string) and this update would fix it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-21Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin7-6430/+6515
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 3 messages l10n: zh_CN: various fixes on command arguments l10n: vi.po(2298t): Updated 3 new strings l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 2 l10n: git.pot: v2.3.0 round 2 (3 updated) l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
2015-01-20Git 2.3.0-rc1Libravatar Junio C Hamano2-1/+6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-20Merge branch 'jk/http-push-symref-fix'Libravatar Junio C Hamano1-0/+3
* jk/http-push-symref-fix: http-push: trim trailing newline from remote symref
2015-01-20Merge branch 'ak/show-branch-usage-string'Libravatar Junio C Hamano1-3/+3
* ak/show-branch-usage-string: show-branch: fix indentation of usage string
2015-01-20show-branch: fix indentation of usage stringLibravatar Ralf Thielow1-3/+3
Noticed-by: Jean-Noël Avila <jn.avila@free.fr> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-20Merge branch 'jk/colors'Libravatar Junio C Hamano2-0/+5
* jk/colors: parse_color: fix return value for numeric color values 0-8
2015-01-20parse_color: fix return value for numeric color values 0-8Libravatar Jeff King2-0/+5
When commit 695d95d refactored the color parsing, it missed a "return 0" when parsing literal numbers 0-8 (which represent basic ANSI colors), leading us to report these colors as an error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-20l10n: de.po: translate 3 messagesLibravatar Ralf Thielow1-141/+142
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-19l10n: zh_CN: various fixes on command argumentsLibravatar Jiang Xin1-176/+175
Updated translations for Git 2.3.0 l10n round 2, and fixed various translations for command arguments. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-19Merge branch 'v2.3.0' of git://github.com/jnavila/gitLibravatar Jiang Xin1-133/+137
* 'v2.3.0' of git://github.com/jnavila/git: l10n: fr.po v2.3.0 round 2
2015-01-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-131/+131
* 'master' of git://github.com/nafmo/git-l10n-sv: l10n: sv.po: Update Swedish translation (2298t0f0u)
2015-01-19l10n: vi.po(2298t): Updated 3 new stringsLibravatar Tran Ngoc Quan1-137/+137
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-01-18l10n: sv.po: Update Swedish translation (2298t0f0u)Libravatar Peter Krefting1-131/+131
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-01-18l10n: fr.po v2.3.0 round 2Libravatar Jean-Noel Avila1-133/+137
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-01-18l10n: git.pot: v2.3.0 round 2 (3 updated)Libravatar Jiang Xin1-124/+124
Generate po/git.pot from v2.3.0-rc0-44-ga94655d for git v2.3.0 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-18Merge branch 'master' of git://github.com/git-l10n/git-poLibravatar Jiang Xin7-6003/+6084
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 13 new messages l10n: de.po: fix typo l10n: de.po: translate "track" as "versionieren" l10n: zh_CN: translations for git v2.3.0-rc0 l10n: sv.po: Update Swedish translation (2298t0f0u) l10n: fr.po v2.3.0 round 1 l10n: vi.po(2298t): Updated and change Plural-Forms l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed) l10n: ca.po: various fixes
2015-01-17l10n: de.po: translate 13 new messagesLibravatar Ralf Thielow1-836/+857
Translate 13 new messages came from git.pot update in beb691f (l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17l10n: de.po: fix typoLibravatar Ralf Thielow1-1/+1
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17l10n: de.po: translate "track" as "versionieren"Libravatar Ralf Thielow1-20/+20
Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
2015-01-17l10n: zh_CN: translations for git v2.3.0-rc0Libravatar Jiang Xin1-830/+853
Translate 13 new messages (2298t0f0u) for git v2.3.0-rc0. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-15git-svn: make it play nicely with submodulesLibravatar Ramkumar Ramachandra1-0/+6
It's a simple matter of opening the directory specified in the gitfile. [ew: tweaked check to avoid open() on directories] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
2015-01-15Git::SVN: handle missing ref_id case correctlyLibravatar Ramkumar Ramachandra1-1/+1
ref_id should not match "refs/remotes/". [ew: dropped initial hunk for GIT_SVN_ID at Ramkumar's request] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
2015-01-14l10n: sv.po: Update Swedish translation (2298t0f0u)Libravatar Peter Krefting1-842/+865
Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
2015-01-14Fifth batch for 2.3 cycleLibravatar Junio C Hamano1-2/+27
Hopefully this will be the final feature update for 2.3-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-14Merge branch 'po/doc-core-ignorestat'Libravatar Junio C Hamano1-8/+13
* po/doc-core-ignorestat: doc: core.ignoreStat update, and clarify the --assume-unchanged effect doc: core.ignoreStat clarify the --assume-unchanged effect
2015-01-14Merge branch 'rc/for-each-ref-tracking'Libravatar Junio C Hamano2-2/+22
* rc/for-each-ref-tracking: for-each-ref: always check stat_tracking_info()'s return value
2015-01-14Merge branch 'rh/autoconf-rhel3'Libravatar Junio C Hamano5-1/+56
Build update for older RHEL. * rh/autoconf-rhel3: configure.ac: check for HMAC_CTX_cleanup configure.ac: check for clock_gettime and CLOCK_MONOTONIC configure.ac: check 'tv_nsec' field in 'struct stat'
2015-01-14Merge branch 'ak/fewer-includes'Libravatar Junio C Hamano2-7/+0
* ak/fewer-includes: cat-file: remove unused includes git.c: remove unnecessary #includes
2015-01-14Merge branch 'ak/doc-add-v-n-options'Libravatar Junio C Hamano1-1/+1
* ak/doc-add-v-n-options: Documentation: list long options for -v and -n
2015-01-14Merge branch 'ak/show-branch-usage-string'Libravatar Junio C Hamano1-1/+4
* ak/show-branch-usage-string: show-branch: line-wrap show-branch usage
2015-01-14Merge branch 'rh/test-color-avoid-terminfo-in-original-home'Libravatar Junio C Hamano1-44/+48
We try to see if "tput" gives a useful result before switching TERM to dumb and moving HOME to point to our fake location for stability of the tests, and then use the command when coloring the output from the tests, but there is no guarantee "tput" works after switching HOME. * rh/test-color-avoid-terminfo-in-original-home: test-lib.sh: do tests for color support after changing HOME test-lib: use 'test ...' instead of '[ ... ]'
2015-01-14Merge branch 'tf/prompt-preserve-exit-status'Libravatar Junio C Hamano1-5/+5
Using the exit status of the last command in the prompt, e.g. PS1='$(__git_ps1) $? ', did not work well because the helper function stomped on the exit status. * tf/prompt-preserve-exit-status: git-prompt: preserve value of $? in all cases
2015-01-14Merge branch 'rh/hide-prompt-in-ignored-directory'Libravatar Junio C Hamano2-7/+123
* rh/hide-prompt-in-ignored-directory: git-prompt.sh: allow to hide prompt for ignored pwd git-prompt.sh: if pc mode, immediately set PS1 to a plain prompt
2015-01-14Merge branch 'mm/complete-rebase-autostash'Libravatar Junio C Hamano1-0/+1
* mm/complete-rebase-autostash: git-completion: add --autostash for 'git rebase'
2015-01-14Merge branch 'aw/doc-smtp-ssl-cert-path'Libravatar Junio C Hamano1-4/+9
A long overdue documentation update to match an age-old code update. * aw/doc-smtp-ssl-cert-path: correct smtp-ssl-cert-path description
2015-01-14Merge branch 'sp/subtree-doc'Libravatar Junio C Hamano1-105/+89
* sp/subtree-doc: subtree: fix AsciiDoc list item continuation
2015-01-14Merge branch 'km/log-usage-string-i18n'Libravatar Junio C Hamano1-2/+2
* km/log-usage-string-i18n: log.c: fix translation markings
2015-01-14Merge branch 'km/imap-send-libcurl-options'Libravatar Junio C Hamano1-3/+3
Now imap-send learned to talk to the server using cURL library, allow the same GIT_CURL_VERBOSE environment variable to control the verbosity of the chattering. * km/imap-send-libcurl-options: imap-send.c: set CURLOPT_USE_SSL to CURLUSESSL_TRY imap-send.c: support GIT_CURL_VERBOSE
2015-01-14Merge branch 'jk/prune-packed-server-info'Libravatar Junio C Hamano2-1/+12
Fix recent breakage in Git 2.2 that started creating info/refs and objects/info/packs files with permission bits tighter than user's umask. * jk/prune-packed-server-info: update-server-info: create info/* with mode 0666 t1301: set umask in reflog sharedrepository=group test
2015-01-14Merge branch 'js/remote-add-with-insteadof'Libravatar Junio C Hamano2-1/+8
"git remote add $name $URL" is now allowed when "url.$URL.insteadOf" is already defined. * js/remote-add-with-insteadof: Add a regression test for 'git remote add <existing> <same-url>' git remote: allow adding remotes agreeing with url.<...>.insteadOf
2015-01-14http-push: trim trailing newline from remote symrefLibravatar Jeff King1-0/+3
When we fetch a symbolic ref file from the remote, we get the whole string "ref: refs/heads/master\n", recognize it by skipping past the "ref: ", and store the rest. We should chomp the trailing newline. This bug was introduced in ae021d8 (use skip_prefix to avoid magic numbers, 2014-06-18), which did not notice that the length computation fed to xmemdupz was quietly tweaked by 1 to account for this. We can solve it by explicitly trimming the newline, which is more obvious. Note that we use strbuf_rtrim here, which will actually cut off any trailing whitespace, not just a single newline. This is a good thing, though, as it makes our parsing more liberal (and spaces are not valid in refnames anyway). Signed-off-by: Jeff King <peff@peff.net> Tested-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-14git-prompt: preserve value of $? in all casesLibravatar Tony Finch1-4/+4
Signed-off-by: Tony Finch <dot@dotat.at> Reviewed-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-13l10n: fr.po v2.3.0 round 1Libravatar Jean-Noel Avila1-833/+852
Signed-off-by: Jean-Noel Avila <jn.avila@free.fr>
2015-01-13l10n: vi.po(2298t): Updated and change Plural-FormsLibravatar Tran Ngoc Quan1-1019/+986
Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com>
2015-01-13l10n: git.pot: v2.3.0 round 1 (13 new, 11 removed)Libravatar Jiang Xin1-824/+831
Generate po/git.pot from v2.3.0-rc0 for git v2.3.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com>
2015-01-13Merge branch 'master' of git://github.com/alexhenrie/git-poLibravatar Jiang Xin1-798/+819
* 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: various fixes
2015-01-12doc: core.ignoreStat update, and clarify the --assume-unchanged effectLibravatar Philip Oakley1-9/+13
The assume-unchanged bit, and consequently core.ignoreStat, can be misunderstood. Be assertive about the expectation that file changes should notified to Git. Overhaul the general wording thus: 1. direct description of what is ignored given first. 2. example instruction of the user manual action required. 3. use sideways indirection for assume-unchanged and update-index references. 4. add a 'normally' to give leeway for the change detection. Signed-off-by: Philip Oakley <philipoakley@iee.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-12for-each-ref: always check stat_tracking_info()'s return valueLibravatar Raphael Kubo da Costa2-2/+22
The code handling %(upstream:track) and %(upstream:trackshort) assumed that it always had a valid branch that had been sanitized earlier in populate_value(), and thus did not check the return value of the call to stat_tracking_info(). While there is indeed some sanitization code that basically corresponds to stat_tracking_info() returning 0 (no base branch set), the function can also return -1 when the base branch did exist but has since then been deleted. In this case, num_ours and num_theirs had undefined values and a call to `git for-each-ref --format="%(upstream:track)"` could print spurious values such as [behind -111794512] [ahead 38881640, behind 5103867] even for repositories with one single commit. Verify stat_tracking_info()'s return value and do not print anything if it returns -1. This behavior also matches the documentation ("has no effect if the ref does not have tracking information associated with it"). Helped-by: Eric Sunshine <sunshine@sunshineco.com> Helped-by: Jeff King <peff@peff.net> Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2015-01-12Git 2.3.0-rc0Libravatar Junio C Hamano2-1/+18
Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-18 17:17:27 +0000