- 15 2月, 2013 8 次提交
-
-
由 Junio C Hamano 提交于
* bw/get-tz-offset-perl: cvsimport: format commit timestamp ourselves without using strftime perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases Move Git::SVN::get_tz to Git::get_tz_offset
-
由 Junio C Hamano 提交于
* al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains %
-
由 Junio C Hamano 提交于
* jk/error-const-return: Use __VA_ARGS__ for all of error's arguments
-
由 Junio C Hamano 提交于
Use a new helper that prints a message and counts its display width to align the help messages parse-options produces. * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns
-
由 Junio C Hamano 提交于
* mg/bisect-doc: git-bisect.txt: clarify that reset quits bisect
-
由 Junio C Hamano 提交于
Add coding guidelines for writing Perl scripts for Git. * tz/perl-styles: Update CodingGuidelines for Perl
-
由 Junio C Hamano 提交于
Instead of requiring the full 40-hex object names on the index line, we can read submodule commit object names from the textual diff when synthesizing a fake ancestore tree for "git am -3". * jc/extended-fake-ancestor-for-gitlink: apply: verify submodule commit object name better
-
由 Junio C Hamano 提交于
contrib/subtree updates, but here are only the ones that looked ready. The remainder of the patches will have another day. * dg/subtree-fixes: contrib/subtree: make the manual directory if needed contrib/subtree: honor DESTDIR contrib/subtree: fix synopsis contrib/subtree: better error handling for 'subtree add' contrib/subtree: use %B for split subject/body contrib/subtree: remove test number comments
-
- 13 2月, 2013 2 次提交
-
-
由 Junio C Hamano 提交于
* maint: Replace filepattern with pathspec for consistency
-
由 Matthieu Moy 提交于
pathspec is the most widely used term, and is the one defined in gitglossary.txt. <filepattern> was used only in the synopsys for git-add and git-commit, and in git-add.txt. Get rid of it. This patch is obtained with by running: perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern` Signed-off-by: NMatthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 12 2月, 2013 2 次提交
-
-
由 Jiang Xin 提交于
Since command usages can be translated, they may include utf-8 encoded strings, and the output in console may not align well any more. This is because strlen() is different from strwidth() on utf-8 strings. A wrapper utf8_fprintf() can help to return the correct number of columns required. Signed-off-by: NJiang Xin <worldhello.net@gmail.com> Signed-off-by: NNguyễn Thái Ngọc Duy <pclouds@gmail.com> Reviewed-by: NTorsten Bögershausen <tboegi@web.de> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
"reset" can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually quits the bisect session. Reported-by: NAndreas Mohr <andi@lisas.de> Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Reviewed-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 11 2月, 2013 8 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* maint: user-manual: Rewrite git-gc section for automatic packing user-manual: Fix 'you - Git' -> 'you--Git' typo user-manual: Fix 'http' -> 'HTTP' typos user-manual: Fix 'both: so' -> 'both; so' typo
-
由 W. Trevor King 提交于
This should have happened back in 2007, when `git gc` learned about auto (e9831e83, git-gc --auto: add documentation, 2007-09-17). Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
Use an em-dash, not a hyphen, to join these clauses. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 W. Trevor King 提交于
HTTP is an acronym which has not (yet) made the transition to word status (unlike "laser", probably because lasers are inherently cooler than HTTP ;). Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
The smart HTTP clients forgot to verify the content-type that comes back from the server side to make sure that the request is being handled properly. * sp/smart-http-content-type-check: http_request: reset "type" strbuf before adding t5551: fix expected error output Verify Content-Type from smart HTTP servers
-
由 W. Trevor King 提交于
The clause "so `git log ...` will return no commits..." is independent, not a description of "both", so a semicolon is more appropriate. Signed-off-by: NW. Trevor King <wking@tremily.us> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 David Aguilar 提交于
Do not use a random string as if it is a format string for printf when showing it literally; instead feed it to '%s' format. Reported-by: NAsheesh Laroia <asheesh@asheesh.org> Signed-off-by: NDavid Aguilar <davvid@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 2月, 2013 4 次提交
-
-
由 Ben Walton 提交于
Some implementations of strftime(3) lack support for "%z". Also there is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: NBen Walton <bdwalton@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ben Walton 提交于
When passed a local time that was on the boundary of a DST change, get_tz_offset returned a GMT offset that was incorrect (off by one hour). This is because the time was converted to GMT and then back to a time stamp via timelocal() which cannot disambiguate boundary cases as noted in its documentation. Modify this algorithm, using an approach suggested in http://article.gmane.org/gmane.comp.version-control.git/213871 to first convert the timestamp in question to two broken down forms with localtime() and gmtime(), and then compute what timestamps these two broken down forms would represent in GMT (i.e. a timezone that does not have DST issues) by applying timegm() on them. The difference between the resulting timestamps is the timezone offset. This avoids the ambigious conversion and allows a correct time to be returned on every occassion. Signed-off-by: NBen Walton <bdwalton@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ben Walton 提交于
This function has utility outside of the SVN module for any routine that needs the equivalent of GNU strftime's %z formatting option. Move it to the top-level Git.pm so that non-SVN modules don't need to import the SVN module to use it. The rename makes the purpose of the function clearer. Signed-off-by: NBen Walton <bdwalton@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
git://github.com/git-l10n/git-po由 Junio C Hamano 提交于
* 'master' of git://github.com/git-l10n/git-po: l10n: de.po: translate "reset" as "neu setzen" l10n: de.po: translate "revision" consistently as "Revision" l10n: de.po: translate 11 new messages l10n: zh_CN.po: 800+ new translations on command usages l10n: Update Swedish translation (1983t0f0u) l10n: vi.po: updated Vietnamese translation l10n: Update git.pot (11 new, 7 removed messages) l10n: de.po: fix some minor issues
-
- 09 2月, 2013 11 次提交
-
-
由 Junio C Hamano 提交于
We used to have an arbitrary 32 limit for combined diff input, resulting in incorrect number of leading colons shown when showing the "--raw --cc" output. * jc/combine-diff-many-parents: t4038: add tests for "diff --cc --raw <trees>" combine-diff: lift 32-way limit of combined diff
-
由 Junio C Hamano 提交于
Make sure the similarity value shown in the "apply --summary" output is sensible, even when the input had a bogus value. * jk/apply-similaritly-parsing: builtin/apply: tighten (dis)similarity index parsing
-
由 Junio C Hamano 提交于
The "complete with known paths only" update to completion scripts returns directory names without trailing slash to compensate the addition of '/' done by bash that reads from our completion result. tcsh completion code that reads from our internal completion result does not add '/', so let it ask our complletion code to keep the '/' at the end. * mk/tcsh-complete-only-known-paths: completion: handle path completion and colon for tcsh script
-
由 Junio C Hamano 提交于
The completion script used to let the default completer to suggest pathnames, which gave too many irrelevant choices (e.g. "git add" would not want to add an unmodified path). Teach it to use a more git-aware logic to enumerate only relevant ones. * mp/complete-paths: git-completion.bash: add support for path completion
-
由 Junio C Hamano 提交于
The autoconf subsystem passed --mandir down to generated config.mak.autogen but forgot to do the same for --htmldir. * ct/autoconf-htmldir: Honor configure's htmldir switch
-
由 Asheesh Laroia 提交于
If git-mergetool was invoked with files with a percent sign (%) in their names, it would print an error. For example, if you were calling mergetool on a file called "%2F": printf: %2F: invalid directive Do not pass random string to printf as if it were a valid format. Use format string "%s" and pass the string as data to be formatted instead. Signed-off-by: NAsheesh Laroia <asheesh@asheesh.org> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Ralf Thielow 提交于
According to the glossary, "reset" should be translated as "neu setzen" but in a couple of messages we've translated it as "zurücksetzen". This fixes that. Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Ralf Thielow 提交于
In the current German translation, the word "revision" was translated as both "Version" (translation of "commit") and "Revision". Since a revision in Git is not necessarily a commit, we should not translate it with the same word in order to give the user an idea that it's not necessarily the same. After this commit, "revision" is consistently translated as "Revision". Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com>
-
由 Ralf Thielow 提交于
Translate 11 new messages came from git.pot update in 46bc4039 (l10n: Update git.pot (11 new, 7 removed messages)). Signed-off-by: NRalf Thielow <ralf.thielow@gmail.com> Acked-by: NThomas Rast <trast@inf.ethz.ch>
-
由 Wang Sheng 提交于
Most of the 800+ new translations are contributed by Wang Sheng. So he is a zh_CN l10n maintainer for Git now. Also fixed translations for some terms, such as blob, dangling. Signed-off-by: NWang Sheng <wangsheng2008love@163.com> Signed-off-by: NJiang Xin <worldhello.net@gmail.com>
-
由 Matt Kraai 提交于
QNX 6.3.2 uses GCC 2.95.3 by default, and GCC 2.95.3 doesn't remove the comma if the error macro's variable argument is left out. Instead of testing for a sufficiently recent version of GCC, make __VA_ARGS__ match all of the arguments. Signed-off-by: NMatt Kraai <matt.kraai@amo.abbott.com> Acked-by: NJeff King <peff@peff.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 08 2月, 2013 5 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
"git cherry-pick" did not replay a root commit to an unborn branch. * mz/pick-unborn: learn to pick/revert into unborn branch tests: move test_cmp_rev to test-lib-functions
-
由 Junio C Hamano 提交于
* nd/fix-perf-parameters-in-tests: test-lib.sh: unfilter GIT_PERF_*
-