| 1611eed | Maurício C Antunes | 20 July 2013, 16:33:20 UTC | hg-to-git: --allow-empty-message in git commit Do not fail to import mercurial commits with empty commit messages. Signed-off-by: Maurício C Antunes <mauricio.antunes@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 19:17:23 UTC |
| efc5e5e | Junio C Hamano | 23 July 2013, 19:10:06 UTC | Merge branch 'es/line-log-further-fixes' into tr/line-log * es/line-log-further-fixes: line-log: fix "log -LN" crash when N is last line of file range-set: satisfy non-empty ranges invariant t4211: demonstrate crash when first -L encountered is empty range t4211: demonstrate empty -L range crash range-set: fix sort_and_merge_range_set() corner case bug range_set: fix coalescing bug when range is a subset of another t4211: fix broken test when one -L range is subset of another | 23 July 2013, 19:10:06 UTC |
| df6308e | Eric Sunshine | 23 July 2013, 14:28:08 UTC | line-log: fix "log -LN" crash when N is last line of file range-set invariants are: ranges must be (1) non-empty, (2) disjoint, (3) sorted in ascending order. line_log_data_insert() breaks the non-empty invariant under the following conditions: the incoming range is empty and the pathname attached to the range has not yet been encountered. In this case, line_log_data_insert() assigns the empty range to a new line_log_data record without taking any action to ensure that the empty range is eventually folded out. Subsequent range-set functions crash or throw an assertion failure upon encountering such an anomaly. Fix this bug. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 19:09:48 UTC |
| f8395ed | Eric Sunshine | 23 July 2013, 14:28:06 UTC | range-set: satisfy non-empty ranges invariant range-set invariants are: ranges must be (1) non-empty, (2) disjoint, (3) sorted in ascending order. During processing, various range-set utility functions break the invariants (for instance, by adding empty ranges), with the expectation that a finalizing sort_and_merge_range_set() will restore sanity. sort_and_merge_range_set(), however, neglects to fold out empty ranges, thus it fails to satisfy the non-empty constraint. Subsequent range-set functions crash or throw an assertion failure upon encountering such an anomaly. Rectify the situation by having sort_and_merge_range_set() fold out empty ranges. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 19:09:14 UTC |
| 99780b0 | Eric Sunshine | 23 July 2013, 14:28:07 UTC | t4211: demonstrate crash when first -L encountered is empty range Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 19:08:15 UTC |
| 5896097 | Eric Sunshine | 23 July 2013, 14:28:05 UTC | t4211: demonstrate empty -L range crash Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Helped-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 19:06:58 UTC |
| b6679e7 | Eric Sunshine | 23 July 2013, 14:28:04 UTC | range-set: fix sort_and_merge_range_set() corner case bug When handed an empty range_set (range_set.nr == 0), sort_and_merge_range_set() incorrectly sets range_set.nr to 1 at exit. Subsequent range_set functions then access the bogus range at element zero and crash or throw an assertion failure. Fix this bug. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Acked-by: Thomas Rast <trast@inf.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 18:37:46 UTC |
| 6a90778 | Stefan Beller | 23 July 2013, 13:16:04 UTC | open_istream: remove unneeded check for null pointer 'st' is allocated via xmalloc a few lines before and passed to the stream opening functions. The xmalloc function is written in a way that either 'st' is allocated valid memory or xmalloc already dies. The function calls to open_istream_* do not change 'st', as the pointer is passed by reference and not a pointer of a pointer. Hence 'st' cannot be null at that part of the code. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 18:35:18 UTC |
| 9ae54a1 | Junio C Hamano | 23 July 2013, 17:09:49 UTC | Merge branch 'mv/merge-ff-tristate' * mv/merge-ff-tristate: t7600: fix typo in test title | 23 July 2013, 17:09:49 UTC |
| 6d2d43d | Junio C Hamano | 23 July 2013, 17:08:40 UTC | t7600: fix typo in test title Spotted by Ram, confirmed by Miklos. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 17:08:40 UTC |
| 1d25e77 | Michael Haggerty | 14 July 2013, 08:09:03 UTC | post-receive-email: deprecate script in favor of git-multimail Add a notice to the top of post-receive-email explaining that the script is no longer under active development and pointing the user to git-multimail. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 July 2013, 04:20:28 UTC |
| 749f763 | Ondřej Bílka | 22 July 2013, 21:02:23 UTC | typofix: in-code comments Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 23:06:49 UTC |
| 17b83d7 | Ondřej Bílka | 22 July 2013, 21:02:23 UTC | typofix: documentation Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 23:06:48 UTC |
| 1114fc0 | Ondřej Bílka | 22 July 2013, 21:02:23 UTC | typofix: release notes Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 23:06:48 UTC |
| 0bde8c0 | Junio C Hamano | 22 July 2013, 18:34:25 UTC | Sync with Git 1.8.3.4 | 22 July 2013, 18:34:25 UTC |
| 9c559d5 | Junio C Hamano | 22 July 2013, 18:34:10 UTC | Update draft release notes to 1.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 18:34:10 UTC |
| 3daafe9 | Junio C Hamano | 22 July 2013, 18:24:19 UTC | Merge branch 'jc/name-rev-exact-ref' Corrects the longstanding sloppiness in the implementation of name-rev that conflated "we take commit-ish" and "differences between tags and commits do not matter". * jc/name-rev-exact-ref: describe: fix --contains when a tag is given as input name-rev: differentiate between tags and commits they point at describe: use argv-array name-rev: allow converting the exact object name at the tip of a ref name-ref: factor out name shortening logic from name_ref() | 22 July 2013, 18:24:19 UTC |
| 07b83b5 | Junio C Hamano | 22 July 2013, 18:24:17 UTC | Merge branch 'rr/send-email-ssl-verify' Newer Net::SMTP::SSL module does not want the user programs to use the default behaviour to let server certificate go without verification, so by default enable the verification with a mechanism to turn it off if needed. * rr/send-email-ssl-verify: send-email: be explicit with SSL certificate verification | 22 July 2013, 18:24:17 UTC |
| e683889 | Junio C Hamano | 22 July 2013, 18:24:14 UTC | Merge branch 'es/check-mailmap' A new command to allow scripts to query the mailmap information. * es/check-mailmap: t4203: test check-mailmap command invocation builtin: add git-check-mailmap command | 22 July 2013, 18:24:14 UTC |
| 988f98f | Junio C Hamano | 22 July 2013, 18:24:11 UTC | Merge branch 'jx/clean-interactive' Add "interactive" mode to "git clean". The early part to refactor relative path related helper functions looked sensible. * jx/clean-interactive: test: run testcases with POSIX absolute paths on Windows test: add t7301 for git-clean--interactive git-clean: add documentation for interactive git-clean git-clean: add ask each interactive action git-clean: add select by numbers interactive action git-clean: add filter by pattern interactive action git-clean: use a git-add-interactive compatible UI git-clean: add colors to interactive git-clean git-clean: show items of del_list in columns git-clean: add support for -i/--interactive git-clean: refactor git-clean into two phases write_name{_quoted_relative,}(): remove redundant parameters quote_path_relative(): remove redundant parameter quote.c: substitute path_relative with relative_path path.c: refactor relative_path(), not only strip prefix test: add test cases for relative_path | 22 July 2013, 18:24:11 UTC |
| c714f9f | Junio C Hamano | 22 July 2013, 18:24:09 UTC | Merge branch 'hv/config-from-blob' Allow configuration data to be read from in-tree blob objects, which would help working in a bare repository and submodule updates. * hv/config-from-blob: do not die when error in config parsing of buf occurs teach config --blob option to parse config from database config: make parsing stack struct independent from actual data source config: drop cf validity check in get_next_char() config: factor out config file stack management | 22 July 2013, 18:24:09 UTC |
| 4c72ee8 | Junio C Hamano | 22 July 2013, 18:24:05 UTC | Merge branch 'mk/upload-pack-off-by-one-dead-code-removal' * mk/upload-pack-off-by-one-dead-code-removal: upload-pack: remove a piece of dead code | 22 July 2013, 18:24:05 UTC |
| a0c1aa2 | Junio C Hamano | 22 July 2013, 18:24:02 UTC | Merge branch 'jk/t0008-sigpipe-fix' Fix for recent test breakage on 'master'. * jk/t0008-sigpipe-fix: t0008: avoid SIGPIPE race condition on fifo | 22 July 2013, 18:24:03 UTC |
| d3aeb31 | Junio C Hamano | 22 July 2013, 18:24:00 UTC | Merge branch 'nd/const-struct-cache-entry' * nd/const-struct-cache-entry: Convert "struct cache_entry *" to "const ..." wherever possible | 22 July 2013, 18:24:01 UTC |
| e9f1a6c | Junio C Hamano | 22 July 2013, 18:23:59 UTC | Merge branch 'jk/gcc-function-attributes' Use the function attributes extension to catch mistakes in use of our own variadic functions that use NULL sentinel at the end (i.e. like execl(3)) and format strings (i.e. like printf(3)). * jk/gcc-function-attributes: Add the LAST_ARG_MUST_BE_NULL macro wt-status: use "format" function attribute for status_printf use "sentinel" function attribute for variadic lists add missing "format" function attributes | 22 July 2013, 18:23:59 UTC |
| d0b3fa8 | Junio C Hamano | 22 July 2013, 18:23:56 UTC | Merge branch 'db/show-ref-head' The "--head" option to "git show-ref" was only to add "HEAD" to the list of candidate refs to be filtered by the usual rules (e.g. "--heads" that only show refs under refs/heads). Change the meaning of the option to always show "HEAD" regardless of what filtering will be applied to any other ref (this is a backward incompatible change, so I may need to add an entry to the Release Notes). * db/show-ref-head: show-ref: make --head always show the HEAD ref | 22 July 2013, 18:23:56 UTC |
| e9682cc | Junio C Hamano | 22 July 2013, 18:23:53 UTC | Merge branch 'es/blame-L-breakage' The refactoring made for parsing "-L" option recently to support "git log -L" seems to have broken "git blame -L X,-5" to show 5 lines leading to X. * es/blame-L-breakage: blame-options.txt: explain that -L <start> and <end> are optional blame-options.txt: place each -L option variation on its own line t8001/t8002 (blame): add blame -L :funcname tests t8001/t8002 (blame): add blame -L tests t8001/t8002 (blame): modernize style line-range: fix "blame -L X,-N" regression | 22 July 2013, 18:23:53 UTC |
| cb29dfd | Junio C Hamano | 22 July 2013, 18:23:35 UTC | Merge branch 'tr/protect-low-3-fds' When "git" is spawned in such a way that any of the low 3 file descriptors is closed, our first open() may yield file descriptor 2, and writing error message to it would screw things up in a big way. * tr/protect-low-3-fds: git: ensure 0/1/2 are open in main() daemon/shell: refactor redirection of 0/1/2 from /dev/null | 22 July 2013, 18:23:35 UTC |
| 5701c3d | Junio C Hamano | 22 July 2013, 18:23:32 UTC | Merge branch 'sb/parse-object-buffer-eaten' * sb/parse-object-buffer-eaten: parse_object_buffer: correct freeing the buffer | 22 July 2013, 18:23:33 UTC |
| 4ca8ae7 | Junio C Hamano | 22 July 2013, 18:23:30 UTC | Merge branch 'tr/do-not-call-submodules-subprojects' * tr/do-not-call-submodules-subprojects: show-branch: fix description of --date-order apply, entry: speak of submodules instead of subprojects | 22 July 2013, 18:23:30 UTC |
| e2ecd25 | Junio C Hamano | 22 July 2013, 18:23:27 UTC | Merge branch 'mm/diff-no-patch-synonym-to-s' "git show -s" was less discoverable than it should be. * mm/diff-no-patch-synonym-to-s: Documentation/git-log.txt: capitalize section names Documentation: move description of -s, --no-patch to diff-options.txt Documentation/git-show.txt: include common diff options, like git-log.txt diff: allow --patch & cie to override -s/--no-patch diff: allow --no-patch as synonym for -s t4000-diff-format.sh: modernize style | 22 July 2013, 18:23:27 UTC |
| 8827a58 | Junio C Hamano | 22 July 2013, 18:23:24 UTC | Merge branch 'dw/request-pull-diag' * dw/request-pull-diag: request-pull: improve error message for invalid revision args | 22 July 2013, 18:23:24 UTC |
| fbf59cd | Junio C Hamano | 22 July 2013, 18:23:16 UTC | Merge branch 'jc/mailmap-case-insensitivity' The mailmap mechanism unnecessarily downcased the e-mail addresses in the output, and also ignored the human name when it is a single character name. This now has become Eric Sunshine's series, even though it still is under jc/ hierarchy. * jc/mailmap-case-insensitivity: mailmap: style fixes mailmap: debug: avoid passing NULL to fprintf() '%s' conversion specification mailmap: debug: eliminate -Wformat field precision type warning mailmap: debug: fix malformed fprintf() format conversion specification mailmap: debug: fix out-of-order fprintf() arguments mailmap: do not downcase mailmap entries t4203: demonstrate loss of uppercase characters in canonical email mailmap: do not lose single-letter names t4203: demonstrate loss of single-character name in mailmap entry | 22 July 2013, 18:23:16 UTC |
| 1d1934c | Junio C Hamano | 22 July 2013, 18:23:12 UTC | Merge branch 'tr/fd-gotcha-fixes' Two places we did not check return value (expected to be a file descriptor) correctly. * tr/fd-gotcha-fixes: run-command: dup_devnull(): guard against syscalls failing git_mkstemps: correctly test return value of open() | 22 July 2013, 18:23:13 UTC |
| 6a5b9ce | Junio C Hamano | 22 July 2013, 18:23:10 UTC | Merge branch 'mm/color-auto-default' A finishing touch to fix breakage to "add -e" caused by defaulting ui.color to "auto". * mm/color-auto-default: git add -e: Explicitly specify that patch should have no color | 22 July 2013, 18:23:10 UTC |
| 06cbc13 | Junio C Hamano | 22 July 2013, 18:23:06 UTC | Merge branch 'jc/simple-add-must-be-a-no-op' This detected a mismerge of one of "add-2.0" topics to the 'jch' and 'pu' branches. * jc/simple-add-must-be-a-no-op: t2202: make sure "git add" (no args) stays a no-op | 22 July 2013, 18:23:07 UTC |
| 117eea7 | Junio C Hamano | 22 July 2013, 18:21:34 UTC | Git 1.8.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 18:21:34 UTC |
| efe6de6 | Ondřej Bílka | 22 July 2013, 08:02:17 UTC | update URL to the marc.info mail archive The name marc.theaimsgroup.com is no longer active, and has migrated to marc.info. Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 17:11:18 UTC |
| 805c5a5 | Junio C Hamano | 22 July 2013, 06:03:46 UTC | Sync with maint * maint: Update draft release notes to 1.8.3.4 t9801: git-p4: check ignore files with client spec | 22 July 2013, 06:03:46 UTC |
| 31fe405 | Junio C Hamano | 22 July 2013, 06:02:53 UTC | Update draft release notes to 1.8.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 06:03:19 UTC |
| 281ff45 | Junio C Hamano | 22 July 2013, 05:51:45 UTC | Merge branch 'rr/maint-fetch-tag-doc-asterisks' into maint * rr/maint-fetch-tag-doc-asterisks: fetch-options.txt: prevent a wildcard refspec from getting misformatted | 22 July 2013, 05:51:45 UTC |
| 5607c74 | Junio C Hamano | 22 July 2013, 05:51:43 UTC | Merge branch 'dk/maint-t5150-dirname' into maint * dk/maint-t5150-dirname: tests: allow sha1's as part of the path | 22 July 2013, 05:51:43 UTC |
| 25b3e4f | Junio C Hamano | 22 July 2013, 05:51:41 UTC | Merge branch 'dk/version-gen-gitdir' into maint * dk/version-gen-gitdir: GIT-VERSION-GEN: support non-standard $GIT_DIR path | 22 July 2013, 05:51:41 UTC |
| b6538a0 | Junio C Hamano | 22 July 2013, 05:51:39 UTC | Merge branch 'nk/config-local-doc' into maint * nk/config-local-doc: config: Add description of --local option | 22 July 2013, 05:51:39 UTC |
| eac00c5 | Junio C Hamano | 22 July 2013, 05:51:37 UTC | Merge branch 'kb/diff-blob-blob-doc' into maint * kb/diff-blob-blob-doc: Documentation: Move "git diff <blob> <blob>" | 22 July 2013, 05:51:37 UTC |
| 4f9f1f5 | Junio C Hamano | 22 July 2013, 05:51:32 UTC | Merge branch 'mm/merge-in-dirty-worktree-doc' into maint * mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes | 22 July 2013, 05:51:32 UTC |
| 80f0743 | Junio C Hamano | 22 July 2013, 05:51:29 UTC | Merge branch 'ph/builtin-srcs-are-in-subdir-these-days' into maint * ph/builtin-srcs-are-in-subdir-these-days: fix "builtin-*" references to be "builtin/*" | 22 July 2013, 05:51:29 UTC |
| 8c091d9 | Junio C Hamano | 22 July 2013, 05:51:24 UTC | Merge branch 'ft/doc-git-transport' into maint * ft/doc-git-transport: documentation: add git:// transport security notice | 22 July 2013, 05:51:24 UTC |
| dbed593 | Junio C Hamano | 22 July 2013, 05:51:22 UTC | Merge branch 'mh/maint-lockfile-overflow' into maint * mh/maint-lockfile-overflow: lockfile: fix buffer overflow in path handling | 22 July 2013, 05:51:22 UTC |
| 82ec54d | Junio C Hamano | 22 July 2013, 05:48:13 UTC | Merge branch 'jc/maint-diff-core-safecrlf' into maint Avoid failing "git diff" when core.safecrlf is set to true, because the user cannot tell where the breakage is in preparation for fixing and committing. * jc/maint-diff-core-safecrlf: diff: demote core.safecrlf=true to core.safecrlf=warn | 22 July 2013, 05:48:13 UTC |
| c28facd | Mark Levedahl | 19 July 2013, 23:08:27 UTC | cygwin: stop forcing core.filemode=false We force core.filemode=false since c869753e (Force core.filemode to false on Cygwin., 2006-12-30), even when the repository is on a filesystem on which Cygwin can give us trustable filemodes, because many native Windows applications the users use to edit files in the working tree tend to (re)create files with executable bit randomly set or reset. However, binary distribution of Git that is supplied by the downstream project to its users has been built without this consideration. Drop NO_TRUSTABLE_FILEMODE from our default configuration so that hand-compiled Git out of box will match theirs. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 05:03:31 UTC |
| f593ef7 | Mark Levedahl | 19 July 2013, 23:08:30 UTC | Cygwin 1.7 supports mmap git has shipped for years with MMAP enabled in the stock distribution, there are no reports of problems / failures on the list relating to this. Leave the default as-is on v1.5 due to lack of knowlege of this working on earlier Cygwin. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 05:03:09 UTC |
| 103d530 | Mark Levedahl | 19 July 2013, 23:08:29 UTC | Cygwin 1.7 has thread-safe pread Per http://cygwin.com/ml/cygwin/2012-07/msg00331.html , cygwin 1.7 was modified to explicitly support git's use of pread, so make this the default. Do not affect earlier cygwin versions. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 05:03:09 UTC |
| 92f63d2 | Mark Levedahl | 19 July 2013, 23:08:28 UTC | Cygwin 1.7 needs compat/regex Cygwin v1.7 uses the regex library from newlib which does not pass git's tests, so don't use it. This fixes failures in t4018 and t4034. Continue to use the platform supplied regex library for earlier versions. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 July 2013, 05:03:09 UTC |
| 7c8ce4e | Vitor Antunes | 18 July 2013, 23:04:53 UTC | t9801: git-p4: check ignore files with client spec This test confirms that a file can be ignored during git p4 sync if if is excluded in P4 client specification. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:34:10 UTC |
| acb01a3 | Eric Sunshine | 21 July 2013, 10:52:42 UTC | contrib: contacts: add documentation Assuming that git-contacts may some day be promoted to a core git command, the documentation is written and formatted as if it already belongs in Documentation/ even though it presently resides in contrib/contacts. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:15:20 UTC |
| 7c6d6ff | Eric Sunshine | 21 July 2013, 10:52:41 UTC | contrib: contacts: add mailmap support The purpose of git-contacts is to determine a list of people who might have some interest in a patch or set of changes. It can be used as git-send-email's --cc-cmd argument or the computed list might be used to ask for comments on a proposed change. As such, it is important to report up-to-date email addresses in the computed list rather than potentially outdated ones recorded with commits. Apply git's mailmap functionality to the retrieved contacts in order to achieve this goal. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:14:43 UTC |
| ccf6b45 | Eric Sunshine | 21 July 2013, 10:52:40 UTC | contrib: contacts: interpret committish akin to format-patch As a convenience, accept the same style <since> committish as accepted by git-format-patch. For example: % git contacts origin will consider commits in the current branch built atop 'origin', just as "git format-patch origin" will format commits built atop 'origin'. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:13:42 UTC |
| 8e7c4a8 | Eric Sunshine | 21 July 2013, 10:52:39 UTC | contrib: contacts: add ability to parse from committish For example: % git contacts R1..R2 Committishes and patch files can be mentioned in the same invocation: % git contacts R1..R2 extra/*.patch Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:13:16 UTC |
| 4d06402 | Eric Sunshine | 21 July 2013, 10:52:38 UTC | contrib: add git-contacts helper This script lists people that might be interested in a patch by going back through the history for each patch hunk, and finding people that reviewed, acknowledged, signed, authored, or were Cc:'d on the code the patch is modifying. It does this by running git-blame incrementally on each hunk and then parsing the commit message. After gathering all participants, it determines each person's relevance by considering how many commits mentioned that person compared with the total number of commits under consideration. The final output consists only of participants who pass a minimum threshold of participation. Several conditions controlling a person's significance are currently hard-coded, such as minimum participation level, blame date-limiting, and -C level for detecting moved and copied lines. In the future, these conditions may become configurable. For example: % git contacts 0001-remote-hg-trivial-cleanups.patch Felipe Contreras <felipe.contreras@gmail.com> Jeff King <peff@peff.net> Max Horn <max@quendi.de> Junio C Hamano <gitster@pobox.com> Thus, it can be invoked as git-send-email's --cc-cmd option, among other possible uses. This is a Perl rewrite of Felipe Contreras' git-related patch series[1] written in Ruby. [1]: http://thread.gmane.org/gmane.comp.version-control.git/226065/ Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:12:30 UTC |
| f1e2a48 | Benoit Sigoure | 21 July 2013, 19:54:08 UTC | Revert "compat/unsetenv.c: Fix a sparse warning" This reverts commit ec535cc27e6c4f5e0b1d157e04f5511f166ecd9d. POSIX explicitly states "the [environ] variable, which must be declared by the user if it is to be used directly". Not declaring it causes compilation to fail on OS X. Instead don't declare the variable on MinGW, as it causes a spurious warning there. Signed-off-by: Benoit Sigoure <tsunanet@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 July 2013, 22:09:56 UTC |
| 76b6235 | Junio C Hamano | 20 July 2013, 03:57:01 UTC | t2202: make sure "git add" (no args) stays a no-op Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 July 2013, 04:32:33 UTC |
| a04f819 | Stefan Beller | 19 July 2013, 20:26:32 UTC | traverse_trees(): clarify return value of the callback The variable name "ret" sounds like the variable to be returned, but since e6c111b4 we return error, and it is misleading. As this variable tells us which trees in t[] array were used in the callback function, so that this caller can know the entries in which of the trees need advancing, "trees_used" is a better name. Also the assignment to 0 was removed at the start of the function as well after the "if (interesting)" block. Those are unneeded as that variable is set to the callback return value any time we enter the "if (interesting)" block, so we'd overwrite old values anyway. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 22:29:41 UTC |
| 7f3b8c6 | Andrew Wong | 18 July 2013, 22:58:04 UTC | git add -e: Explicitly specify that patch should have no color After 4c7f1819 (make color.ui default to 'auto', 2013-06-10), the patch file to be edited during 'git add -e' receives all the color codes. This is because diffopt.use_color defaults to -1, which causes want_color to now return 'auto'. By explicitly setting use_color to 0, we can ensure the diff output has no color codes in it. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 18:20:28 UTC |
| e3d4493 | Junio C Hamano | 19 July 2013, 18:15:48 UTC | Sync with maint | 19 July 2013, 18:15:48 UTC |
| f893b74 | Junio C Hamano | 19 July 2013, 17:59:36 UTC | Start preparing for 1.8.3.4 Hopefully this will be the final maintenance release before we go to feature freeze for 1.8.4. | 19 July 2013, 18:15:17 UTC |
| 1f976bd | Stefan Beller | 18 July 2013, 21:35:27 UTC | apply.c::find_name_traditional(): do not initialize len to the line's length The variable len is set to len = strchrnul(line, '\n') - line; unconditionally 9 lines later, hence we can remove the call to strlen. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 18:15:17 UTC |
| 3def06e | Stefan Beller | 18 July 2013, 21:35:26 UTC | http-push.c::add_send_request(): do not initialize transfer_request That pointer will be assigned to new memory via request = xmalloc(sizeof(*request)); 20 lines later unconditionally anyway, so it's safe to not assign it to an arbitrary variable. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 18:15:17 UTC |
| 98aa2ea | Junio C Hamano | 19 July 2013, 17:43:13 UTC | Merge branch 'tr/test-lint-no-export-assignment-in-shell' into maint * tr/test-lint-no-export-assignment-in-shell: test-lint: detect 'export FOO=bar' t9902: fix 'test A == B' to use = operator | 19 July 2013, 17:43:13 UTC |
| 871ed78 | Junio C Hamano | 19 July 2013, 17:43:08 UTC | Merge branch 'rr/name-rev-stdin-doc' into maint * rr/name-rev-stdin-doc: name-rev doc: rewrite --stdin paragraph | 19 July 2013, 17:43:08 UTC |
| ba5831f | Junio C Hamano | 19 July 2013, 17:43:05 UTC | Merge branch 'ft/diff-rename-default-score-is-half' into maint * ft/diff-rename-default-score-is-half: diff-options: document default similarity index | 19 July 2013, 17:43:05 UTC |
| 069dba2 | Junio C Hamano | 19 July 2013, 17:43:01 UTC | Merge branch 'jc/t1512-fix' into maint * jc/t1512-fix: get_short_sha1(): correctly disambiguate type-limited abbreviation t1512: correct leftover constants from earlier edition | 19 July 2013, 17:43:02 UTC |
| e6d6911 | Junio C Hamano | 19 July 2013, 17:42:57 UTC | Merge branch 'vl/typofix' into maint * vl/typofix: random typofixes (committed missing a 't', successful missing an 's') | 19 July 2013, 17:42:57 UTC |
| 0b57758 | Junio C Hamano | 19 July 2013, 17:42:52 UTC | Merge branch 'wk/doc-git-has-grown' into maint * wk/doc-git-has-grown: user-manual: Update download size for Git and the kernel | 19 July 2013, 17:42:52 UTC |
| b002bb8 | Junio C Hamano | 19 July 2013, 17:42:49 UTC | Merge branch 'ys/cygstart' into maint * ys/cygstart: web--browse: support /usr/bin/cygstart on Cygwin | 19 July 2013, 17:42:49 UTC |
| bd54df0 | Junio C Hamano | 19 July 2013, 17:42:46 UTC | Merge branch 'mm/push-force-is-dangerous' into maint * mm/push-force-is-dangerous: Documentation/git-push.txt: explain better cases where --force is dangerous | 19 July 2013, 17:42:46 UTC |
| 52c1999 | Junio C Hamano | 19 July 2013, 17:42:18 UTC | Merge branch 'rs/logical-vs-binary-or' into maint * rs/logical-vs-binary-or: use logical OR (||) instead of binary OR (|) in logical context | 19 July 2013, 17:42:18 UTC |
| 6ddc862 | Junio C Hamano | 19 July 2013, 17:41:22 UTC | Merge branch 'js/test-ln-s-add' into maint * js/test-ln-s-add: t4011: remove SYMLINKS prerequisite t6035: use test_ln_s_add to remove SYMLINKS prerequisite t3509, t4023, t4114: use test_ln_s_add to remove SYMLINKS prerequisite t3100: use test_ln_s_add to remove SYMLINKS prerequisite t3030: use test_ln_s_add to remove SYMLINKS prerequisite t0000: use test_ln_s_add to remove SYMLINKS prerequisite tests: use test_ln_s_add to remove SYMLINKS prerequisite (trivial cases) tests: introduce test_ln_s_add t3010: modernize style test-chmtime: Fix exit code on Windows | 19 July 2013, 17:41:23 UTC |
| 211e76d | Junio C Hamano | 19 July 2013, 17:41:01 UTC | Merge branch 'jk/apache-test-for-2.4' into maint Allow our tests to run with newer Apache. * jk/apache-test-for-2.4: lib-httpd/apache.conf: check version only after mod_version loads t/lib-httpd/apache.conf: configure an MPM module for apache 2.4 t/lib-httpd/apache.conf: load compat access module in apache 2.4 t/lib-httpd/apache.conf: load extra auth modules in apache 2.4 t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4 | 19 July 2013, 17:41:01 UTC |
| 8589a74 | Junio C Hamano | 19 July 2013, 17:40:57 UTC | Merge branch 'tr/test-commit-only-on-orphan' into maint * tr/test-commit-only-on-orphan: Test 'commit --only' after 'checkout --orphan' | 19 July 2013, 17:40:57 UTC |
| 509152d | Junio C Hamano | 19 July 2013, 17:40:53 UTC | Merge branch 'sb/archive-zip-double-assignment-fix' into maint * sb/archive-zip-double-assignment-fix: archive-zip:write_zip_entry: Remove second reset of size variable to zero. | 19 July 2013, 17:40:53 UTC |
| 6741edc | Junio C Hamano | 19 July 2013, 17:39:12 UTC | Merge branch 'th/bisect-skip-report-range-fix' into maint The bisect log listed incorrect commits when bisection ends with only skipped ones. * th/bisect-skip-report-range-fix: bisect: Fix log output for multi-parent skip ranges | 19 July 2013, 17:39:12 UTC |
| afebd68 | Junio C Hamano | 19 July 2013, 17:39:09 UTC | Merge branch 'rs/tar-tests' into maint * rs/tar-tests: t5000: test long filenames t5000: simplify tar-tree tests t5000: use check_tar for prefix test t5000: factor out check_tar t5000, t5003: create directories for extracted files lazily t5000: integrate export-subst tests into regular tests | 19 July 2013, 17:39:10 UTC |
| 439b55b | Junio C Hamano | 19 July 2013, 17:39:06 UTC | Merge branch 'rr/column-doc' into maint * rr/column-doc: column doc: rewrite documentation for column.ui | 19 July 2013, 17:39:06 UTC |
| 65ed868 | Junio C Hamano | 19 July 2013, 17:39:01 UTC | Merge branch 'rs/discard-index-discard-array' into maint * rs/discard-index-discard-array: read-cache: free cache in discard_index read-cache: add simple performance test | 19 July 2013, 17:39:01 UTC |
| 7f05e4a | Junio C Hamano | 19 July 2013, 17:38:18 UTC | Merge branch 'tr/coverage' into maint The test coverage framework was left broken for some time. * tr/coverage: coverage: build coverage-untested-functions by default coverage: set DEFAULT_TEST_TARGET to avoid using prove coverage: do not delete .gcno files before building coverage: split build target into compile and test | 19 July 2013, 17:38:18 UTC |
| debecc5 | Stefan Beller | 19 July 2013, 16:26:24 UTC | Documentation: "git reset <tree-ish> <pathspec>" takes a tree-ish, not tree-sh Reported-By: Ibrahim M. Ghazal <imgx64@gmail.com> Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 17:15:09 UTC |
| 9fe3edc | Ramsay Jones | 18 July 2013, 20:02:12 UTC | Add the LAST_ARG_MUST_BE_NULL macro The sentinel function attribute is not understood by versions of the gcc compiler prior to v4.0. At present, for earlier versions of gcc, the build issues 108 warnings related to the unknown attribute. In order to suppress the warnings, we conditionally define the LAST_ARG_MUST_BE_NULL macro to provide the sentinel attribute for gcc v4.0 and newer. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 July 2013, 16:26:15 UTC |
| 97669ee | Mark Levedahl | 18 July 2013, 21:44:57 UTC | test-lib.sh - define and use GREP_STRIPS_CR Define a common macro for grep needing -U to allow tests to not need to inquire of specific platforms needing this option. Change t3032 and t5560 to use this rather than testing explicitly for mingw. This fixes these two tests on Cygwin. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 23:44:40 UTC |
| d099b71 | Ramsay Jones | 18 July 2013, 20:25:50 UTC | Fix some sparse warnings Sparse issues some "Using plain integer as NULL pointer" warnings. Each warning relates to the use of an '{0}' initialiser expression in the declaration of an 'struct object_info'. The first field of this structure has pointer type. Thus, in order to suppress these warnings, we replace the initialiser expression with '{NULL}'. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 23:43:47 UTC |
| 8c3ca72 | Jonathon Mah | 18 July 2013, 16:53:55 UTC | Documentation: fix git-prune example usage Signed-off-by: Jonathon Mah <me@JonathonMah.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 23:23:51 UTC |
| 4a81bfa | Jonathon Mah | 18 July 2013, 16:53:25 UTC | Documentation: remove --prune from pack-refs examples The option has been the default for a while, and doesn't otherwise appear in the page. Signed-off-by: Jonathon Mah <me@JonathonMah.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 23:23:46 UTC |
| 35035bb | Ramkumar Ramachandra | 18 July 2013, 16:53:11 UTC | send-email: be explicit with SSL certificate verification When initiating an SSL connection without explicitly specifying the SSL certificate verification mode, Net::SMTP::SSL defaults to no verification, but recent versions of the module gives a warning against this use of the default. Enable certificate verification by default, using /etc/ssl/certs as the default path for certificates of certificate authorities. This path can be overriden by the --smtp-ssl-cert-path command line option and the sendemail.smtpSSLCertPath configuration variable. Passing an empty string as the path for CA certificates path disables the SSL certificate verification explicitly, which does not trigger the warning from recent versions of Net::SMTP::SSL. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Helped-by: Brian M. Carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 23:01:30 UTC |
| adfc185 | Junio C Hamano | 18 July 2013, 21:46:51 UTC | describe: fix --contains when a tag is given as input "git describe" takes a commit and gives it a name based on tags in its neighbourhood. The command does take a commit-ish but when given a tag that points at a commit, it should dereference the tag before computing the name for the commit. As the whole processing is internally delegated to name-rev, if we unwrap tags down to the underlying commit when invoking name-rev, it will make the name-rev issue an error message based on the unwrapped object name (i.e. either 40-hex object name, or "$tag^0") that is different from what the end-user gave to the command when the commit cannot be described. Introduce an internal option --peel-tag to the name-rev to tell it to unwrap a tag in its input from the command line. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 22:16:23 UTC |
| 118aa4a | Junio C Hamano | 18 July 2013, 21:11:35 UTC | name-rev: differentiate between tags and commits they point at "git name-rev --stdin" has been fixed to convert an object name that points at a tag to a refname of the tag. The codepath to handle its command line arguments, however, fed the commit that the tag points at to the underlying naming machinery. With this fix, you will get this: $ git name-rev --refs=tags/\* --name-only $(git rev-parse v1.8.3 v1.8.3^0) v1.8.3 v1.8.3^0 which is the same as what you would get from the fixed "--stdin" variant: $ git rev-parse v1.8.3 v1.8.3^0 | git name-rev --refs=tags/\* --name-only v1.8.3 v1.8.3^0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 22:16:23 UTC |
| b72c616 | Junio C Hamano | 18 July 2013, 19:57:38 UTC | Update draft release notes to 1.8.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 July 2013, 20:00:08 UTC |
| 30f7ad0 | Junio C Hamano | 18 July 2013, 19:59:59 UTC | Merge branch 'jc/revert-clone-doc-update-for-push-from-shallow' * jc/revert-clone-doc-update-for-push-from-shallow: Revert "git-clone.txt: remove the restriction on pushing from a shallow clone" | 18 July 2013, 20:00:00 UTC |
| cbc7fdf | Junio C Hamano | 18 July 2013, 19:59:58 UTC | Merge branch 'rs/mailmap-himself' * rs/mailmap-himself: .mailmap: René Scharfe has a new email address | 18 July 2013, 19:59:58 UTC |
| ec1b80b | Junio C Hamano | 18 July 2013, 19:59:56 UTC | Merge branch 'sb/mailmap-updates' * sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons .mailmap: Combine more (email, name) to individual persons .mailmap: Map email addresses to names | 18 July 2013, 19:59:56 UTC |
| 802f878 | Junio C Hamano | 18 July 2013, 19:59:41 UTC | Merge branch 'jk/in-pack-size-measurement' "git cat-file --batch-check=<format>" is added, primarily to allow on-disk footprint of objects in packfiles (often they are a lot smaller than their true size, when expressed as deltas) to be reported. * jk/in-pack-size-measurement: pack-revindex: radix-sort the revindex pack-revindex: use unsigned to store number of objects cat-file: split --batch input lines on whitespace cat-file: add %(objectsize:disk) format atom cat-file: add --batch-check=<format> cat-file: refactor --batch option parsing cat-file: teach --batch to stream blob objects t1006: modernize output comparisons teach sha1_object_info_extended a "disk_size" query zero-initialize object_info structs | 18 July 2013, 19:59:41 UTC |
