- 31 8月, 2013 1 次提交
-
-
由 Brad King 提交于
The function resets refs rather than doing arbitrary updates. Rename it to allow a future general-purpose update_refs function to be added. Signed-off-by: NBrad King <brad.king@kitware.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 24 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 22 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 20 8月, 2013 1 次提交
-
-
由 Junio C Hamano 提交于
As we had to revert two topics at the last minute, let's have another (hopefully short) round of rc to make sure the final release will be sound. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 8月, 2013 2 次提交
-
-
由 Junio C Hamano 提交于
This reverts commit cdfd9483, as it does not just apply to "@" (and forms with modifiers like @{u} applied to it), but also affects e.g. "refs/heads/@/foo", which it shouldn't. The basic idea of giving a short-hand might be good, and the topic can be retried later, but let's revert to avoid affecting existing use cases for now for the upcoming release.
-
由 Junio C Hamano 提交于
This reverts commit a7365313, as it has been reported that "ls-files --killed" is too time-consuming in a deep directory with too many untracked crufts (e.g. $HOME/.git tracking only a few files). We'd need to revisit it later but "ls-files --killed" needs to be optimized before it happens.
-
- 14 8月, 2013 6 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: Add reference for french translation team l10n: fr.po: 821/2112 messages translated
-
由 Junio C Hamano 提交于
* sb/mailmap-updates: .mailmap: Combine more (name, email) to individual persons .mailmap: update long-lost friends with multiple defunct addresses
-
由 Stefan Beller 提交于
Signed-off-by: NStefan Beller <stefanbeller@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
A handful of past contributors are recorded with multiple e-mail addresses, all of which are undeliverable. With a lot of help from Jonathan, we located all of them except for one person, and a pair of addresses we suspect belong to a single person but we are not certain. Update the found ones with their currently preferred address, and use the last known address to consolidate contributions by the lost one. Helped-by: NStefan Beller <stefanbeller@googlemail.com> Helped-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Matthieu Moy 提交于
Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 8月, 2013 2 次提交
-
-
由 Jean-Noel Avila 提交于
Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
-
由 Jean-Noel Avila 提交于
Trying to focus on most useful phrases. Signed-off-by: NJean-Noel Avila <jn.avila@free.fr>
-
- 10 8月, 2013 7 次提交
-
-
由 Junio C Hamano 提交于
* maint: parse-options: fix clang opterror() -Wunused-value warning
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate 5 messages l10n: de.po: translate 99 new messages l10n: de.po: switch from pure German to German+English l10n: de.po: Fix a typo l10n: Update Swedish translation (2135t0f0u) l10n: zh_CN.po: translate 5 messages (2135t0f0u) l10n: vi.po(2135t): v1.8.4 round 2 l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)
-
由 Junio C Hamano 提交于
* jk/submodule-subdirectory-ok: t/t7407: fix two typos in submodule tests
-
由 Junio C Hamano 提交于
* sb/mailmap-updates: .mailmap: fixup entries
-
由 Stefan Beller 提交于
This patch adds no new names, but fixes the mistakes I made in the previous commits. (94b410bb, f4f49e22, c07a6bc5, 2013-07-12, .mailmap: Map email addresses to names). These mistakes are double white spaces between name and surname, different capitalization in email address, or just the email address set as name. Also I forgot to include James Knight to the mailmap file. Signed-off-by: NStefan Beller <stefanbeller@googlemail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Phil Hord 提交于
In t/t7407-submodule-foreach.sh there is a typo in one of the path names given for a test step. The correct path is nested1/nested2/.git, but nested1/nested1/nested2/.git is given instead. The typo is hidden because this line also accidentally omits the && chain operator. The omitted chain also means the return values of all the previous commands in this test are also being ignored. Fix the path and add the chain operator so the entire test sequence can be properly validated. Signed-off-by: NPhil Hord <hordp@cisco.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Eric Sunshine 提交于
a469a101 (silence some -Wuninitialized false positives; 2012-12-15) triggered "unused value" warnings when the return value of opterror() and several other error-related functions was not used. 5ded807f (fix clang -Wunused-value warnings for error functions; 2013-01-16) applied a fix by adding #if !defined(__clang__) in cache.h and git-compat-util.h, but misspelled it as #if !defined(clang) in parse-options.h. Fix this. This mistake went unnoticed because existing callers of opterror() utilize its return value. 11588263 (parse-options: add OPT_CMDMODE(); 2013-07-30), however, adds a new invocation of opterror() which ignores the return value, thus triggering the "unused value" warning. Signed-off-by: NEric Sunshine <sunshine@sunshineco.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 09 8月, 2013 3 次提交
-
-
由 Ralf Thielow 提交于
Translate 5 new messages came from git.pot update in b8ecf239 (l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)). Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Ralf Thielow 提交于
Translate 99 new messages came from git.pot update in 28b3cffc (l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)). Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Acked-by: NThomas Rast <trast@inf.ethz.ch>
-
由 Junio C Hamano 提交于
This is with mostly minor documentation and test updates, nothing spectacular except for removal of funky lstat(2) emulation on Cygwin. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 8月, 2013 2 次提交
-
-
由 Ralf Thielow 提交于
This switches the translation from pure German to German+English. Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Acked-by: NThomas Rast <trast@inf.ethz.ch>
-
由 Wieland Hoffmann 提交于
Signed-off-by: NWieland Hoffmann <themineo@gmail.com>
-
- 06 8月, 2013 14 次提交
-
-
由 Peter Krefting 提交于
Fix some incorrect translations in existing messages while at it. Signed-off-by: NPeter Krefting <peter@softwolves.pp.se>
-
由 Jiang Xin 提交于
Translate 5 new messages came from git.pot update in b8ecf239 (l10n: git.pot: v1.8.4 round 2 (5 new, 3 removed)). Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Tran Ngoc Quan 提交于
Signed-off-by: NTran Ngoc Quan <vnwildman@gmail.com>
-
由 Jiang Xin 提交于
Generate po/git.pot from v1.8.4-rc1-21-gfb565708 for git v1.8.4 l10n round 2. Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Junio C Hamano 提交于
* maint: fix typo in documentation of git-svn Documentation/rev-list-options: add missing word in --*-parents log doc: the argument to --encoding is not optional
-
由 Junio C Hamano 提交于
* es/blame-L-breakage: t8001, t8002: fix "blame -L :literal" test on NetBSD
-
由 René Scharfe 提交于
Sub-test 42 of t8001 and t8002 ("blame -L :literal") fails on NetBSD with the following verbose output: git annotate -L:main hello.c Author F (expected 4, attributed 3) bad Author G (expected 1, attributed 1) good This is not caused by different behaviour of git blame or annotate on that platform, but by different test input, in turn caused by a sed command that forgets to add a newline on NetBSD. Here's the diff of the commit that adds "goodbye" to hello.c, for Linux: @@ -1,4 +1,5 @@ int main(int argc, const char *argv[]) { puts("hello"); + puts("goodbye"); } We see that it adds an extra TAB, but that's not a problem. Here's the same on NetBSD: @@ -1,4 +1,4 @@ int main(int argc, const char *argv[]) { puts("hello"); -} + puts("goodbye");} It also adds an extra TAB, but it is missing the newline character after the semicolon. The following patch gets rid of the extra TAB at the beginning, but more importantly adds the missing newline at the end in a (hopefully) portable way, mentioned in http://sed.sourceforge.net/sedfaq4.html. The diff becomes this, on both Linux and NetBSD: @@ -1,4 +1,5 @@ int main(int argc, const char *argv[]) { puts("hello"); + puts("goodbye"); } Signed-off-by: NRene Scharfe <l.s.r@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* git://github.com/git-l10n/git-po: l10n: zh_CN.po: translate 99 messages (2133t0f0u) l10n: vi.po (2133t) l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed)
-
由 Junio C Hamano 提交于
* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin
-
由 Junio C Hamano 提交于
* dn/test-reject-utf-16: t3900: test rejecting log message with NULs correctly Add missing test file for UTF-16.
-
由 Junio C Hamano 提交于
* bc/commit-invalid-utf8: commit: typofix for xxFFF[EF] check
-
由 Junio C Hamano 提交于
We wanted to catch all codepoints that ends with FFFE and FFFF, not with 0FFFE and 0FFFF. Noticed and corrected by Peter Krefting. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
It is not like that our longer term desire is to someday start accept log messages with NULs in them, so it is wrong to mark a test that demonstrates "git commit" that correctly fails given such an input as "expect-failure". "git commit" should fail today, and it should fail the same way in the future given a message with NUL in it. Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Brian M. Carlson 提交于
The test file that the UTF-16 rejection test looks for is missing, but this went unnoticed because the test is expected to fail anyway; as a consequence, the test fails because the file containing the commit message is missing, and not because the test file contains a NUL byte. Fix this by including a sample text file containing a commit message encoded in UTF-16. Signed-off-by: NBrian M. Carlson <sandals@crustytoothpaste.net> Tested-by: NDuy Nguyen <pclouds@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-