| b4f86a4 | Junio C Hamano | 02 May 2014, 20:15:52 UTC | Git 2.0-rc2 | 02 May 2014, 20:15:52 UTC |
| 648d9c1 | Junio C Hamano | 02 May 2014, 20:11:02 UTC | Merge branch 'mw/symlinks' A finishing touch fix to a new change already in 'master'. * mw/symlinks: setup: fix windows path buffer over-stepping | 02 May 2014, 20:11:03 UTC |
| 06229a6 | Junio C Hamano | 02 May 2014, 20:10:58 UTC | Merge branch 'km/git-svn-workaround-older-getopt-long' * km/git-svn-workaround-older-getopt-long: t9117: use --prefix "" instead of --prefix="" | 02 May 2014, 20:10:58 UTC |
| f7003da | Junio C Hamano | 02 May 2014, 20:10:53 UTC | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' * rh/prompt-pcmode-avoid-eval-on-refname: git-prompt.sh: don't put unsanitized branch names in $PS1 | 02 May 2014, 20:10:53 UTC |
| b809658 | Junio C Hamano | 02 May 2014, 20:10:47 UTC | Merge branch 'mk/doc-git-gui-display-untracked' * mk/doc-git-gui-display-untracked: Documentation: git-gui: describe gui.displayuntracked | 02 May 2014, 20:10:47 UTC |
| 7e76a2f | Junio C Hamano | 30 April 2014, 18:01:42 UTC | Merge git://github.com/git-l10n/git-po * git://github.com/git-l10n/git-po: l10n: de.po: improve hint for autocorrected command execution l10n: de.po: translate 45 new messages l10n: de.po: correct translation of "completed" after resolving deltas l10n: zh_CN.po: translate 46 new messages (2229t0f0u) l10n: fr translation for v2.0.0rc0 (2228t) l10n: Update Swedish translation (2228t0f0u) l10n: vi.po (2228t): Update and minor fix l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) | 30 April 2014, 18:01:42 UTC |
| b2feb64 | Junio C Hamano | 30 April 2014, 17:58:10 UTC | Revert the whole "ask curl-config" topic for now Postpone this a bit during the feature freeze and retry the effort in the next cycle. | 30 April 2014, 18:00:15 UTC |
| 94f94fc | Ralf Thielow | 25 April 2014, 20:16:43 UTC | l10n: de.po: improve hint for autocorrected command execution Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 29 April 2014, 04:12:31 UTC |
| 74c17bb | Ralf Thielow | 01 April 2014, 18:25:20 UTC | l10n: de.po: translate 45 new messages Translate 45 new messages came from git.pot update in 5e078fc (l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Acked-by: Thomas Rast <tr@thomasrast.ch> | 29 April 2014, 04:12:25 UTC |
| 3957310 | Ralf Thielow | 12 April 2014, 19:39:10 UTC | l10n: de.po: correct translation of "completed" after resolving deltas Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 29 April 2014, 04:11:09 UTC |
| d8779e1 | Junio C Hamano | 28 April 2014, 22:48:12 UTC | Merge branch 'db/make-with-curl' It turns out that some platforms do ship without curl-config even though they build with the hardcoded default -lcurl and rely on it to work. * db/make-with-curl: Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR | 28 April 2014, 22:48:12 UTC |
| 5f11a7a | Junio C Hamano | 28 April 2014, 22:47:35 UTC | Merge branch 'jk/external-diff-use-argv-array' (early part) Crash fix for codepath that miscounted the necessary size for an array when spawning an external diff program. * 'jk/external-diff-use-argv-array' (early part): run_external_diff: use an argv_array for the command line | 28 April 2014, 22:47:35 UTC |
| f3f11fa | Dave Borowitz | 28 April 2014, 21:01:23 UTC | Makefile: default to -lcurl when no CURL_CONFIG or CURLDIR The original implementation of CURL_CONFIG support did not match the original behavior of using -lcurl when CURLDIR was not set. This broke implementations that were lacking curl-config but did have libcurl installed along system libraries, such as MSysGit. In other words, the assumption that curl-config is always installed was incorrect. Instead, if CURL_CONFIG is empty or returns an empty result (e.g. due to curl-config being missing), use the old behavior of falling back to -lcurl. Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2014, 21:29:14 UTC |
| 35936f8 | Junio C Hamano | 25 April 2014, 17:03:41 UTC | Git 2.0-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 April 2014, 17:03:41 UTC |
| 6127ff6 | Martin Erik Werner | 24 April 2014, 13:06:09 UTC | setup: fix windows path buffer over-stepping Fix a buffer over-stepping issue triggered by providing an absolute path that is similar to the work tree path. abspath_part_inside_repo() may currently increment the path pointer by offset_1st_component() + wtlen, which is too much, since offset_1st_component() is a subset of wtlen. For the *nix-style prefix '/', this does (by luck) not cause any issues, since offset_1st_component() is 1 and there will always be a '/' or '\0' that can "absorb" this. In the case of DOS-style prefixes though, the offset_1st_component() is 3 and this can potentially over-step the string buffer. For example if work_tree = "c:/r" path = "c:/rl" Then wtlen is 4, and incrementing the path pointer by (3 + 4) would end up 2 bytes outside a string buffer of length 6. Similarly if work_tree = "c:/r" path = "c:/rl/d/a" Then (since the loop starts by also incrementing the pointer one step), this would mean that the function would miss checking if "c:/rl/d" could be the work_tree, arguably this is unlikely though, since it would only be possible with symlinks on windows. Fix this by simply avoiding to increment by offset_1st_component() and wtlen at the same time. Signed-off-by: Martin Erik Werner <martinerikwerner@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2014, 20:46:13 UTC |
| 1697bf3 | Junio C Hamano | 24 April 2014, 19:31:50 UTC | Merge branch 'jk/pack-bitmap' A last minute (and hopefully the last) fix to avoid coredumps due to an incorrect pointer arithmetic. * jk/pack-bitmap: ewah_bitmap.c: do not assume size_t and eword_t are the same size | 24 April 2014, 19:31:51 UTC |
| d508e4a | Junio C Hamano | 24 April 2014, 19:31:34 UTC | Merge branch 'fc/transport-helper-sync-error-fix' Make sure the marks are not written out when the transport helper did not finish happily, to avoid leaving a marks file that is out of sync with the reality. * fc/transport-helper-sync-error-fix: t5801 (remote-helpers): cleanup environment sets transport-helper: fix sync issue on crashes transport-helper: trivial cleanup transport-helper: propagate recvline() error pushing remote-helpers: make recvline return an error transport-helper: remove barely used xchgline() | 24 April 2014, 19:31:34 UTC |
| e425521 | Junio C Hamano | 24 April 2014, 19:31:27 UTC | Merge branch 'db/make-with-curl' Ask curl-config how to link with the curl library, instead of having only a limited configurability knobs in the Makefile. * db/make-with-curl: Makefile: allow static linking against libcurl Makefile: use curl-config to determine curl flags | 24 April 2014, 19:31:27 UTC |
| 7bbc458 | Kyle J. McKay | 22 April 2014, 11:16:22 UTC | t9117: use --prefix "" instead of --prefix="" Versions of Perl's Getopt::Long module before 2.37 do not contain this fix that first appeared in Getopt::Long version 2.37: * Bugfix: With gnu_compat, --foo= will no longer trigger "Option requires an argument" but return the empty string. Instead of using --prefix="" use --prefix "" when testing an explictly empty prefix string in order to work with older versions of Perl's Getopt::Long module. Also add a paragraph on this workaround to the documentation of git-svn itself. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2014, 16:42:28 UTC |
| 6c94aba | Jiang Xin | 13 March 2014, 04:41:34 UTC | l10n: zh_CN.po: translate 46 new messages (2229t0f0u) Translations for git v2.0.0-rc0. Also correct translatioins on relative date in date.c with help from Brian Gesiak ($gmane/246390). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 23 April 2014, 05:00:08 UTC |
| 937ca16 | Jiang Xin | 23 April 2014, 04:33:47 UTC | Merge branch 'fr-po' of git://github.com/jnavila/git * 'fr-po' of git://github.com/jnavila/git: l10n: fr translation for v2.0.0rc0 (2228t) | 23 April 2014, 04:33:47 UTC |
| 68f4e1f | Kyle J. McKay | 22 April 2014, 22:53:02 UTC | ewah_bitmap.c: do not assume size_t and eword_t are the same size When buffer_grow changes the size of the buffer using realloc, it first computes and saves the rlw pointer's offset into the buffer using (uint8_t *) math before the realloc but then restores it using (eword_t *) math. In order to do this it's necessary to convert the (uint8_t *) offset into an (eword_t *) offset. It was doing this by dividing by the sizeof(size_t). Unfortunately sizeof(size_t) is not same as sizeof(eword_t) on all platforms. This causes illegal memory accesses and other bad things to happen when attempting to use bitmaps on those platforms. Fix this by dividing by the sizeof(eword_t) instead which will always be correct for all platforms. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2014, 23:21:16 UTC |
| 2233806 | Jean-Noel Avila | 26 February 2014, 20:27:14 UTC | l10n: fr translation for v2.0.0rc0 (2228t) Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> Signed-off-by: Matthieu Baerts <matttbe@gmail.com> Signed-off-by: Xavier Mehrenberger <xavier.mehrenberger@gmail.com> | 22 April 2014, 19:41:16 UTC |
| 8976500 | Richard Hansen | 21 April 2014, 23:53:09 UTC | git-prompt.sh: don't put unsanitized branch names in $PS1 Both bash and zsh subject the value of PS1 to parameter expansion, command substitution, and arithmetic expansion. Rather than include the raw, unescaped branch name in PS1 when running in two- or three-argument mode, construct PS1 to reference a variable that holds the branch name. Because the shells do not recursively expand, this avoids arbitrary code execution by specially-crafted branch names such as '$(IFS=_;cmd=sudo_rm_-rf_/;$cmd)'. Signed-off-by: Richard Hansen <rhansen@bbn.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2014, 19:37:53 UTC |
| d372b5c | Peter Krefting | 22 April 2014, 09:26:02 UTC | l10n: Update Swedish translation (2228t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 22 April 2014, 09:26:02 UTC |
| 779792a | Junio C Hamano | 21 April 2014, 18:54:29 UTC | Update draft release notes to 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2014, 18:54:29 UTC |
| aeaa7e2 | Junio C Hamano | 21 April 2014, 17:53:09 UTC | Merge git://bogomips.org/git-svn * git://bogomips.org/git-svn: Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given | 21 April 2014, 17:53:09 UTC |
| 8fe3ee6 | Junio C Hamano | 21 April 2014, 17:42:52 UTC | Merge branch 'jx/i18n' * jx/i18n: i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines i18n: only extract comments marked with "TRANSLATORS:" i18n: remove obsolete comments for translators in diffstat generation i18n: fix uncatchable comments for translators in date.c | 21 April 2014, 17:42:52 UTC |
| 0b17b43 | Junio C Hamano | 21 April 2014, 17:42:45 UTC | Merge branch 'km/avoid-non-function-return-in-rebase' Work around /bin/sh that does not like "return" at the top-level of a file that is dot-sourced from inside a function definition. * km/avoid-non-function-return-in-rebase: Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" rebase: avoid non-function use of "return" on FreeBSD | 21 April 2014, 17:42:46 UTC |
| 0e6e1a5 | Junio C Hamano | 21 April 2014, 17:42:41 UTC | Merge branch 'ep/shell-command-substitution' * ep/shell-command-substitution: t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution git-tag.sh: use the $( ... ) construct for command substitution git-revert.sh: use the $( ... ) construct for command substitution git-resolve.sh: use the $( ... ) construct for command substitution git-repack.sh: use the $( ... ) construct for command substitution git-merge.sh: use the $( ... ) construct for command substitution git-ls-remote.sh: use the $( ... ) construct for command substitution git-fetch.sh: use the $( ... ) construct for command substitution git-commit.sh: use the $( ... ) construct for command substitution git-clone.sh: use the $( ... ) construct for command substitution git-checkout.sh: use the $( ... ) construct for command substitution install-webdoc.sh: use the $( ... ) construct for command substitution howto-index.sh: use the $( ... ) construct for command substitution | 21 April 2014, 17:42:42 UTC |
| 3667a5b | Felipe Contreras | 20 April 2014, 18:43:37 UTC | t5801 (remote-helpers): cleanup environment sets Commit 512477b (tests: use "env" to run commands with temporary env-var settings) missed some variables in the remote-helpers test. Also standardize these. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2014, 17:41:38 UTC |
| ec9fa62 | Max Kirillov | 19 April 2014, 21:47:14 UTC | Documentation: git-gui: describe gui.displayuntracked Signed-off-by: Max Kirillov <max@max630.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2014, 17:33:20 UTC |
| 82fbf26 | Jeff King | 19 April 2014, 19:17:06 UTC | run_external_diff: use an argv_array for the command line We currently generate the command-line for the external command using a fixed-length array of size 10. But if there is a rename, we actually need 11 elements (10 items, plus a NULL), and end up writing a random NULL onto the stack. Rather than bump the limit, let's just use an argv_array, which makes this sort of error impossible. Noticed-by: Max L <infthi.inbox@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2014, 17:29:50 UTC |
| 15fbbed | Tran Ngoc Quan | 20 April 2014, 08:22:26 UTC | l10n: vi.po (2228t): Update and minor fix Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 20 April 2014, 08:22:26 UTC |
| fe191fc | Johan Herland | 11 October 2013, 12:57:07 UTC | Git 2.0: git svn: Set default --prefix='origin/' if --prefix is not given git-svn by default puts its Subversion-tracking refs directly in refs/remotes/*. This runs counter to Git's convention of using refs/remotes/$remote/* for storing remote-tracking branches. Furthermore, combining git-svn with regular git remotes run the risk of clobbering refs under refs/remotes (e.g. if you have a git remote called "tags" with a "v1" branch, it will overlap with the git-svn's tracking branch for the "v1" tag from Subversion. Even though the git-svn refs stored in refs/remotes/* are not "proper" remote-tracking branches (since they are not covered by a proper git remote's refspec), they clearly represent a similar concept, and would benefit from following the same convention. For example, if git-svn tracks Subversion branch "foo" at refs/remotes/foo, and you create a local branch refs/heads/foo to add some commits to be pushed back to Subversion (using "git svn dcommit), then it is clearly unhelpful of Git to throw warning: refname 'foo' is ambiguous. every time you checkout, rebase, or otherwise interact with the branch. The existing workaround for this is to supply the --prefix=quux/ to git svn init/clone, so that git-svn's tracking branches end up in refs/remotes/quux/* instead of refs/remotes/*. However, encouraging users to specify --prefix to work around a design flaw in git-svn is suboptimal, and not a long term solution to the problem. Instead, git-svn should default to use a non-empty prefix that saves unsuspecting users from the inconveniences described above. This patch will only affect newly created git-svn setups, as the --prefix option only applies to git svn init (and git svn clone). Existing git-svn setups will continue with their existing (lack of) prefix. Also, if anyone somehow prefers git-svn's old layout, they can recreate that by explicitly passing an empty prefix (--prefix "") on the git svn init/clone command line. The patch changes the default value for --prefix from "" to "origin/", updates the git-svn manual page, and fixes the fallout in the git-svn testcases. (Note that this patch might be easier to review using the --word-diff and --word-diff-regex=. diff options.) [ew: squashed description of <= 1.9 behavior into manpage] Suggested-by: Thomas Ferris Nicolaisen <tfnico@gmail.com> Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 19 April 2014, 11:30:13 UTC |
| 5e078fc | Jiang Xin | 19 April 2014, 04:53:28 UTC | l10n: git.pot: v2.0.0 round 1 (45 new, 28 removed) Generate po/git.pot from v2.0.0-rc0 for git v2.0.0 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 19 April 2014, 04:55:29 UTC |
| cc29195 | Junio C Hamano | 18 April 2014, 18:21:43 UTC | Git 2.0-rc0 An early-preview for the upcoming Git 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2014, 18:21:43 UTC |
| 531675a | Junio C Hamano | 18 April 2014, 18:17:44 UTC | Merge branch 'jk/config-die-bad-number-noreturn' Squelch a false compiler warning from older gcc. * jk/config-die-bad-number-noreturn: config.c: mark die_bad_number as NORETURN | 18 April 2014, 18:17:45 UTC |
| 8f87d54 | Junio C Hamano | 18 April 2014, 18:17:40 UTC | Merge branch 'fc/remote-helper-fixes' * fc/remote-helper-fixes: remote-bzr: trivial test fix remote-bzr: include authors field in pushed commits remote-bzr: add support for older versions remote-hg: always normalize paths remote-helpers: allow all tests running from any dir | 18 April 2014, 18:17:40 UTC |
| 961c1b1 | Junio C Hamano | 18 April 2014, 18:17:36 UTC | Merge branch 'fc/complete-aliased-push' * fc/complete-aliased-push: completion: fix completing args of aliased "push", "fetch", etc. | 18 April 2014, 18:17:36 UTC |
| 427ed40 | Junio C Hamano | 18 April 2014, 18:17:22 UTC | Merge branch 'fc/prompt-zsh-read-from-file' * fc/prompt-zsh-read-from-file: prompt: fix missing file errors in zsh | 18 April 2014, 18:17:23 UTC |
| cbcfd4e | Junio C Hamano | 18 April 2014, 17:48:08 UTC | i18n: mention "TRANSLATORS:" marker in Documentation/CodingGuidelines These comments have to have "TRANSLATORS: " at the very beginning and have to deviate from the usual multi-line comment formatting convention. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2014, 17:48:49 UTC |
| bd368a9 | Elia Pinto | 16 April 2014, 17:29:58 UTC | t9362-mw-to-git-utf8.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:01 UTC |
| c9b9270 | Elia Pinto | 16 April 2014, 17:29:57 UTC | t9360-mw-to-git-clone.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:01 UTC |
| b352891 | Elia Pinto | 16 April 2014, 17:29:56 UTC | git-tag.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:00 UTC |
| fb6644a | Elia Pinto | 16 April 2014, 17:29:55 UTC | git-revert.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:00 UTC |
| 6aeb30e | Elia Pinto | 16 April 2014, 17:29:54 UTC | git-resolve.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:00 UTC |
| ddbac79 | Elia Pinto | 16 April 2014, 17:29:53 UTC | git-repack.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:15:00 UTC |
| 34da37c | Elia Pinto | 16 April 2014, 17:29:52 UTC | git-merge.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:59 UTC |
| 1b3cddd | Elia Pinto | 16 April 2014, 17:29:51 UTC | git-ls-remote.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:59 UTC |
| 3e86741 | Elia Pinto | 16 April 2014, 17:29:50 UTC | git-fetch.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:59 UTC |
| 346b54d | Elia Pinto | 16 April 2014, 17:29:49 UTC | git-commit.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:59 UTC |
| add77e8 | Elia Pinto | 16 April 2014, 17:29:48 UTC | git-clone.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:58 UTC |
| 844cb24 | Elia Pinto | 16 April 2014, 17:29:47 UTC | git-checkout.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:58 UTC |
| 2c4a050 | Elia Pinto | 16 April 2014, 17:29:46 UTC | install-webdoc.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:58 UTC |
| f25f5e6 | Elia Pinto | 16 April 2014, 17:29:45 UTC | howto-index.sh: use the $( ... ) construct for command substitution The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. The backquoted form is the traditional method for command substitution, and is supported by POSIX. However, all but the simplest uses become complicated quickly. In particular, embedded command substitutions and/or the use of double quotes require careful escaping with the backslash character. The patch was generated by: for _f in $(find . -name "*.sh") do sed -i 's@`\(.*\)`@$(\1)@g' ${_f} done and then carefully proof-read. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:14:57 UTC |
| 47fbfde | Jiang Xin | 17 April 2014, 05:37:18 UTC | i18n: only extract comments marked with "TRANSLATORS:" When extract l10n messages, we use "--add-comments" option to keep comments right above the l10n messages for references. But sometimes irrelevant comments are also extracted. For example in the following code block, the comment in line 2 will be extracted as comment for the l10n message in line 3, but obviously it's wrong. { OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit, NULL /* takes no arguments */, N_("ignore paths removed in the working tree (same as --no-all)"), PARSE_OPT_NOARG, ignore_removal_cb }, Since almost all comments for l10n translators are marked with the same prefix (tag): "TRANSLATORS:", it's safe to only extract comments with this special tag. I.E. it's better to call xgettext as: xgettext --add-comments=TRANSLATORS: ... Also tweaks the multi-line comment in "init-db.c", to make it start with the proper tag, not "* TRANSLATORS:" (which has a star before the tag). Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:09:56 UTC |
| d1d96a8 | Jiang Xin | 17 April 2014, 05:37:19 UTC | i18n: remove obsolete comments for translators in diffstat generation Since we do not translate diffstat any more, remove the obsolete comments. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:09:56 UTC |
| fcaed04 | Jiang Xin | 17 April 2014, 05:37:17 UTC | i18n: fix uncatchable comments for translators in date.c Comment for l10n translators can not be extracted by xgettext if it is not right above the l10n tag. Moving the comment right before the l10n tag will fix this issue. Reported-by: Brian Gesiak <modocache@gmail.com> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 18:03:28 UTC |
| 8cd6596 | Kyle J. McKay | 11 April 2014, 08:28:18 UTC | Revert "rebase: fix run_specific_rebase's use of "return" on FreeBSD" This reverts commit 99855ddf4bd319cd06a0524e755ab1c1b7d39f3b. The workaround 99855ddf introduced to deal with problematic "return" statements in scripts run by "dot" commands located inside functions only handles one part of the problem. The issue has now been addressed by not using "return" statements in this way in the git-rebase--*.sh scripts. This workaround is therefore no longer necessary, so clean up the code by reverting it. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 17:15:27 UTC |
| 9f50d32 | Kyle J. McKay | 11 April 2014, 08:28:17 UTC | rebase: avoid non-function use of "return" on FreeBSD Since a1549e10, 15d4bf2e and 01a1e646 (first appearing in v1.8.4) the git-rebase--*.sh scripts have used a "return" to stop execution of the dot-sourced file and return to the "dot" command that dot-sourced it. The /bin/sh utility on FreeBSD however behaves poorly under some circumstances when such a "return" is executed. In particular, if the "dot" command is contained within a function, then when a "return" is executed by the script it runs (that is not itself inside a function), control will return from the function that contains the "dot" command skipping any statements that might follow the dot command inside that function. Commit 99855ddf (first appearing in v1.8.4.1) addresses this by making the "dot" command the last line in the function. Unfortunately the FreeBSD /bin/sh may also execute some statements in the script run by the "dot" command that appear after the troublesome "return". The fix in 99855ddf does not address this problem. For example, if you have script1.sh with these contents: run_script2() { . "$(dirname -- "$0")/script2.sh" _e=$? echo only this line should show [ $_e -eq 5 ] || echo expected status 5 got $_e return 3 } run_script2 e=$? [ $e -eq 3 ] || { echo expected status 3 got $e; exit 1; } And script2.sh with these contents: if [ 5 -gt 3 ]; then return 5 fi case bad in *) echo always shows esac echo should not get here ! : When running script1.sh (e.g. '/bin/sh script1.sh' or './script1.sh' after making it executable), the expected output from a POSIX shell is simply the single line: only this line should show However, when run using FreeBSD's /bin/sh, the following output appears instead: should not get here expected status 3 got 1 Not only did the lines following the "dot" command in the run_script2 function in script1.sh get skipped, but additional lines in script2.sh following the "return" got executed -- but not all of them (e.g. the "echo always shows" line did not run). These issues can be avoided by not using a top-level "return" in script2.sh. If script2.sh is changed to this: main() { if [ 5 -gt 3 ]; then return 5 fi case bad in *) echo always shows esac echo should not get here ! : } main Then it behaves the same when using FreeBSD's /bin/sh as when using other more POSIX compliant /bin/sh implementations. We fix the git-rebase--*.sh scripts in a similar fashion by moving the top-level code that contains "return" statements into its own function and then calling that as the last line in the script. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2014, 17:13:29 UTC |
| 3f0c02a | Junio C Hamano | 16 April 2014, 20:43:26 UTC | Update draft release notes for 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2014, 20:43:26 UTC |
| 940bf24 | Junio C Hamano | 16 April 2014, 20:39:00 UTC | Merge branch 'mh/multimail' * mh/multimail: git-multimail: update to version 1.0.0 | 16 April 2014, 20:39:00 UTC |
| 9fd911a | Junio C Hamano | 16 April 2014, 20:38:57 UTC | Merge branch 'tb/unicode-6.3-zero-width' Teach our display-column-counting logic about decomposed umlauts and friends. * tb/unicode-6.3-zero-width: utf8.c: partially update to version 6.3 | 16 April 2014, 20:38:57 UTC |
| 51bb8ad | Junio C Hamano | 16 April 2014, 20:38:55 UTC | Merge branch 'km/avoid-cp-a' Portability fix. * km/avoid-cp-a: test: fix t7001 cp to use POSIX options | 16 April 2014, 20:38:55 UTC |
| 5b713d9 | Junio C Hamano | 16 April 2014, 20:38:52 UTC | Merge branch 'km/avoid-bs-in-shell-glob' Portability fix. * km/avoid-bs-in-shell-glob: test: fix t5560 on FreeBSD | 16 April 2014, 20:38:52 UTC |
| 06bdc23 | Jeff King | 16 April 2014, 16:51:47 UTC | config.c: mark die_bad_number as NORETURN This can help avoid -Wuninitialized false positives in git_config_int and git_config_ulong, as the compiler now knows that we do not return "ret" if we hit the error codepath. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2014, 17:21:14 UTC |
| d506711 | Dave Borowitz | 15 April 2014, 10:40:31 UTC | Makefile: allow static linking against libcurl This requires more flags than can be guessed with the old-style CURLDIR and related options, so is only supported when curl-config is present. Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2014, 20:01:51 UTC |
| 61a64ff | Dave Borowitz | 15 April 2014, 10:40:30 UTC | Makefile: use curl-config to determine curl flags curl-config should always be installed alongside a curl distribution, and its purpose is to provide flags for building against libcurl, so use it instead of guessing flags and dependent libraries. Allow overriding CURL_CONFIG to a custom path to curl-config, to compile against a curl installation other than the first in PATH. Depending on the set of features curl is compiled with, there may be more libraries required than the previous two options of -lssl and -lidn. For example, with a vanilla build of libcurl-7.36.0 on Mac OS X 10.9: $ ~/d/curl-out-7.36.0/lib/curl-config --libs -L/Users/dborowitz/d/curl-out-7.36.0/lib -lcurl -lgssapi_krb5 -lresolv -lldap -lz Use this only when CURLDIR is not explicitly specified, to continue supporting older builds. Signed-off-by: Dave Borowitz <dborowitz@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2014, 20:01:49 UTC |
| 3994e64 | Felipe Contreras | 12 April 2014, 20:33:32 UTC | transport-helper: fix sync issue on crashes When a remote helper crashes while pushing we should revert back to the state before the push, however, it's possible that `git fast-export` already finished its job, and therefore has exported the marks already. This creates a synchronization problem because from that moment on `git fast-{import,export}` will have marks that the remote helper is not aware of and all further commands fail (if those marks are referenced). The fix is to tell `git fast-export` to export to a temporary file, and only after the remote helper has finishes successfully, move to the final destination. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 21:03:33 UTC |
| 852e54b | Felipe Contreras | 12 April 2014, 20:33:31 UTC | transport-helper: trivial cleanup It's simpler to store the file names directly, and form the fast-export arguments only when needed, and re-use the same strbuf with a format. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 21:03:33 UTC |
| 0551a06 | Felipe Contreras | 12 April 2014, 20:33:30 UTC | transport-helper: propagate recvline() error pushing It's cleaner, and will allow us to do something sensible on errors later. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 20:51:37 UTC |
| 5931b33 | Felipe Contreras | 12 April 2014, 20:33:29 UTC | remote-helpers: make recvline return an error Instead of exiting directly, make it the duty of the caller to do so. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 20:48:33 UTC |
| 4a1b59c | Felipe Contreras | 12 April 2014, 20:33:28 UTC | transport-helper: remove barely used xchgline() It's only used once, we can just call the two functions inside directly. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 20:48:17 UTC |
| 59d3924 | Felipe Contreras | 11 April 2014, 23:32:25 UTC | prompt: fix missing file errors in zsh zsh seems to have a bug while redirecting the stderr of the 'read' command: % read foo 2>/dev/null <foo zsh: no such file or directory: foo Which causes errors to be displayed when certain files are missing. Let's add a convenience function to manually check if the file is readable before calling "read". Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 20:27:23 UTC |
| 7569acc | Felipe Contreras | 11 April 2014, 23:24:05 UTC | remote-bzr: trivial test fix So that the committer is reset properly. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2014, 20:25:28 UTC |
| ff7a1c6 | Kyle J. McKay | 11 April 2014, 08:28:19 UTC | test: fix t5560 on FreeBSD Since fd0a8c2e (first appearing in v1.7.0), the t/t5560-http-backend-noserver.sh test has used a backslash escape inside a ${} expansion in order to specify a literal '?' character. Unfortunately the FreeBSD /bin/sh does not interpret this correctly. In a POSIX compliant shell, the following: x='one?two?three' echo "${x#*\?}" Would be expected to produce this: two?three When using the FreeBSD /bin/sh instead you get this: one?two?three In fact the FreeBSD /bin/sh treats the backslash as a literal character to match so that this: y='one\two\three' echo "${y#*\?}" Produces this unexpected value: wo\three In this case the backslash is not only treated literally, it also fails to defeat the special meaning of the '?' character. Instead, we can use the [...] construct to defeat the special meaning of the '?' character and match it exactly in a way that works for the FreeBSD /bin/sh as well as other POSIX /bin/sh implementations. Changing the example like so: x='one?two?three' echo "${x#*[?]}" Produces the expected output using the FreeBSD /bin/sh. Therefore, change the use of \? to [?] in order to be compatible with the FreeBSD /bin/sh which allows t/t5560-http-backend-noserver.sh to pass on FreeBSD again. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2014, 20:21:56 UTC |
| 00764ca | Kyle J. McKay | 11 April 2014, 08:24:02 UTC | test: fix t7001 cp to use POSIX options Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the t7001-mv test has used "cp -a" to perform a copy in several of the tests. However, the "-a" option is not required for a POSIX cp utility and some platforms' cp utilities do not support it. The POSIX equivalent of -a is -R -P -p. Change "cp -a" to "cp -R -P -p" so that the t7001-mv test works on systems with a cp utility that only implements the POSIX required set of options and not the "-a" option. Signed-off-by: Kyle J. McKay <mackyle@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2014, 20:19:00 UTC |
| 880111c | Felipe Contreras | 09 April 2014, 18:50:04 UTC | completion: fix completing args of aliased "push", "fetch", etc. Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, for example 'alias.p=push', if we try to complete 'git p origin ', the result would be wrong because __git_complete_remote_or_refspec() doesn't know where it came from. So let's override words[1], so the alias 'p' is override by the actual command, 'push'. Reported-by: Aymeric Beaumet <aymeric.beaumet@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 21:22:18 UTC |
| 6221088 | dequis | 09 April 2014, 18:50:03 UTC | remote-bzr: include authors field in pushed commits Tests-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 21:20:48 UTC |
| 5ff5699 | Felipe Contreras | 09 April 2014, 18:50:02 UTC | remote-bzr: add support for older versions Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 21:20:48 UTC |
| 867bf7b | Felipe Contreras | 09 April 2014, 18:50:01 UTC | remote-hg: always normalize paths Apparently Mercurial can have paths such as 'foo//bar', so normalize all paths. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 21:20:48 UTC |
| fe45cfb | Felipe Contreras | 09 April 2014, 18:50:00 UTC | remote-helpers: allow all tests running from any dir Commit d3243d7 (test-bzr.sh, test-hg.sh: allow running from any dir) allowed the tests to run from any directory, however, it didn't update all the tests. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 21:20:47 UTC |
| 68773ac | Junio C Hamano | 09 April 2014, 19:06:14 UTC | Sync with 1.9.2 * maint: Git 1.9.2 doc/http-backend: missing accent grave in literal mark-up | 09 April 2014, 19:06:14 UTC |
| 0bc85ab | Junio C Hamano | 09 April 2014, 19:04:34 UTC | Git 1.9.2 The second maintenance release for Git 1.9; contains all the fixes that are scheduled to appear in Git 2.0. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 19:04:34 UTC |
| 3c9e56b | Junio C Hamano | 09 April 2014, 19:03:26 UTC | Merge branch 'jl/nor-or-nand-and' into maint * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor" | 09 April 2014, 19:03:26 UTC |
| fbae3d9 | Junio C Hamano | 09 April 2014, 19:02:41 UTC | Merge branch 'cn/fetch-prune-overlapping-destination' into maint * cn/fetch-prune-overlapping-destination: fetch: handle overlaping refspecs on --prune fetch: add a failing test for prunning with overlapping refspecs | 09 April 2014, 19:02:41 UTC |
| aba7af8 | Junio C Hamano | 09 April 2014, 19:01:28 UTC | Merge branch 'mh/update-ref-batch-create-fix' into maint * mh/update-ref-batch-create-fix: update-ref: fail create operation over stdin if ref already exists | 09 April 2014, 19:01:28 UTC |
| b8a3019 | Junio C Hamano | 09 April 2014, 18:59:38 UTC | Merge branch 'jk/commit-dates-parsing-fix' into maint * jk/commit-dates-parsing-fix: t4212: loosen far-in-future test for AIX date: recognize bogus FreeBSD gmtime output | 09 April 2014, 18:59:38 UTC |
| 693b407 | Junio C Hamano | 09 April 2014, 18:59:16 UTC | Merge branch 'jc/fix-diff-no-index-diff-opt-parse' into maint * jc/fix-diff-no-index-diff-opt-parse: diff-no-index: correctly diagnose error return from diff_opt_parse() | 09 April 2014, 18:59:16 UTC |
| efb4ec6 | Junio C Hamano | 09 April 2014, 18:45:04 UTC | Merge commit 'doc/http-backend: missing accent grave in literal mark-up' * commit '5df05146d5cb94628a3dfc53063c802ee1152cec': doc/http-backend: missing accent grave in literal mark-up | 09 April 2014, 18:45:04 UTC |
| 5df0514 | Thomas Ackermann | 09 April 2014, 18:17:38 UTC | doc/http-backend: missing accent grave in literal mark-up Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 18:43:56 UTC |
| d813ab9 | Torsten Bögershausen | 07 April 2014, 19:39:41 UTC | utf8.c: partially update to version 6.3 Unicode 6.3 defines more code points as combining or accents. For example, the character "ö" could be expressed as an "o" followed by U+0308 COMBINING DIARESIS (aka umlaut, double-dot-above). We should consider that such a sequence of two codepoints occupies one display column for the alignment purposes, and for that, git_wcwidth() should return 0 for them. Affected codepoints are: U+0358..U+035C U+0487 U+05A2, U+05BA, U+05C5, U+05C7 U+0604, U+0616..U+061A, U+0659..U+065F Earlier unicode standards had defined these as "reserved". Only the range 0..U+07FF has been checked to see which codepoints need to be marked as 0-width while preparing for this commit; more updates may be needed. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2014, 17:14:05 UTC |
| 7bf272c | Junio C Hamano | 08 April 2014, 19:11:17 UTC | Update draft release notes to 2.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2014, 19:11:17 UTC |
| 2d1a5a5 | Junio C Hamano | 08 April 2014, 19:08:59 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.9.2 | 08 April 2014, 19:08:59 UTC |
| 4d7ad08 | Junio C Hamano | 08 April 2014, 19:08:34 UTC | Update draft release notes to 1.9.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 April 2014, 19:08:34 UTC |
| 360f852 | Junio C Hamano | 08 April 2014, 19:07:06 UTC | Merge branch 'mm/status-porcelain-format-i18n-fix' into maint * mm/status-porcelain-format-i18n-fix: status: disable translation when --porcelain is used | 08 April 2014, 19:07:06 UTC |
| 86b4c16 | Junio C Hamano | 08 April 2014, 19:07:06 UTC | Merge branch 'bp/commit-p-editor' into maint * bp/commit-p-editor: run-command: mark run_hook_with_custom_index as deprecated merge hook tests: fix and update tests merge: fix GIT_EDITOR override for commit hook commit: fix patch hunk editing with "commit -p -m" test patch hunk editing with "commit -p -m" merge hook tests: use 'test_must_fail' instead of '!' merge hook tests: fix missing '&&' in test | 08 April 2014, 19:07:06 UTC |
| 967f8c9 | Junio C Hamano | 08 April 2014, 19:00:32 UTC | Merge branch 'jk/pack-bitmap' * jk/pack-bitmap: pack-objects: do not reuse packfiles without --delta-base-offset add `ignore_missing_links` mode to revwalk | 08 April 2014, 19:00:33 UTC |
| d59c12d | Junio C Hamano | 08 April 2014, 19:00:27 UTC | Merge branch 'jl/nor-or-nand-and' Eradicate mistaken use of "nor" (that is, essentially "nor" used not in "neither A nor B" ;-)) from in-code comments, command output strings, and documentations. * jl/nor-or-nand-and: code and test: fix misuses of "nor" comments: fix misuses of "nor" contrib: fix misuses of "nor" Documentation: fix misuses of "nor" | 08 April 2014, 19:00:28 UTC |
