| 5f95c9f | Junio C Hamano | 14 February 2014, 19:35:04 UTC | Git 1.9.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2014, 19:35:04 UTC |
| 9c8ce73 | Michael J Gruber | 13 February 2014, 10:35:08 UTC | release notes: typo fixes Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2014, 19:22:56 UTC |
| 475c52b | Junio C Hamano | 13 February 2014, 21:42:26 UTC | Sync with 1.8.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2014, 21:42:26 UTC |
| 7bbc4e8 | Junio C Hamano | 13 February 2014, 21:40:47 UTC | Git 1.8.5.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2014, 21:41:53 UTC |
| 2cd8616 | Junio C Hamano | 13 February 2014, 21:38:59 UTC | Merge branch 'bm/merge-base-octopus-dedup' into maint "git merge-base --octopus" used to leave cleaning up suboptimal result to the caller, but now it does the clean-up itself. * bm/merge-base-octopus-dedup: merge-base --octopus: reduce the result from get_octopus_merge_bases() merge-base: separate "--independent" codepath into its own helper | 13 February 2014, 21:38:59 UTC |
| 5032098 | Junio C Hamano | 13 February 2014, 21:38:47 UTC | Merge branch 'jc/revision-range-unpeel' into maint "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * jc/revision-range-unpeel: revision: propagate flag bits from tags to pointees revision: mark contents of an uninteresting tree uninteresting | 13 February 2014, 21:38:47 UTC |
| c337684 | Junio C Hamano | 13 February 2014, 21:38:34 UTC | Merge branch 'jk/allow-fetch-onelevel-refname' into maint "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs | 13 February 2014, 21:38:34 UTC |
| 21261fa | Junio C Hamano | 13 February 2014, 21:38:25 UTC | Merge branch 'jk/interpret-branch-name-fix' into maint A handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":", have been fixed. * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling | 13 February 2014, 21:38:25 UTC |
| 7c9b668 | Junio C Hamano | 13 February 2014, 21:38:19 UTC | Merge branch 'rk/send-email-ssl-cert' into maint A recent update to "git send-email" broke platforms where /etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path (e.g. Fedora rawhide). * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path | 13 February 2014, 21:38:19 UTC |
| 90791e3 | Junio C Hamano | 13 February 2014, 21:38:09 UTC | Merge branch 'sb/repack-in-c' into maint "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * sb/repack-in-c: repack: propagate pack-objects options as strings repack: make parsed string options const-correct repack: fix typo in max-pack-size option | 13 February 2014, 21:38:09 UTC |
| b4e931d | Junio C Hamano | 13 February 2014, 21:37:53 UTC | Merge branch 'as/tree-walk-fix-aggressive-short-cut' into maint The pathspec matching code, while comparing two trees (e.g. "git diff A B -- path1 path2") was too aggressive and failed to match some paths when multiple pathspecs were involved. * as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs | 13 February 2014, 21:37:53 UTC |
| bc97e2d | Junio C Hamano | 12 February 2014, 20:28:47 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: de.po: correct message when hiding commits by craft l10n: de.po: translate 28 new messages | 12 February 2014, 20:28:47 UTC |
| 92cd3e3 | Ralf Thielow | 08 February 2014, 21:01:36 UTC | l10n: de.po: correct message when hiding commits by craft The recent translation was giving the idea that all commits based on a graft were meant to be hidden. Make it clear that it is the graft commit itself. Reported-by: David Kastrup <dak@gnu.org> Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 February 2014, 06:16:03 UTC |
| 0dd2a2c | Ralf Thielow | 03 January 2014, 17:38:12 UTC | l10n: de.po: translate 28 new messages Translate 28 new messages came from git.pot update in df49095 (l10n: git.pot: v1.9 round 1 (27 new, 11 removed) and d57b24b (l10n: git.pot: v1.9 round 2 (1 new)). Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> | 12 February 2014, 06:15:55 UTC |
| e265f1f | Junio C Hamano | 11 February 2014, 19:02:05 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: zh_CN.po: Disambiguation for rebase l10n: zh_CN.po: translate 1 new message (2211t0f0u) l10n: vi.po (2211t): Updated one new string l10n: Update Swedish translation (2211t0f0u) l10n: fr: 1.9rc2 2211t l10n: git.pot: v1.9 round 2 (1 new) | 11 February 2014, 19:02:05 UTC |
| 6a70719 | Junio C Hamano | 07 February 2014, 19:56:07 UTC | Git 1.9.0-rc3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2014, 19:56:07 UTC |
| efe5f1d | Junio C Hamano | 07 February 2014, 19:55:11 UTC | Merge branch 'ow/manpages-typofix' Various typofixes, all looked correct. * ow/manpages-typofix: Documentation: fix typos in man pages | 07 February 2014, 19:55:12 UTC |
| c256661 | Junio C Hamano | 07 February 2014, 19:55:10 UTC | Merge branch 'aj/ada-diff-word-pattern' * aj/ada-diff-word-pattern: userdiff: update Ada patterns | 07 February 2014, 19:55:10 UTC |
| 53c2a59 | Junio C Hamano | 07 February 2014, 19:55:06 UTC | Merge branch 'nd/tag-doc' * nd/tag-doc: git-tag.txt: <commit> for --contains is optional | 07 February 2014, 19:55:07 UTC |
| 98b2761 | Jiang Xin | 02 February 2014, 12:46:58 UTC | l10n: zh_CN.po: Disambiguation for rebase Disambiguate the Chinese translation for "rebase", and update other related entries. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 06 February 2014, 15:15:33 UTC |
| 5fe8f49 | Øystein Walle | 05 February 2014, 22:19:43 UTC | Documentation: fix typos in man pages Signed-off-by: Øystein Walle <oystwa@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:35:45 UTC |
| 89ba81d | Junio C Hamano | 05 February 2014, 22:14:40 UTC | Sync with 1.8.5.4 | 05 February 2014, 22:14:40 UTC |
| c7b8cf4 | Junio C Hamano | 31 January 2014, 23:14:05 UTC | howto/maintain-git.txt: new version numbering scheme We wanted to call the upcoming release "Git 1.9", with its maintenance track being "Git 1.9.1", "Git 1.9.2", etc., but various third-party tools are reported to assume that there are at least three dewey-decimal components in our version number. Adjust the plan so that vX.Y.0 are feature releases while vX.Y.Z (Z > 0) are maintenance releases. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:14:00 UTC |
| 3330a2c | Junio C Hamano | 05 February 2014, 22:05:31 UTC | Git 1.8.5.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 22:13:23 UTC |
| 01a5774 | Junio C Hamano | 05 February 2014, 22:03:47 UTC | Merge branch 'jc/maint-pull-docfix' into maint The documentation to "git pull" hinted there is an "-m" option because it incorrectly shared the documentation with "git merge". * jc/maint-pull-docfix: Documentation: "git pull" does not have the "-m" option Documentation: exclude irrelevant options from "git pull" | 05 February 2014, 22:03:47 UTC |
| a74a682 | Junio C Hamano | 05 February 2014, 22:03:20 UTC | Merge branch 'ow/stash-with-ifs' into maint The implementation of 'git stash $cmd "stash@{...}"' did not quote the stash argument properly and left it split at IFS whitespace. * ow/stash-with-ifs: stash: handle specifying stashes with $IFS | 05 February 2014, 22:03:20 UTC |
| 3c86474 | Junio C Hamano | 05 February 2014, 22:03:01 UTC | Merge branch 'js/lift-parent-count-limit' into maint There is no reason to have a hardcoded upper limit of the number of parents for an octopus merge, created via the graft mechanism, but there was. * js/lift-parent-count-limit: Remove the line length limit for graft files | 05 February 2014, 22:03:01 UTC |
| ee5788e | Junio C Hamano | 05 February 2014, 22:02:44 UTC | Merge branch 'nd/add-empty-fix' into maint "git add -A" (no other arguments) in a totally empty working tree used to emit an error. * nd/add-empty-fix: add: don't complain when adding empty project root | 05 February 2014, 22:02:44 UTC |
| d11ade7 | Junio C Hamano | 05 February 2014, 22:02:05 UTC | Merge branch 'bc/log-decoration' into maint "git log --decorate" did not handle a tag pointed by another tag nicely. * bc/log-decoration: log: properly handle decorations with chained tags | 05 February 2014, 22:02:05 UTC |
| 2885624 | Junio C Hamano | 05 February 2014, 22:01:23 UTC | Merge branch 'jh/rlimit-nofile-fallback' into maint When we figure out how many file descriptors to allocate for keeping packfiles open, a system with non-working getrlimit() could cause us to die(), but because we make this call only to get a rough estimate of how many is available and we do not even attempt to use up all file descriptors available ourselves, it is nicer to fall back to a reasonable low value rather than dying. * jh/rlimit-nofile-fallback: get_max_fd_limit(): fall back to OPEN_MAX upon getrlimit/sysconf failure | 05 February 2014, 22:01:23 UTC |
| a118bee | Junio C Hamano | 05 February 2014, 22:01:09 UTC | Merge branch 'jl/commit-v-strip-marker' into maint "git commit -v" appends the patch to the log message before editing, and then removes the patch when the editor returned control. However, the patch was not stripped correctly when the first modified path was a submodule. * jl/commit-v-strip-marker: commit -v: strip diffs and submodule shortlogs from the commit message | 05 February 2014, 22:01:09 UTC |
| ac0835f | Junio C Hamano | 05 February 2014, 22:00:18 UTC | Merge branch 'tr/send-email-ssl' into maint SSL-related options were not passed correctly to underlying socket layer in "git send-email". * tr/send-email-ssl: send-email: set SSL options through IO::Socket::SSL::set_client_defaults send-email: --smtp-ssl-cert-path takes an argument send-email: pass Debug to Net::SMTP::SSL::new | 05 February 2014, 22:00:18 UTC |
| 1a11195 | Junio C Hamano | 05 February 2014, 21:59:16 UTC | Merge branch 'tb/clone-ssh-with-colon-for-port' into maint Remote repository URL expressed in scp-style host:path notation are parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks to connect to user's home directory on host at address ::1. * tb/clone-ssh-with-colon-for-port: git_connect(): use common return point connect.c: refactor url parsing git_connect(): refactor the port handling for ssh git fetch: support host:/~repo t5500: add test cases for diag-url git fetch-pack: add --diag-url git_connect: factor out discovery of the protocol and its parts git_connect: remove artificial limit of a remote command t5601: add tests for ssh t5601: remove clear_ssh, refactor setup_ssh_wrapper | 05 February 2014, 21:59:16 UTC |
| bf03d6e | Junio C Hamano | 05 February 2014, 21:58:51 UTC | Merge branch 'nd/transport-positive-depth-only' into maint "git fetch --depth=0" was a no-op, and was silently ignored. Diagnose it as an error. * nd/transport-positive-depth-only: clone,fetch: catch non positive --depth option value | 05 February 2014, 21:58:52 UTC |
| 2171c0c | Junio C Hamano | 05 February 2014, 20:02:29 UTC | Merge branch 'tb/repack-fix-renames' (early part) Finishing touches to the "rewrite repack in C" series. * 'tb/repack-fix-renames' (early part): repack.c: rename and unlink pack file if it exists | 05 February 2014, 20:02:29 UTC |
| 9d7fbfd | Torsten Bögershausen | 02 February 2014, 15:09:56 UTC | repack.c: rename and unlink pack file if it exists When a repo was fully repacked, and is repacked again, we may run into the situation that "new" packfiles have the same name as already existing ones (traditionally packfiles have been named after the list of names of objects in them, so repacking all the objects in a single pack would have produced a packfile with the same name). The logic is to rename the existing ones into filename like "old-XXX", create the new ones and then remove the "old-" ones. When something went wrong in the middle, this sequence is rolled back by renaming the "old-" files back. The renaming into "old-" did not work as intended, because file_exists() was done on "XXX", not "pack-XXX". Also when rolling back the change, the code tried to rename "old-pack-XXX" but the saved ones are named "old-XXX", so this couldn't have worked. Signed-off-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 19:58:49 UTC |
| 39a87a2 | Adrian Johnson | 03 February 2014, 11:33:16 UTC | userdiff: update Ada patterns - Allow extra space in "is new" and "is separate" - Fix bug in word regex for numbers Signed-off-by: Adrian Johnson <ajohnson@redneon.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2014, 18:45:51 UTC |
| 81966ab | Nguyễn Thái Ngọc Duy | 04 February 2014, 02:56:26 UTC | git-tag.txt: <commit> for --contains is optional This goes far back to e84fb2f (branch --contains: default to HEAD - 2008-07-08) where the same parsing code is shared with builtin/tag.c. git-branch.txt correctly states that <commit> for --contains is optional while git-tag.txt does not. Correct it. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2014, 18:35:58 UTC |
| 8376b58 | Jiang Xin | 02 February 2014, 12:46:58 UTC | l10n: zh_CN.po: translate 1 new message (2211t0f0u) Update translation for git v1.9-rc2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 03 February 2014, 02:53:18 UTC |
| afa4128 | Jiang Xin | 03 February 2014, 01:47:27 UTC | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv * 'master' of git://github.com/nafmo/git-l10n-sv: l10n: Update Swedish translation (2211t0f0u) | 03 February 2014, 01:47:27 UTC |
| e8f4a7c | Jiang Xin | 03 February 2014, 01:45:14 UTC | Merge branch 'master' of git://github.com/vnwildman/git * 'master' of git://github.com/vnwildman/git: l10n: vi.po (2211t): Updated one new string | 03 February 2014, 01:45:14 UTC |
| 8620ed5 | Tran Ngoc Quan | 03 February 2014, 00:49:47 UTC | l10n: vi.po (2211t): Updated one new string Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 03 February 2014, 00:49:47 UTC |
| b6c0df8 | Peter Krefting | 02 February 2014, 16:22:21 UTC | l10n: Update Swedish translation (2211t0f0u) Signed-off-by: Peter Krefting <peter@softwolves.pp.se> | 02 February 2014, 16:22:21 UTC |
| 893fcc3 | Jean-Noel Avila | 02 February 2014, 13:36:32 UTC | l10n: fr: 1.9rc2 2211t Signed-off-by: Jean-Noel Avila <jn.avila@free.fr> | 02 February 2014, 13:38:05 UTC |
| d57b24b | Jiang Xin | 01 February 2014, 00:07:02 UTC | l10n: git.pot: v1.9 round 2 (1 new) Generate po/git.pot from v1.9-rc2 for git v1.9 l10n round 2. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 01 February 2014, 00:07:02 UTC |
| be961c2 | Junio C Hamano | 31 January 2014, 22:16:06 UTC | Git 1.9-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2014, 22:16:06 UTC |
| e94ea16 | Junio C Hamano | 31 January 2014, 18:52:29 UTC | Merge git://github.com/git-l10n/git-po * 'master' of git://github.com/git-l10n/git-po: l10n: Bulgarian translation of git (222t21f1967u) po/TEAMS: Added Bulgarian team l10n: remove 2 blank translations on Danish, Dutch l10n: zh_CN.po: translate 27 messages (2210t0f0u) l10n: Update Swedish translation (2210t0f0u) [fr] update french translation 2210/2210 l10n: vi.po (2210t): Updated git-core translation l10n: git.pot: v1.9 round 1 (27 new, 11 removed) | 31 January 2014, 18:52:29 UTC |
| 3de92cd | Junio C Hamano | 31 January 2014, 18:51:57 UTC | Merge branch 'jn/pager-lv-default-env' A finishing touch to its test. * jn/pager-lv-default-env: pager test: make fake pager consume all its input | 31 January 2014, 18:51:57 UTC |
| 52c02f6 | Jonathan Nieder | 30 January 2014, 16:42:32 UTC | pager test: make fake pager consume all its input Otherwise there is a race: if 'git log' finishes writing before the pager terminates and closes the pipe, all is well, and if the pager finishes quickly enough then 'git log' terminates with SIGPIPE. died of signal 13 at /build/buildd/git-1.9~rc1/t/test-terminal.perl line 33. not ok 6 - LESS and LV envvars are set for pagination Noticed on Ubuntu PPA builders, where the race was lost about half the time. Compare v1.7.0.2~6^2 (tests: Fix race condition in t7006-pager, 2010-02-22). Reported-by: Anders Kaseorg <andersk@MIT.EDU> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2014, 17:07:17 UTC |
| 25e2fbb | Alexander Shopov | 20 January 2014, 19:39:30 UTC | l10n: Bulgarian translation of git (222t21f1967u) Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 29 January 2014, 12:29:15 UTC |
| 5123e7d | Alexander Shopov | 28 January 2014, 17:14:08 UTC | po/TEAMS: Added Bulgarian team Signed-off-by: Alexander Shopov <ash@kambanaria.org> | 28 January 2014, 17:16:53 UTC |
| bd3e186 | Junio C Hamano | 27 January 2014, 19:01:35 UTC | Git 1.9-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 19:01:35 UTC |
| 8bba720 | Junio C Hamano | 27 January 2014, 18:48:32 UTC | Merge branch 'as/tree-walk-fix-aggressive-short-cut' * as/tree-walk-fix-aggressive-short-cut: tree_entry_interesting: match against all pathspecs | 27 January 2014, 18:48:32 UTC |
| 1ad5417 | Junio C Hamano | 27 January 2014, 18:45:59 UTC | Merge branch 'ta/doc-http-protocol-in-html' * ta/doc-http-protocol-in-html: http-protocol.txt: don't use uppercase for variable names in "The Negotiation Algorithm" Documentation: make it easier to maintain enumerated documents create HTML for http-protocol.txt | 27 January 2014, 18:45:59 UTC |
| 78dc48e | Junio C Hamano | 27 January 2014, 18:45:56 UTC | Merge branch 'mh/doc-wo-names' * mh/doc-wo-names: doc: remote author/documentation sections from more pages | 27 January 2014, 18:45:56 UTC |
| 69b024d | Junio C Hamano | 27 January 2014, 18:45:52 UTC | Merge branch 'jk/revision-o-is-in-libgit-a' * jk/revision-o-is-in-libgit-a: Makefile: remove redundant object in git-http{fetch,push} | 27 January 2014, 18:45:52 UTC |
| 4110639 | Junio C Hamano | 27 January 2014, 18:45:49 UTC | Merge branch 'sb/repack-in-c' "git repack --max-pack-size=8g" stopped being parsed correctly when the command was reimplemented in C. * sb/repack-in-c: repack: propagate pack-objects options as strings repack: make parsed string options const-correct repack: fix typo in max-pack-size option | 27 January 2014, 18:45:49 UTC |
| cdc40bd | Junio C Hamano | 27 January 2014, 18:45:46 UTC | Merge branch 'jk/test-fixes' * jk/test-fixes: t7700: do not use "touch" unnecessarily t7501: fix "empty commit" test with NO_PERL | 27 January 2014, 18:45:46 UTC |
| 017f804 | Junio C Hamano | 27 January 2014, 18:45:43 UTC | Merge branch 'nd/negative-pathspec' * nd/negative-pathspec: tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting() | 27 January 2014, 18:45:44 UTC |
| 523f0a2 | Junio C Hamano | 27 January 2014, 18:45:41 UTC | Merge branch 'pw/git-p4' Various "git p4" updates. * pw/git-p4: git p4 doc: use two-line style for options with multiple spellings git p4 test: examine behavior with locked (+l) files git p4: fix an error message when "p4 where" fails git p4: handle files with wildcards when doing RCS scrubbing git p4 test: do not pollute /tmp git p4 test: run as user "author" git p4 test: is_cli_file_writeable succeeds git p4 test: explicitly check p4 wildcard delete git p4: work around p4 bug that causes empty symlinks git p4 test: ensure p4 symlink parsing works git p4 test: wildcards are supported | 27 January 2014, 18:45:41 UTC |
| 33d4669 | Junio C Hamano | 27 January 2014, 18:45:37 UTC | Merge branch 'ss/safe-create-leading-dir-with-slash' "git clone $origin foo\bar\baz" on Windows failed to create the leading directories (i.e. a moral-equivalent of "mkdir -p"). * ss/safe-create-leading-dir-with-slash: safe_create_leading_directories(): on Windows, \ can separate path components | 27 January 2014, 18:45:37 UTC |
| d0956cf | Junio C Hamano | 27 January 2014, 18:45:33 UTC | Merge branch 'mh/safe-create-leading-directories' Code clean-up and protection against concurrent write access to the ref namespace. * mh/safe-create-leading-directories: rename_tmp_log(): on SCLD_VANISHED, retry rename_tmp_log(): limit the number of remote_empty_directories() attempts rename_tmp_log(): handle a possible mkdir/rmdir race rename_ref(): extract function rename_tmp_log() remove_dir_recurse(): handle disappearing files and directories remove_dir_recurse(): tighten condition for removing unreadable dir lock_ref_sha1_basic(): if locking fails with ENOENT, retry lock_ref_sha1_basic(): on SCLD_VANISHED, retry safe_create_leading_directories(): add new error value SCLD_VANISHED cmd_init_db(): when creating directories, handle errors conservatively safe_create_leading_directories(): introduce enum for return values safe_create_leading_directories(): always restore slash at end of loop safe_create_leading_directories(): split on first of multiple slashes safe_create_leading_directories(): rename local variable safe_create_leading_directories(): add explicit "slash" pointer safe_create_leading_directories(): reduce scope of local variable safe_create_leading_directories(): fix format of "if" chaining | 27 January 2014, 18:45:33 UTC |
| c380cf8 | Junio C Hamano | 27 January 2014, 18:45:30 UTC | Merge branch 'tr/nth-previous-is-a-commit' * tr/nth-previous-is-a-commit: Documentation: @{-N} can refer to a commit | 27 January 2014, 18:45:31 UTC |
| bf39399 | Junio C Hamano | 27 January 2014, 18:45:23 UTC | Merge branch 'tr/gitk-doc-range-trace' * tr/gitk-doc-range-trace: Documentation/gitk: document -L option | 27 January 2014, 18:45:23 UTC |
| a6bec00 | Junio C Hamano | 27 January 2014, 18:45:08 UTC | Merge branch 'jk/mark-edges-uninteresting' Fix performance regression in v1.8.4.x and later. * jk/mark-edges-uninteresting: list-objects: only look at cmdline trees with edge_hint t/perf: time rev-list with UNINTERESTING commits | 27 January 2014, 18:45:08 UTC |
| e049109 | Junio C Hamano | 27 January 2014, 18:45:02 UTC | Merge branch 'jk/diff-filespec-cleanup' * jk/diff-filespec-cleanup: diff_filespec: use only 2 bits for is_binary flag diff_filespec: reorder is_binary field diff_filespec: drop xfrm_flags field diff_filespec: drop funcname_pattern_ident field diff_filespec: reorder dirty_submodule macro definitions | 27 January 2014, 18:45:03 UTC |
| 7b4e2b7 | Junio C Hamano | 27 January 2014, 18:44:59 UTC | Merge branch 'ef/mingw-write' * ef/mingw-write: mingw: remove mingw_write prefer xwrite instead of write | 27 January 2014, 18:44:59 UTC |
| de20e44 | Junio C Hamano | 27 January 2014, 18:44:34 UTC | Merge branch 'rk/send-email-ssl-cert' The "if /etc/ssl/certs/ directory exists, explicitly telling the library to use it as SSL_ca_path" blind-defaulting in "git send-email" broke platforms where /etc/ssl/certs/ directory exists, but it cannot used as SSL_ca_path (e.g. Fedora rawhide). Fix it by not specifying any SSL_ca_path/SSL_ca_file but still asking for peer verification in such a case. * rk/send-email-ssl-cert: send-email: /etc/ssl/certs/ directory may not be usable as ca_path | 27 January 2014, 18:44:34 UTC |
| a0f4525 | Junio C Hamano | 27 January 2014, 18:44:26 UTC | Merge branch 'jn/ignore-doc' Explicitly list $HOME/.config/git/ignore as one of the places you can use to keep ignore patterns that depend on your personal choice of tools, e.g. *~ for Emacs users. * jn/ignore-doc: gitignore doc: add global gitignore to synopsis | 27 January 2014, 18:44:27 UTC |
| 4e9f932 | Junio C Hamano | 27 January 2014, 18:44:20 UTC | Merge branch 'jk/interpret-branch-name-fix' Fix a handful of bugs around interpreting $branch@{upstream} notation and its lookalike, when $branch part has interesting characters, e.g. "@", and ":". * jk/interpret-branch-name-fix: interpret_branch_name: find all possible @-marks interpret_branch_name: avoid @{upstream} past colon interpret_branch_name: always respect "namelen" parameter interpret_branch_name: rename "cp" variable to "at" interpret_branch_name: factor out upstream handling | 27 January 2014, 18:44:21 UTC |
| f583ace | Junio C Hamano | 27 January 2014, 18:44:13 UTC | Merge branch 'jk/allow-fetch-onelevel-refname' "git clone" would fail to clone from a repository that has a ref directly under "refs/", e.g. "refs/stash", because different validation paths do different things on such a refname. Loosen the client side's validation to allow such a ref. * jk/allow-fetch-onelevel-refname: fetch-pack: do not filter out one-level refs | 27 January 2014, 18:44:14 UTC |
| 6376327 | Junio C Hamano | 27 January 2014, 18:44:09 UTC | Merge branch 'jc/revision-range-unpeel' "git log --left-right A...B" lost the "leftness" of commits reachable from A when A is a tag as a side effect of a recent bugfix. This is a regression in 1.8.4.x series. * jc/revision-range-unpeel: revision: propagate flag bits from tags to pointees revision: mark contents of an uninteresting tree uninteresting | 27 January 2014, 18:44:10 UTC |
| 9bb5287 | Junio C Hamano | 27 January 2014, 18:44:06 UTC | Merge branch 'mh/retire-ref-fetch-rules' Code simplification. * mh/retire-ref-fetch-rules: refname_match(): always use the rules in ref_rev_parse_rules | 27 January 2014, 18:44:07 UTC |
| ac35529 | Junio C Hamano | 27 January 2014, 18:44:04 UTC | Merge branch 'mh/attr-macro-doc' * mh/attr-macro-doc: gitattributes: document more clearly where macros are allowed | 27 January 2014, 18:44:04 UTC |
| 6d73dba | Junio C Hamano | 27 January 2014, 18:44:00 UTC | Merge branch 'jc/maint-pull-docfix' * jc/maint-pull-docfix: Documentation: "git pull" does not have the "-m" option Documentation: exclude irrelevant options from "git pull" | 27 January 2014, 18:44:00 UTC |
| ba98a2f | Junio C Hamano | 27 January 2014, 18:43:55 UTC | Merge branch 'jk/complete-merge-base' * jk/complete-merge-base: completion: handle --[no-]fork-point options to git-rebase completion: complete merge-base options | 27 January 2014, 18:43:55 UTC |
| c9e8c1a | Junio C Hamano | 27 January 2014, 18:43:51 UTC | Merge branch 'ab/subtree-doc' * ab/subtree-doc: subtree: fix argument validation in add/pull/push | 27 January 2014, 18:43:51 UTC |
| 9c96c7f | Thomas Ackermann | 26 January 2014, 12:56:17 UTC | http-protocol.txt: don't use uppercase for variable names in "The Negotiation Algorithm" Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 17:06:26 UTC |
| 43cc5ce | Junio C Hamano | 27 January 2014, 17:04:32 UTC | Documentation: make it easier to maintain enumerated documents Instead of starting an enumeration of documents with a DOC = doc1 followed by DOC += doc2, DOC += doc3, ..., empty it with "DOC =" at the beginning and consistently add them with "DOC += ...". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 17:04:32 UTC |
| 586aa78 | Thomas Ackermann | 26 January 2014, 12:57:19 UTC | create HTML for http-protocol.txt ./Documentation/technical/http-protocol.txt was missing from TECH_DOCS in Makefile. Add it and also improve HTML formatting while still retaining good readability of the ASCII text: - Use monospace font instead of italicized or roman font for machine output and source text - Use roman font for things which should be body text - Use double quotes consistently for "want" and "have" commands - Use uppercase "C" / "S" consistently for "client" / "server"; also use "C:" / "S:" instead of "(C)" / "(S)" for consistency and to avoid having formatted "(C)" as copyright symbol in HTML - Use only spaces and not a combination of tabs and spaces for whitespace Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 17:02:02 UTC |
| e4ddb05 | Andy Spencer | 25 January 2014, 22:06:46 UTC | tree_entry_interesting: match against all pathspecs The current basedir compare aborts early in order to avoid futile recursive searches. However, a match may still be found by another pathspec. This can cause an error while checking out files from a branch when using multiple pathspecs: $ git checkout master -- 'a/*.txt' 'b/*.txt' error: pathspec 'a/*.txt' did not match any file(s) known to git. Signed-off-by: Andy Spencer <andy753421@gmail.com> Acked-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 17:01:50 UTC |
| fd78ced | John Keeping | 25 January 2014, 13:11:44 UTC | Makefile: remove redundant object in git-http{fetch,push} revision.o is included in libgit.a which is in $(GITLIBS), so we don't need to include is separately. This fixes compilation with "-fwhole-program" which otherwise fails with messages like this: libgit.a(revision.o): In function `mark_tree_uninteresting': /home/john/src/git/revision.c:108: multiple definition of `mark_tree_uninteresting' /tmp/ccKQRkZV.ltrans2.ltrans.o:/home/john/src/git/revision.c:108: first defined here Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 16:55:28 UTC |
| 8169007 | Michael Haggerty | 26 January 2014, 23:43:49 UTC | doc: remote author/documentation sections from more pages We decided at 48bb914e (doc: drop author/documentation sections from most pages, 2011-03-11) to remove "author" and "documentation" sections from our documentation. Remove a few stragglers. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 January 2014, 16:34:34 UTC |
| 608a823 | Jiang Xin | 18 January 2014, 09:08:14 UTC | l10n: remove 2 blank translations on Danish, Dutch Two l10n teams haven't contributed a single translation for about two years since they was initialized with a blank template. Remove them can make the Git package smaller and give opportunities to other contributors. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 24 January 2014, 22:17:14 UTC |
| cfff71a | Jiang Xin | 18 January 2014, 03:04:21 UTC | l10n: zh_CN.po: translate 27 messages (2210t0f0u) Translations for git v1.9-rc0, and also update translations on "graft" and "reference repository". Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 24 January 2014, 22:17:14 UTC |
| a033233 | Jeff King | 23 January 2014, 19:55:18 UTC | t7700: do not use "touch" unnecessarily Some versions of touch (such as /usr/ucb/touch on Solaris) do not know about the "-r" option. This would make sense as a feature of test-chmtime, but fortunately this fix is even easier. The test does not care about the timestamp of the .keep file it creates at all, only that it exists. For such a use case, with or without portability issues around "-r", "touch" should not be used in the first place. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 21:13:20 UTC |
| 088304b | Jeff King | 23 January 2014, 19:54:57 UTC | t7501: fix "empty commit" test with NO_PERL t7501.9 tries to check that "git commit" will fail when the index is unchanged. It relies on previous tests not to have modified the index. When it was originally written, this was always the case. However, commit c65dc35 (t7501: test the right kind of breakage, 2012-03-30) changed earlier tests (4 and 5) to leave a modification in the index. We never noticed, however, because t7501.7, between the two, clears the index state as a side effect. However, that test depends on the PERL prerequisite, and so it does not always run. Therefore if NO_PERL is set, we do not run the intervening test, the index is left unclean, and t7501.9 fails. We could fix this by moving t7501.9 up in the script. However, this patch instead leaves it in place and adds a "git reset" before the commit. This makes the test more explicit about its preconditions, and will future-proof it against any other changes in the test state. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 21:11:07 UTC |
| 74b4f7f | Nguyễn Thái Ngọc Duy | 23 January 2014, 13:22:05 UTC | tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting() We do ignore trailing slash on a directory, so pathspec "abc/" matches directory "abc". A submodule is also a directory. Apply the same logic to it. This makes "git log submodule-path" and "git log submodule-path/" produce the same output. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 21:03:00 UTC |
| b861e23 | Jeff King | 23 January 2014, 01:30:13 UTC | repack: propagate pack-objects options as strings In the original shell version of git-repack, any options destined for pack-objects were left as strings, and passed as a whole. Since the C rewrite in commit a1bbc6c (repack: rewrite the shell script in C, 2013-09-15), we now parse these values to integers internally, then reformat the integers when passing the option to pack-objects. This has the advantage that we catch format errors earlier (i.e., when repack is invoked, rather than when pack-objects is invoked). It has three disadvantages, though: 1. Our internal data types may not be the right size. In the case of "--window-memory" and "--max-pack-size", these are "unsigned long" in pack-objects, but we can only represent a regular "int". 2. Our parsing routines might not be the same as those of pack-objects. For the two options above, pack-objects understands "100m" to mean "100 megabytes", but repack does not. 3. We have to keep a sentinel value to know whether it is worth passing the option along. In the case of "--window-memory", we currently do not pass it if the value is "0". But that is a meaningful value to pack-objects, where it overrides any configured value. We can fix all of these by simply passing the strings from the user along to pack-objects verbatim. This does not actually fix anything for "--depth" or "--window", but these are converted, too, for consistency. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 18:34:53 UTC |
| aa8bd51 | Jeff King | 23 January 2014, 01:28:30 UTC | repack: make parsed string options const-correct When we use OPT_STRING to parse an option, we get back a pointer into the argv array, which should be "const char *". The compiler doesn't notice because it gets passed through a "void *" in the option struct. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 18:34:51 UTC |
| 44b96ec | Jeff King | 23 January 2014, 01:27:52 UTC | repack: fix typo in max-pack-size option When we see "--max-pack-size", we accidentally propagated this to pack-objects as "--max_pack_size", which does not work at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 18:34:49 UTC |
| b594c97 | Johannes Sixt | 23 January 2014, 07:28:58 UTC | Makefile: Fix compilation of Windows resource file If the git version number consists of less than three period separated numbers, then the Windows resource file compilation issues a syntax error: $ touch git.rc $ make V=1 git.res GIT_VERSION = 1.9.rc0 windres -O coff \ -DMAJOR=1 -DMINOR=9 -DPATCH=rc0 \ -DGIT_VERSION="\\\"1.9.rc0\\\"" git.rc -o git.res C:\msysgit\msysgit\mingw\bin\windres.exe: git.rc:2: syntax error make: *** [git.res] Error 1 $ Note that -DPATCH=rc0. The values passed via -DMAJOR=, -DMINOR=, and -DPATCH= are used in FILEVERSION and PRODUCTVERSION statements, which expect up to four numeric values. These version numbers are intended for machine consumption. They are typically inspected by installers to decide whether a file to be installed is newer than one that exists on the system, but are not used for much else. We can be pretty certain that there are no tools that look at these version numbers, not even the installer of Git for Windows does. Therefore, to fix the syntax error, fill in only the first two numbers, which we are guaranteed to find in Git version numbers. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Pat Thoyts <patthoyts@users.sourceforge.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 January 2014, 18:00:28 UTC |
| b21c0bc | Junio C Hamano | 23 January 2014, 16:51:14 UTC | Merge git://git.bogomips.org/git-svn * 'master' of git://git.bogomips.org/git-svn: git-svn: memoize _rev_list and rebuild | 23 January 2014, 16:51:14 UTC |
| 2dbfa67 | Junio C Hamano | 23 January 2014, 16:50:50 UTC | Merge git://ozlabs.org/~paulus/gitk * 'master' of git://ozlabs.org/~paulus/gitk: gitk: Indent word-wrapped lines in commit display header gitk: Comply with XDG base directory specification gitk: Replace "next" and "prev" buttons with down and up arrows gitk: chmod +x po2msg.sh gitk: Update copyright dates gitk: Add Bulgarian translation (304t) gitk: Fix mistype | 23 January 2014, 16:50:50 UTC |
| 76d64ca | Paul Mackerras | 23 January 2014, 11:06:22 UTC | gitk: Indent word-wrapped lines in commit display header In the cases where the lines starting with Precedes:, Follows: and Branches: in the commit display are long enough to be word-wrapped, this adds a 1cm margin on the left of the wrapped lines, to make the display more readable. Suggested by Stephen Rothwell. Signed-off-by: Paul Mackerras <paulus@samba.org> | 23 January 2014, 11:06:22 UTC |
| ab0bcec | lin zuojian | 23 January 2014, 02:15:19 UTC | git-svn: memoize _rev_list and rebuild According to profile data, _rev_list and rebuild consume a large portion of time. Memoize the results of _rev_list and memoize rebuild internals to avoid subprocess invocation. When importing 15152 revisions on a LAN, time improved from 10 hours to 3-4 hours. Signed-off-by: lin zuojian <manjian2006@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net> | 23 January 2014, 02:54:26 UTC |
| f21e1c5 | Michael Haggerty | 22 January 2014, 11:23:20 UTC | Add cross-references between docs for for-each-ref and show-ref Add cross-references between the manpages for git-for-each-ref(1) and git-show-ref(1). Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2014, 20:08:39 UTC |
| 0f52740 | Michael Haggerty | 18 January 2014, 23:40:44 UTC | safe_create_leading_directories(): on Windows, \ can separate path components When cloning to a directory "C:\foo\bar" from Windows' cmd.exe where "foo" does not exist yet, Git would throw an error like fatal: could not create work tree dir 'c:\foo\bar'.: No such file or directory Fix this by not hard-coding a platform specific directory separator into safe_create_leading_directories(). This patch, including its entire commit message, is derived from a patch by Sebastian Schuberth. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2014, 19:00:07 UTC |
| f84cb68 | Pete Wyckoff | 21 January 2014, 23:16:48 UTC | git p4 doc: use two-line style for options with multiple spellings Thomas Rast noticed the docs have a mix of styles when it comes to options with multiple spellings. Standardize the couple in git-p4.txt that are odd. Instead of: -n, --dry-run:: Do this: -n:: --dry-run:: See http://thread.gmane.org/gmane.comp.version-control.git/219936/focus=219945 Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2014, 16:06:20 UTC |
| 3d5388a | Pete Wyckoff | 21 January 2014, 23:16:47 UTC | git p4 test: examine behavior with locked (+l) files The p4 server can enforce file locking, so that only one user can edit a file at a time. Git p4 is unable to submit changes to locked files. Currently it exits poorly. Ideally it would notice the locked condition and clean up nicely. Add a bunch of tests that describe the problem, hoping that fixes appear in the future. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 January 2014, 16:06:19 UTC |
