| aaa7e0d | Junio C Hamano | 13 May 2015, 21:11:43 UTC | Git 2.4.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 May 2015, 21:11:43 UTC |
| a379f25 | Junio C Hamano | 13 May 2015, 21:05:56 UTC | Merge branch 'sb/line-log-plug-pairdiff-leak' into maint * sb/line-log-plug-pairdiff-leak: line-log.c: fix a memleak | 13 May 2015, 21:05:56 UTC |
| 071e93a | Junio C Hamano | 13 May 2015, 21:05:55 UTC | Merge branch 'sb/test-bitmap-free-at-end' into maint * sb/test-bitmap-free-at-end: pack-bitmap.c: fix a memleak | 13 May 2015, 21:05:56 UTC |
| 36ec67d | Junio C Hamano | 13 May 2015, 21:05:55 UTC | Merge branch 'nd/t1509-chroot-test' into maint Correct test bitrot. * nd/t1509-chroot-test: t1509: update prepare script to be able to run t1509 in chroot again | 13 May 2015, 21:05:55 UTC |
| c1c4a87 | Junio C Hamano | 13 May 2015, 21:05:54 UTC | Merge branch 'jk/type-from-string-gently' into maint "git cat-file bl $blob" failed to barf even though there is no object type that is "bl". * jk/type-from-string-gently: type_from_string_gently: make sure length matches | 13 May 2015, 21:05:54 UTC |
| 21b56b9 | Junio C Hamano | 13 May 2015, 21:05:52 UTC | Merge branch 'ep/fix-test-lib-functions-report' into maint * ep/fix-test-lib-functions-report: test-lib-functions.sh: fix the second argument to some helper functions | 13 May 2015, 21:05:53 UTC |
| 8a1d897 | Junio C Hamano | 13 May 2015, 21:05:51 UTC | Merge branch 'cn/bom-in-gitignore' into maint Teach the codepaths that read .gitignore and .gitattributes files that these files encoded in UTF-8 may have UTF-8 BOM marker at the beginning; this makes it in line with what we do for configuration files already. * cn/bom-in-gitignore: attr: skip UTF8 BOM at the beginning of the input file config: use utf8_bom[] from utf.[ch] in git_parse_source() utf8-bom: introduce skip_utf8_bom() helper add_excludes_from_file: clarify the bom skipping logic dir: allow a BOM at the beginning of exclude files | 13 May 2015, 21:05:51 UTC |
| ebb464f | Junio C Hamano | 13 May 2015, 21:05:50 UTC | Merge branch 'jk/prune-mtime' into maint Access to objects in repositories that borrow from another one on a slow NFS server unnecessarily got more expensive due to recent code becoming more cautious in a naive way not to lose objects to pruning. * jk/prune-mtime: sha1_file: only freshen packs once per run sha1_file: freshen pack objects before loose reachable: only mark local objects as recent | 13 May 2015, 21:05:50 UTC |
| a60abe1 | Junio C Hamano | 13 May 2015, 21:05:49 UTC | Merge branch 'jk/init-core-worktree-at-root' into maint We avoid setting core.worktree when the repository location is the ".git" directory directly at the top level of the working tree, but the code misdetected the case in which the working tree is at the root level of the filesystem (which arguably is a silly thing to do, but still valid). * jk/init-core-worktree-at-root: init: don't set core.worktree when initializing /.git | 13 May 2015, 21:05:49 UTC |
| c99fec6 | Junio C Hamano | 11 May 2015, 21:39:28 UTC | Sync with 2.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2015, 21:39:28 UTC |
| 9a3d637 | Junio C Hamano | 11 May 2015, 21:36:31 UTC | Git 2.3.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 May 2015, 21:36:31 UTC |
| 811ce1b | Junio C Hamano | 11 May 2015, 21:34:01 UTC | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3 Documentation fix. * mm/usage-log-l-can-take-regex: log -L: improve error message on malformed argument Documentation: change -L:<regex> to -L:<funcname> | 11 May 2015, 21:34:01 UTC |
| cd01208 | Junio C Hamano | 11 May 2015, 21:34:00 UTC | Merge branch 'jc/diff-no-index-d-f' into maint-2.3 The usual "git diff" when seeing a file turning into a directory showed a patchset to remove the file and create all files in the directory, but "git diff --no-index" simply refused to work. Also, when asked to compare a file and a directory, imitate POSIX "diff" and compare the file with the file with the same name in the directory, instead of refusing to run. * jc/diff-no-index-d-f: diff-no-index: align D/F handling with that of normal Git diff-no-index: DWIM "diff D F" into "diff D/F F" | 11 May 2015, 21:34:00 UTC |
| 1add9ae | Junio C Hamano | 11 May 2015, 21:33:59 UTC | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3 The default $HOME/.gitconfig file created upon "git config --global" that edits it had incorrectly spelled user.name and user.email entries in it. * oh/fix-config-default-user-name-section: config: fix settings in default_user_config template | 11 May 2015, 21:33:59 UTC |
| 13ec221 | Junio C Hamano | 11 May 2015, 21:33:58 UTC | Merge branch 'jc/epochtime-wo-tz' into maint-2.3 "git commit --date=now" or anything that relies on approxidate lost the daylight-saving-time offset. * jc/epochtime-wo-tz: parse_date_basic(): let the system handle DST conversion parse_date_basic(): return early when given a bogus timestamp | 11 May 2015, 21:33:58 UTC |
| 3d4a3ff | Junio C Hamano | 30 April 2015, 18:25:06 UTC | Git 2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 April 2015, 18:25:06 UTC |
| 0ab00b9 | Junio C Hamano | 28 April 2015, 20:01:29 UTC | Merge branch 'mh/multimail-renewal' * mh/multimail-renewal: Update git-multimail to version 1.0.2 | 28 April 2015, 20:01:29 UTC |
| 3f58726 | Junio C Hamano | 28 April 2015, 20:00:20 UTC | Merge branch 'mg/show-notes-doc' Documentation fix. * mg/show-notes-doc: rev-list-options.txt: complete sentence about notes matching | 28 April 2015, 20:00:20 UTC |
| b799052 | Junio C Hamano | 28 April 2015, 20:00:19 UTC | Merge branch 'nd/versioncmp-prereleases' * nd/versioncmp-prereleases: git tag: mention versionsort.prereleaseSuffix in manpage | 28 April 2015, 20:00:19 UTC |
| 5b94967 | Junio C Hamano | 28 April 2015, 20:00:18 UTC | Merge branch 'mg/status-v-v' * mg/status-v-v: status: document the -v/--verbose option | 28 April 2015, 20:00:18 UTC |
| 36bf6d4 | Michael Haggerty | 27 April 2015, 11:17:25 UTC | Update git-multimail to version 1.0.2 The only changes are to the README files, most notably the list of maintainers and the project URL. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 April 2015, 18:37:09 UTC |
| fb3e7d5 | Junio C Hamano | 27 April 2015, 19:26:21 UTC | Sync with 2.3.7 | 27 April 2015, 19:26:21 UTC |
| 16018ae | Junio C Hamano | 27 April 2015, 19:25:36 UTC | Git 2.3.7 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 April 2015, 19:25:36 UTC |
| ad34ad6 | Junio C Hamano | 27 April 2015, 19:23:53 UTC | Merge branch 'tb/connect-ipv6-parse-fix' into maint An earlier update to the parser that disects a URL broke an address, followed by a colon, followed by an empty string (instead of the port number), e.g. ssh://example.com:/path/to/repo. * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname | 27 April 2015, 19:23:54 UTC |
| 89ba311 | Junio C Hamano | 27 April 2015, 19:23:51 UTC | Merge branch 'ma/bash-completion-leaking-x' into maint The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend | 27 April 2015, 19:23:51 UTC |
| 631f6f1 | Junio C Hamano | 27 April 2015, 19:23:47 UTC | Merge branch 'jc/push-cert' into maint The "git push --signed" protocol extension did not limit what the "nonce" that is a server-chosen string can contain or how long it can be, which was unnecessarily lax. Limit both the length and the alphabet to a reasonably small space that can still have enough entropy. * jc/push-cert: push --signed: tighten what the receiving end can ask to sign | 27 April 2015, 19:23:50 UTC |
| 9c589d9 | Michael Haggerty | 23 April 2015, 12:27:46 UTC | status: document the -v/--verbose option Document `git status -v`, including its new doubled `-vv` form. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2015, 01:45:33 UTC |
| 6eb1401 | Michael Haggerty | 23 April 2015, 12:27:50 UTC | RelNotes: wordsmithing Make many textual tweaks to the 2.4.0 release notes. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2015, 18:32:08 UTC |
| 2eac035 | Michael Haggerty | 23 April 2015, 12:27:49 UTC | RelNotes: refer to the rebase -i "todo list", not "insn sheet" "Todo list" is the name that is used in the user-facing documentation. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2015, 18:32:05 UTC |
| 37f4bed | Michael Haggerty | 23 April 2015, 12:27:48 UTC | RelNotes: correct name of versionsort.prereleaseSuffix Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2015, 18:29:22 UTC |
| 64f7a26 | Michael Haggerty | 23 April 2015, 12:27:47 UTC | git tag: mention versionsort.prereleaseSuffix in manpage Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2015, 18:28:24 UTC |
| 564705c | Junio C Hamano | 22 April 2015, 20:52:43 UTC | Git 2.4.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2015, 20:52:43 UTC |
| fb89636 | Junio C Hamano | 21 April 2015, 19:58:50 UTC | Sync with maint | 21 April 2015, 19:58:50 UTC |
| ba63bfa | Junio C Hamano | 21 April 2015, 19:17:09 UTC | Git 2.3.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2015, 19:17:09 UTC |
| d544696 | Junio C Hamano | 21 April 2015, 19:12:25 UTC | Merge branch 'jk/colors' into maint "diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters | 21 April 2015, 19:12:25 UTC |
| d3115a3 | Junio C Hamano | 21 April 2015, 19:12:24 UTC | Merge branch 'jk/test-annoyances' into maint Test fixes. * jk/test-annoyances: t5551: make EXPENSIVE test cheaper t5541: move run_with_cmdline_limit to test-lib.sh t: pass GIT_TRACE through Apache t: redirect stderr GIT_TRACE to descriptor 4 t: translate SIGINT to an exit | 21 April 2015, 19:12:24 UTC |
| 42b2f89 | Junio C Hamano | 21 April 2015, 19:12:23 UTC | Merge branch 'pt/enter-repo-comment-fix' into maint Documentation update. * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code | 21 April 2015, 19:12:23 UTC |
| 1c30f8e | Junio C Hamano | 21 April 2015, 19:12:22 UTC | Merge branch 'jz/gitweb-conf-doc-fix' into maint Documentation update. * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time" | 21 April 2015, 19:12:22 UTC |
| c809f42 | Junio C Hamano | 21 April 2015, 19:12:21 UTC | Merge branch 'jk/cherry-pick-docfix' into maint * jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits | 21 April 2015, 19:12:21 UTC |
| c84364a | Junio C Hamano | 21 April 2015, 19:12:20 UTC | Merge branch 'iu/fix-parse-options-h-comment' into maint * iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval | 21 April 2015, 19:12:20 UTC |
| e8281f0 | Junio C Hamano | 21 April 2015, 19:12:19 UTC | Merge branch 'jg/cguide-we-cannot-count' into maint * jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count | 21 April 2015, 19:12:19 UTC |
| 2e0aabe | Junio C Hamano | 21 April 2015, 19:12:18 UTC | Merge branch 'jk/pack-corruption-post-mortem' into maint Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption | 21 April 2015, 19:12:18 UTC |
| e9ab76d | Junio C Hamano | 21 April 2015, 19:12:17 UTC | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' into maint Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit | 21 April 2015, 19:12:17 UTC |
| ef05a39 | Junio C Hamano | 21 April 2015, 18:09:19 UTC | RelNotes: "merge --quiet" change has been reverted Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 April 2015, 18:09:19 UTC |
| 7c597ef | Junio C Hamano | 20 April 2015, 22:30:13 UTC | Hopefully the last batch for 2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 22:30:13 UTC |
| 7ff1402 | Junio C Hamano | 20 April 2015, 22:28:34 UTC | Merge branch 'ps/grep-help-all-callback-arg' Code clean-up. * ps/grep-help-all-callback-arg: grep: correctly initialize help-all option | 20 April 2015, 22:28:34 UTC |
| 9718c7c | Junio C Hamano | 20 April 2015, 22:28:33 UTC | Merge branch 'tb/connect-ipv6-parse-fix' An earlier update to the parser that disects an address broke an address, followed by a colon, followed by an empty string (instead of the port number). * tb/connect-ipv6-parse-fix: connect.c: ignore extra colon after hostname | 20 April 2015, 22:28:33 UTC |
| a59ac46 | Junio C Hamano | 20 April 2015, 22:28:32 UTC | Merge branch 'va/fix-git-p4-tests' Test fixes for git-p4. * va/fix-git-p4-tests: t9814: guarantee only one source exists in git-p4 copy tests git-p4: fix copy detection test t9814: fix broken shell syntax in git-p4 rename test | 20 April 2015, 22:28:32 UTC |
| 268d5bc | Junio C Hamano | 20 April 2015, 22:28:31 UTC | Merge branch 'jc/push-cert' The "git push --signed" protocol extension did not limit what the "nonce" that is a server-chosen string can contain or how long it can be, which was unnecessarily lax. Limit both the length and the alphabet to a reasonably small space that can still have enough entropy. * jc/push-cert: push --signed: tighten what the receiving end can ask to sign | 20 April 2015, 22:28:31 UTC |
| 6b1258b | Junio C Hamano | 20 April 2015, 22:28:29 UTC | Merge branch 'ma/bash-completion-leaking-x' The completion script (in contrib/) contaminated global namespace and clobbered on a shell variable $x. * ma/bash-completion-leaking-x: completion: fix global bash variable leak on __gitcompappend | 20 April 2015, 22:28:30 UTC |
| ee1c6c3 | Jeff King | 20 April 2015, 19:55:00 UTC | sha1_file: only freshen packs once per run Since 33d4221 (write_sha1_file: freshen existing objects, 2014-10-15), we update the mtime of existing objects that we would have written out (had they not existed). For the common case in which many objects are packed, we may update the mtime on a single packfile repeatedly. This can result in a noticeable performance problem if calling utime() is expensive (e.g., because your storage is on NFS). We can fix this by keeping a per-pack flag that lets us freshen only once per program invocation. An alternative would be to keep the packed_git.mtime flag up to date as we freshen, and freshen only once every N seconds. In practice, it's not worth the complexity. We are racing against prune expiration times here, which inherently must be set to accomodate reasonable program running times (because they really care about the time between an object being written and it becoming referenced, and the latter is typically the last step a program takes). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 20:09:40 UTC |
| b5f52f3 | Jeff King | 20 April 2015, 19:54:03 UTC | sha1_file: freshen pack objects before loose When writing out an object file, we first check whether it already exists and if so optimize out the write. Prior to 33d4221, we did this by calling has_sha1_file(), which will check for packed objects followed by loose. Since that commit, we check loose objects first. For the common case of a repository whose objects are mostly packed, this means we will make a lot of extra access() system calls checking for loose objects. We should follow the same packed-then-loose order that all of our other lookups use. Reported-by: Stefan Saasen <ssaasen@atlassian.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 20:09:38 UTC |
| 1385bb7 | Jeff King | 27 March 2015, 11:32:41 UTC | reachable: only mark local objects as recent When pruning and repacking a repository that has an alternate object store configured, we may traverse a large number of objects in the alternate. This serves no purpose, and may be expensive to do. A longer explanation is below. Commits d3038d2 and abcb865 taught prune and pack-objects (respectively) to treat "recent" objects as tips for reachability, so that we keep whole chunks of history. They built on the object traversal in 660c889 (sha1_file: add for_each iterators for loose and packed objects, 2014-10-15), which covers both local and alternate objects. In both cases, covering alternate objects is unnecessary, as both commands can only drop objects from the local repository. In the case of prune, we traverse only the local object directory. And in the case of repacking, while we may or may not include local objects in our pack, we will never reach into the alternate with "repack -d". The "-l" option is only a question of whether we are migrating objects from the alternate into our repository, or leaving them untouched. It is possible that we may drop an object that is depended upon by another object in the alternate. For example, imagine two repositories, A and B, with A pointing to B as an alternate. Now imagine a commit that is in B which references a tree that is only in A. Traversing from recent objects in B might prevent A from dropping that tree. But this case isn't worth covering. Repo B should take responsibility for its own objects. It would never have had the commit in the first place if it did not also have the tree, and assuming it is using the same "keep recent chunks of history" scheme, then it would itself keep the tree, as well. So checking the alternate objects is not worth doing, and come with a significant performance impact. In both cases, we skip any recent objects that have already been marked SEEN (i.e., that we know are already reachable for prune, or included in the pack for a repack). So there is a slight waste of time in opening the alternate packs at all, only to notice that we have already considered each object. But much worse, the alternate repository may have a large number of objects that are not reachable from the local repository at all, and we end up adding them to the traversal. We can fix this by considering only local unseen objects. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 20:09:27 UTC |
| 0269f96 | Matthieu Moy | 20 April 2015, 12:09:07 UTC | log -L: improve error message on malformed argument The old message did not mention the :regex:file form. To avoid overly long lines, split the message into two lines (in case item->string is long, it will be the only part truncated in a narrow terminal). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 18:06:10 UTC |
| d349e0e | Matthieu Moy | 20 April 2015, 12:09:06 UTC | Documentation: change -L:<regex> to -L:<funcname> The old wording was somehow implying that <start> and <end> were not regular expressions. Also, the common case is to use a plain function name here so <funcname> makes sense (the fact that it is a regular expression is documented in line-range-format.txt). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2015, 18:05:50 UTC |
| 1eb0545 | Junio C Hamano | 19 April 2015, 01:35:48 UTC | Merge tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui git-gui 0.20.0 * tag 'gitgui-0.20.0' of http://repo.or.cz/r/git-gui: git-gui: set version 0.20 git-gui: sv.po: Update Swedish translation (547t0f0u) git-gui i18n: Updated Bulgarian translation (547t,0f,0u) git-gui: Makes chooser set 'gitdir' to the resolved path git-gui: Fixes chooser not accepting gitfiles git-gui: reinstate support for Tcl 8.4 git-gui: fix problem with gui.maxfilesdisplayed git-gui: fix verbose loading when git path contains spaces. git-gui/gitk: Do not depend on Cygwin's "kill" command on Windows git-gui: add configurable tab size to the diff view git-gui: Make git-gui lib dir configurable at runime git-gui i18n: Updated Bulgarian translation (520t,0f,0u) L10n: vi.po (543t): Init translation for Vietnamese git-gui: align the new recursive checkbox with the radiobuttons. git-gui: Add a 'recursive' checkbox in the clone menu. | 19 April 2015, 01:35:48 UTC |
| 64f2589 | Nguyễn Thái Ngọc Duy | 18 April 2015, 11:22:53 UTC | t1509: update prepare script to be able to run t1509 in chroot again Tested on Gentoo and OpenSUSE 13.1, both x86-64 Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2015, 00:51:04 UTC |
| 4498b3a | Pat Thoyts | 18 April 2015, 11:15:32 UTC | git-gui: set version 0.20 Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:15:32 UTC |
| 5a5c11f | Peter Krefting | 27 March 2015, 09:25:32 UTC | git-gui: sv.po: Update Swedish translation (547t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 11:03:50 UTC |
| de18648 | Alexander Shopov | 07 April 2015, 15:29:46 UTC | git-gui i18n: Updated Bulgarian translation (547t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net> | 18 April 2015, 10:51:39 UTC |
| b7994af | Jeff King | 17 April 2015, 14:52:48 UTC | type_from_string_gently: make sure length matches When commit fe8e3b7 refactored type_from_string to allow input that was not NUL-terminated, it switched to using strncmp instead of strcmp. But this means we check only the first "len" bytes of the strings, and ignore any remaining bytes in the object_type_string. We should make sure that it is also "len" bytes, or else we would accept "comm" as "commit", and so forth. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2015, 20:54:39 UTC |
| 7e11052 | Ossi Herrala | 17 April 2015, 14:50:10 UTC | config: fix settings in default_user_config template The name (not user) and email setting should be in config section "user" and not in "core" as documented in Documentation/config.txt. Signed-off-by: Ossi Herrala <oherrala@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2015, 17:32:46 UTC |
| 7348cde | Michael J Gruber | 17 April 2015, 14:28:56 UTC | rev-list-options.txt: complete sentence about notes matching Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2015, 17:30:51 UTC |
| de248e9 | Elia Pinto | 16 April 2015, 14:12:07 UTC | test-lib-functions.sh: fix the second argument to some helper functions The second argument to test_path_is_file and test_path_is_dir must be $2 and not $*, which instead would repeat the file name in the error message. Signed-off-by: Elia Pinto <gitter.spiros@gmail.com> Reviewed-by: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 20:31:35 UTC |
| 27547e5 | Junio C Hamano | 16 April 2015, 17:48:58 UTC | attr: skip UTF8 BOM at the beginning of the input file Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 18:35:38 UTC |
| 599446d | Junio C Hamano | 16 April 2015, 17:47:45 UTC | config: use utf8_bom[] from utf.[ch] in git_parse_source() Because the function reads one character at the time, unfortunately we cannot use the easier skip_utf8_bom() helper, but at least we do not have to duplicate the constant string this way. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 18:35:27 UTC |
| dde843e | Junio C Hamano | 16 April 2015, 17:45:29 UTC | utf8-bom: introduce skip_utf8_bom() helper With the recent change to ignore the UTF8 BOM at the beginning of .gitignore files, we now have two codepaths that do such a skipping (the other one is for reading the configuration files). Introduce utf8_bom[] constant string and skip_utf8_bom() helper and teach .gitignore code how to use it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 18:35:06 UTC |
| cb0abea | Junio C Hamano | 16 April 2015, 18:26:29 UTC | add_excludes_from_file: clarify the bom skipping logic Even though the previous step shifts where the "entry" begins, we still iterate over the original buf[], which may begin with the UTF-8 BOM we are supposed to be skipping. At the end of the first line, the code grabs the contents of it starting at "entry", so there is nothing wrong per-se, but the logic looks really confused. Instead, move the buf pointer and shrink its size, to truly pretend that UTF-8 BOM did not exist in the input. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 18:26:29 UTC |
| 245e1c1 | Carlos Martín Nieto | 16 April 2015, 14:05:12 UTC | dir: allow a BOM at the beginning of exclude files Some text editors like Notepad or LibreOffice write an UTF-8 BOM in order to indicate that the file is Unicode text rather than whatever the current locale would indicate. If someone uses such an editor to edit a gitignore file, we are left with those three bytes at the beginning of the file. If we do not skip them, we will attempt to match a filename with the BOM as prefix, which won't match the files the user is expecting. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 April 2015, 17:17:04 UTC |
| 3d6bc9a | Junio C Hamano | 16 April 2015, 15:03:14 UTC | Revert "merge: pass verbosity flag down to merge-recursive" This reverts commit 2bf15a3330a26183adc8563dbeeacc11294b8a01, whose intention was good, but the verbosity levels used in merge-recursive turns out to be rather uneven. For example, a merge of two branches with conflicting submodule updates used to report CONFLICT: output with --quiet but no longer (which *is* desired), while the final "Automatic merge failed; fix conflicts and then commit" message is still shown even with --quiet (which *is* inconsistent). Originally reported by Bryan Turner; it is too early to declare what the concensus is, but it seems that we would need to level the verbosity levels used in merge strategy backends before we can go forward. In the meantime, we'd revert to the old behaviour until that happens. cf. $gmane/267245 | 16 April 2015, 15:03:14 UTC |
| f6e6362 | Junio C Hamano | 15 April 2015, 15:47:48 UTC | parse_date_basic(): let the system handle DST conversion The function parses the input to compute the broken-down time in "struct tm", and the GMT timezone offset. If the timezone offset does not exist in the input, the broken-down time is turned into the number of seconds since epoch both in the current timezone and in GMT and the offset is computed as their difference. However, we forgot to make sure tm.tm_isdst is set to -1 (i.e. let the system figure out if DST is in effect in the current timezone when turning the broken-down time to the number of seconds since epoch); it is done so at the beginning of the function, but a call to match_digit() in the function can lead to a call to gmtime_r() to clobber the field. Reported-by: Linus Torvalds <torvalds@linux-foundation.org> Diagnosed-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2015, 17:25:32 UTC |
| 7fcec48 | Junio C Hamano | 15 April 2015, 15:43:58 UTC | parse_date_basic(): return early when given a bogus timestamp When the input does not have GMT timezone offset, the code computes it by computing the local and GMT time for the given timestamp. But there is no point doing so if the given timestamp is known to be a bogus one. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2015, 17:25:05 UTC |
| e46fe3d | Junio C Hamano | 14 April 2015, 18:57:13 UTC | Git 2.4.0-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2015, 18:57:13 UTC |
| 7a1aa0c | Junio C Hamano | 14 April 2015, 18:49:13 UTC | Merge branch 'jk/colors' "diff-highlight" (in contrib/) used to show byte-by-byte differences, which meant that multi-byte characters can be chopped in the middle. It learned to pay attention to character boundaries (assuming the UTF-8 payload). * jk/colors: diff-highlight: do not split multibyte characters | 14 April 2015, 18:49:13 UTC |
| 3cdff83 | Junio C Hamano | 14 April 2015, 18:49:12 UTC | Merge branch 'jk/merge-quiet' "git merge --quiet" did not squelch messages from the underlying merge-recursive strategy. * jk/merge-quiet: merge: pass verbosity flag down to merge-recursive | 14 April 2015, 18:49:12 UTC |
| f8e593e | Junio C Hamano | 14 April 2015, 18:49:11 UTC | Merge branch 'jk/pack-corruption-post-mortem' Documentation update. * jk/pack-corruption-post-mortem: howto: document more tools for recovery corruption | 14 April 2015, 18:49:11 UTC |
| fa9aaa8 | Junio C Hamano | 14 April 2015, 18:49:10 UTC | Merge branch 'jc/update-instead-into-void' A push into an unborn branch, with "receive.denyCurrentBranch" set to "updateInstead", did not check out the working tree as expected. * jc/update-instead-into-void: push-to-deploy: allow pushing into an unborn branch and updating it | 14 April 2015, 18:49:10 UTC |
| d2ae751 | Junio C Hamano | 14 April 2015, 18:49:09 UTC | Merge branch 'sb/plug-streaming-leak' * sb/plug-streaming-leak: streaming.c: fix a memleak | 14 April 2015, 18:49:09 UTC |
| 0cb7054 | Junio C Hamano | 14 April 2015, 18:49:08 UTC | Merge branch 'jn/doc-fast-import-no-16-octopus-limit' Documentation update. * jn/doc-fast-import-no-16-octopus-limit: fast-import doc: remove suggested 16-parent limit | 14 April 2015, 18:49:08 UTC |
| 011cb58 | Junio C Hamano | 14 April 2015, 18:49:07 UTC | Merge branch 'sb/plug-wt-shortstatus-tracking-leak' * sb/plug-wt-shortstatus-tracking-leak: wt-status.c: fix a memleak | 14 April 2015, 18:49:07 UTC |
| bf2cfca | Junio C Hamano | 14 April 2015, 17:34:05 UTC | Merge branch 'pt/enter-repo-comment-fix' * pt/enter-repo-comment-fix: enter_repo(): fix docs to match code | 14 April 2015, 17:34:05 UTC |
| 03571fd | Junio C Hamano | 14 April 2015, 17:34:01 UTC | Merge branch 'jz/gitweb-conf-doc-fix' * jz/gitweb-conf-doc-fix: gitweb.conf.txt: say "build-time", not "built-time" | 14 April 2015, 17:34:01 UTC |
| 5a69705 | Junio C Hamano | 14 April 2015, 17:33:54 UTC | Merge branch 'jk/cherry-pick-docfix' * jk/cherry-pick-docfix: cherry-pick: fix docs describing handling of empty commits | 14 April 2015, 17:33:55 UTC |
| 1d058dc | Junio C Hamano | 14 April 2015, 17:33:45 UTC | Merge branch 'iu/fix-parse-options-h-comment' * iu/fix-parse-options-h-comment: parse-options.h: OPTION_{BIT,SET_INT} do not store pointer to defval | 14 April 2015, 17:33:46 UTC |
| 638cbf5 | Junio C Hamano | 14 April 2015, 16:55:29 UTC | Merge branch 'jg/cguide-we-cannot-count' * jg/cguide-we-cannot-count: CodingGuidelines: update 'rough' rule count | 14 April 2015, 16:55:29 UTC |
| 6c3b2af | Julian Gindi | 13 April 2015, 12:54:14 UTC | CodingGuidelines: update 'rough' rule count Changed inaccurate count of "rough rules" from three to the more generic 'a few'. Signed-off-by: Julian Gindi <juliangindi@gmail.com> Reviewed-by: Eric Sunshine <sunshine@sunshineco.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2015, 16:50:31 UTC |
| 5dcd1b1 | Patrick Steinhardt | 09 April 2015, 19:59:06 UTC | grep: correctly initialize help-all option The "help-all" option is being initialized with a wrong value. While being semantically wrong this can also cause a segmentation fault in gcc on ARMv7 hardfloat platforms with a hardened toolchain. Fix this by initializing with a NULL value. Signed-off-by: Patrick Steinhardt <ps@pks.im> Reviewed-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 05:46:28 UTC |
| 852ff1c | Márcio Almada | 08 April 2015, 05:45:58 UTC | completion: fix global bash variable leak on __gitcompappend Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 05:35:51 UTC |
| f86a374 | Stefan Beller | 31 March 2015, 01:22:10 UTC | pack-bitmap.c: fix a memleak Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 04:45:27 UTC |
| f1f4c84 | Vitor Antunes | 05 April 2015, 23:08:35 UTC | t9814: guarantee only one source exists in git-p4 copy tests By using a tree with multiple identical files and allowing copy detection to choose any one of them, the check in the test is unnecessarily complex. We can simplify by: * Modify source file (file2) before copying the file. * Check that only file2 is the source in the output of "p4 filelog". * Remove all "case" statements and replace them with simple tests to check that source is "file2". Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2015, 03:25:17 UTC |
| ecc46a1 | Junio C Hamano | 09 April 2015, 04:15:33 UTC | Merge tag 'l10n-2.4.0-rnd2' of git://github.com/git-l10n/git-po git l10n 2.4.0-rnd2 | 09 April 2015, 04:15:47 UTC |
| 6b6c5f7 | Torsten Bögershausen | 07 April 2015, 20:03:25 UTC | connect.c: ignore extra colon after hostname Ignore an extra ':' at the end of the hostname in URL's like "ssh://example.com:/path/to/repo" The colon is meant to separate a port number from the hostname. If the port is empty, the colon should be ignored, see RFC 3986. It had been working for URLs with ssh:// scheme, but was unintentionally broken in 86ceb3, "allow ssh://user@[2001:db8::1]/repo.git" Reported-by: Reid Woodbury Jr. <reidw@rawsound.com> Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 April 2015, 04:00:53 UTC |
| 44cc742 | Jiang Xin | 09 April 2015, 00:21:39 UTC | Merge branch 'master' of git://github.com/alexhenrie/git-po * 'master' of git://github.com/alexhenrie/git-po: l10n: ca.po: update translation | 09 April 2015, 00:21:39 UTC |
| 689664a | Jiang Xin | 09 April 2015, 00:00:10 UTC | l10n: TEAMS: Change repository URL of zh_CN Repository URL of zh_CN l10n for Git has been changed over 2 years, update po/TEAMS for it. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 09 April 2015, 00:20:32 UTC |
| c888305 | Alex Henrie | 08 April 2015, 00:07:47 UTC | l10n: ca.po: update translation Signed-off-by: Alex Henrie <alexhenrie24@gmail.com> | 08 April 2015, 00:07:47 UTC |
| f88c113 | Alexander Shopov | 07 April 2015, 08:22:47 UTC | l10n: Updated Bulgarian translation of git (2305t,0f,0u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 07 April 2015, 08:23:18 UTC |
| 9386878 | Peter Krefting | 07 April 2015, 07:45:20 UTC | l10n: sv.po: Update Swedish translation (2305t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 07 April 2015, 07:45:20 UTC |
| ddc7d46 | Ralf Thielow | 04 April 2015, 08:06:42 UTC | l10n: de.po: translate one message Translate one message came from git.pot update in 6eebb35 (l10n: git.pot: v2.4.0 round 2 (1 update)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 05 April 2015, 17:10:29 UTC |
| 8d00662 | Kyle J. McKay | 03 April 2015, 22:15:14 UTC | diff-highlight: do not split multibyte characters When the input is UTF-8 and Perl is operating on bytes instead of characters, a diff that changes one multibyte character to another that shares an initial byte sequence will result in a broken diff display as the common byte sequence prefix will be separated from the rest of the bytes in the multibyte character. For example, if a single line contains only the unicode character U+C9C4 (encoded as UTF-8 0xEC, 0xA7, 0x84) and that line is then changed to the unicode character U+C9C0 (encoded as UTF-8 0xEC, 0xA7, 0x80), when operating on bytes diff-highlight will show only the single byte change from 0x84 to 0x80 thus creating invalid UTF-8 and a broken diff display. Fix this by putting Perl into character mode when splitting the line and then back into byte mode after the split is finished. The utf8::xxx functions require Perl 5.8 so we require that as well. Also, since we are mucking with code in the split_line function, we change a '*' quantifier to a '+' quantifier when matching the $COLOR expression which has the side effect of speeding everything up while eliminating useless '' elements in the returned array. Reported-by: Yi EungJun <semtlenori@gmail.com> 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> | 04 April 2015, 20:03:45 UTC |
| fa54b52 | Jean-Noel Avila | 04 April 2015, 16:04:56 UTC | l10n: fr.po v2.4.0 round 2 Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 04 April 2015, 16:04:56 UTC |
