| 652d2bf | Junio C Hamano | 31 July 2013, 19:38:21 UTC | Merge branch 'ds/doc-two-kinds-of-tags' * ds/doc-two-kinds-of-tags: docs/git-tag: explain lightweight versus annotated tags | 31 July 2013, 19:38:21 UTC |
| 5ecc4b5 | Junio C Hamano | 31 July 2013, 19:38:15 UTC | Merge branch 'rr/maint-tilde-markup-in-doc' * rr/maint-tilde-markup-in-doc: config doc: quote paths, fixing tilde-interpretation | 31 July 2013, 19:38:15 UTC |
| f1093b0 | Junio C Hamano | 31 July 2013, 19:38:11 UTC | Merge branch 'mh/packed-refs-do-one-ref-recursion' Fix a NULL-pointer dereference during nested iterations over references (for example, when replace references are being used). * mh/packed-refs-do-one-ref-recursion: do_one_ref(): save and restore value of current_ref | 31 July 2013, 19:38:12 UTC |
| 35f5eaa | Junio C Hamano | 30 July 2013, 16:16:42 UTC | Merge branch 'jk/capabilities-doc' * jk/capabilities-doc: document 'allow-tip-sha1-in-want' capability document 'quiet' receive-pack capability document 'agent' protocol capability docs: note that receive-pack knows side-band-64k capability docs: fix 'report-status' protocol capability thinko | 30 July 2013, 16:16:42 UTC |
| 3717c73 | Junio C Hamano | 30 July 2013, 16:16:39 UTC | Merge branch 'sb/mailmap-updates' * sb/mailmap-updates: .mailmap: combine more (email, name) to individual persons | 30 July 2013, 16:16:40 UTC |
| 1ddc11a | Junio C Hamano | 30 July 2013, 16:16:36 UTC | Merge branch 'bc/completion-for-bash-3.0' * bc/completion-for-bash-3.0: git-completion.bash: replace zsh notation that breaks bash 3.X | 30 July 2013, 16:16:37 UTC |
| 8e943c2 | Michal Sojka | 30 July 2013, 08:16:09 UTC | contrib/subtree: Fix make install target If the libexec directory doesn't exist, git-subtree gets installed as $prefix/share/libexec/git-core file. This patch creates the directory before installing git-subtree file into it. Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 July 2013, 14:50:23 UTC |
| 98e023d | Ondřej Bílka | 29 July 2013, 08:18:21 UTC | many small typofixes Signed-off-by: Ondřej Bílka <neleai@seznam.cz> Reviewed-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 19:32:25 UTC |
| ac1998d | Ralf Thielow | 29 July 2013, 04:24:43 UTC | git-rebase: fix typo Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 17:32:03 UTC |
| 19c3c5f | Lukas Fleischer | 27 July 2013, 12:11:33 UTC | Avoid using `echo -n` anywhere `echo -n` is non-portable. The POSIX specification says: Conforming applications that wish to do prompting without <newline> characters or that could possibly be expecting to echo a -n, should use the printf utility derived from the Ninth Edition system. Since all of the affected shell scripts use a POSIX shell shebang, replace `echo -n` invocations with printf. Signed-off-by: Lukas Fleischer <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 16:56:58 UTC |
| d7a1d62 | Ramsay Jones | 27 July 2013, 19:00:07 UTC | commit-slab.h: Fix memory allocation and addressing The slab initialization code includes the calculation of the slab 'elem_size', which is in turn used to determine the size (capacity) of the slab. Each element of the slab represents an array, of length 'stride', of 'elemtype'. (Note that it may be clearer if the define_commit_slab macro parameter was called 'basetype' rather than 'elemtype'). However, the 'elem_size' calculation incorrectly uses 'sizeof(struct slabname)' in the expression, rather than 'sizeof(elemtype)'. Within the slab access routine, <slabname>_at(), the given commit 'index' is transformed into an (slab#, slot#) pair used to address the required element (a pointer to the first element of the array of 'elemtype' associated with that commit). The current code to calculate these address coordinates multiplies the commit index by the 'stride' which, at least for the slab#, produces the wrong result. Using the commit index directly, without scaling by the 'stride', produces the correct 'logical' address. Also, when allocating a new slab, the size of the allocation only allows for a slab containing elements of single element arrays of 'elemtype'. This should allow for elements of an array of length 'stride' of 'elemtype'. In order to fix this, we need to change the element size parameter to xcalloc() by multiplying the current element size (sizeof(**s->slab)) by the s->stride. Having changed the calculation of the slot#, we now need to convert the logical 'nth_slot', by scaling with s->stride, into the correct physical address. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 15:44:29 UTC |
| c17592a | Jeff King | 26 July 2013, 23:39:28 UTC | commit: tweak empty cherry pick advice for sequencer When we refuse to make an empty commit, we check whether we are in a cherry-pick in order to give better advice on how to proceed. We instruct the user to repeat the commit with "--allow-empty" to force the commit, or to use "git reset" to skip it and abort the cherry-pick. In the case of a single cherry-pick, the distinction between skipping and aborting is not important, as there is no more work to be done afterwards. When we are using the sequencer to cherry pick a series of commits, though, the instruction is confusing: does it skip this commit, or does it abort the rest of the cherry-pick? It does skip, after which the user can continue the cherry-pick. This is the right thing to be advising the user to do, but let's make it more clear what will happen, both by using the word "skip", and by mentioning that the rest of the sequence can be continued via "cherry-pick --continue" (whether we skip or take the commit). Noticed-by: Ramkumar Ramachandra <artagnon@gmail.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 15:17:06 UTC |
| 29d5553 | Daniele Segato | 26 July 2013, 19:06:02 UTC | docs/git-tag: explain lightweight versus annotated tags Stress the difference between the two with a suggestion on when the user should use one in place of the other. Signed-off-by: Daniele Segato <daniele.segato@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 July 2013, 15:03:33 UTC |
| e06dc12 | Tran Ngoc Quan | 27 July 2013, 01:46:06 UTC | l10n: vi.po (2133t) Signed-off-by: Tran Ngoc Quan <vnwildman@gmail.com> | 27 July 2013, 02:54:25 UTC |
| 5ff0c0e | Ramkumar Ramachandra | 26 July 2013, 10:42:02 UTC | config doc: quote paths, fixing tilde-interpretation The --global section of git-config(1) currently reads like: For writing options: write to global /.gitconfig file rather than the ^ start tilde repository .git/config, write to $XDG_CONFIG_HOME/git/config file if this file exists and the/.gitconfig file doesn’t. ^ end tilde Instead of tilde (~) being interpreted literally, asciidoc subscripts the text between the two tildes. To fix this problem, use backticks (`) to quote all the paths in the file uniformly, just like config.txt does. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2013, 15:55:18 UTC |
| 4acbe91 | Nguyễn Thái Ngọc Duy | 26 July 2013, 11:01:54 UTC | document 'allow-tip-sha1-in-want' capability See 390eb36 (upload-pack: optionally allow fetching from the tips of hidden refs - 2013-01-28) for more information. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2013, 15:33:38 UTC |
| 28b3cff | Jiang Xin | 26 July 2013, 00:56:45 UTC | l10n: git.pot: v1.8.4 round 1 (99 new, 46 removed) Generate po/git.pot from v1.8.4-rc0 for git v1.8.4 l10n round 1. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> | 26 July 2013, 06:40:28 UTC |
| 658ff47 | Junio C Hamano | 26 July 2013, 06:05:17 UTC | builtin/rm.c: consolidate error reporting for removing submodules We have two (not identical) copies of error reporting when attempting to remove submodules that have their repositories embedded within them. Add a helper function so that we do not have to repeat similar error messages with subtly different wording without a good reason. Noticed by Jiang Xin. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 July 2013, 06:05:17 UTC |
| 8f6a3e5 | Jeff King | 25 July 2013, 20:01:00 UTC | commit.h: drop redundant comment We mention twice that the from_ident field of struct pretty_print_context is internal. The first comment was added by 10f2fbf, which prepares the struct for internal fields, and then the second by a908047, which actually adds such a field. This was a mistake made when re-rolling the series on the list; the comment should have been removed from the latter commit. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2013, 23:06:23 UTC |
| c490a60 | Junio C Hamano | 25 July 2013, 02:29:07 UTC | Git 1.8.4-rc0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2013, 02:29:07 UTC |
| 9e8a901 | Junio C Hamano | 25 July 2013, 02:23:03 UTC | Merge branch 'mh/multimail' An enhanced "post-receive" hook to send e-mail messages. * mh/multimail: post-receive-email: deprecate script in favor of git-multimail git-multimail: an improved replacement for post-receive-email | 25 July 2013, 02:23:03 UTC |
| 0def712 | Junio C Hamano | 25 July 2013, 02:23:00 UTC | Merge branch 'ob/typofixes' * ob/typofixes: typofix: in-code comments typofix: documentation typofix: release notes | 25 July 2013, 02:23:01 UTC |
| 4274cdf | Junio C Hamano | 25 July 2013, 02:22:57 UTC | Merge branch 'es/contacts' A helper to read from a set of format-patch output files or a range of commits and find those who may have insights to the code that the changes touch by running a series of "git blame" commands. * es/contacts: contrib: contacts: add documentation contrib: contacts: add mailmap support contrib: contacts: interpret committish akin to format-patch contrib: contacts: add ability to parse from committish contrib: add git-contacts helper | 25 July 2013, 02:22:58 UTC |
| f01723a | Junio C Hamano | 25 July 2013, 02:22:49 UTC | Merge branch 'ml/cygwin-updates' The tip one does _not_ revert c869753e (Force core.filemode to false on Cygwin., 2006-12-30) on purpose, so that people can still retain the old behaviour if they wanted to. * ml/cygwin-updates: cygwin: stop forcing core.filemode=false Cygwin 1.7 supports mmap Cygwin 1.7 has thread-safe pread Cygwin 1.7 needs compat/regex | 25 July 2013, 02:22:49 UTC |
| fc5894b | Junio C Hamano | 25 July 2013, 02:21:30 UTC | Merge branch 'rj/sparse' * rj/sparse: Revert "compat/unsetenv.c: Fix a sparse warning" | 25 July 2013, 02:21:30 UTC |
| cb18246 | Junio C Hamano | 25 July 2013, 02:21:25 UTC | Merge branch 'sb/traverse-trees-bitmask-variable-name' * sb/traverse-trees-bitmask-variable-name: traverse_trees(): clarify return value of the callback | 25 July 2013, 02:21:25 UTC |
| 356df9b | Junio C Hamano | 25 July 2013, 02:21:21 UTC | Merge branch 'jk/cat-file-batch-optim' If somebody wants to only know on-disk footprint of an object without having to know its type or payload size, we can bypass a lot of code to cheaply learn it. * jk/cat-file-batch-optim: Fix some sparse warnings sha1_object_info_extended: pass object_info to helpers sha1_object_info_extended: make type calculation optional packed_object_info: make type lookup optional packed_object_info: hoist delta type resolution to helper sha1_loose_object_info: make type lookup optional sha1_object_info_extended: rename "status" to "type" cat-file: disable object/refname ambiguity check for batch mode | 25 July 2013, 02:21:21 UTC |
| 2bf3501 | Junio C Hamano | 25 July 2013, 02:21:18 UTC | Merge branch 'ml/avoid-using-grep-on-crlf-files' On systems that understand a CRLF as a line ending, tests in this script that worked on files with CRLF line endings using "grep" to extract matching lines may lose the CR at the end of lines that match, causing the actual output not to match the expected output. * ml/avoid-using-grep-on-crlf-files: test-lib.sh - define and use GREP_STRIPS_CR | 25 July 2013, 02:21:18 UTC |
| 677f32c | Junio C Hamano | 25 July 2013, 02:21:15 UTC | Merge branch 'jm/doc-ref-prune' * jm/doc-ref-prune: Documentation: fix git-prune example usage Documentation: remove --prune from pack-refs examples | 25 July 2013, 02:21:15 UTC |
| dfb78f0 | Junio C Hamano | 25 July 2013, 02:21:07 UTC | Merge branch 'rh/template-updates' * rh/template-updates: templates: spell ASCII in uppercase in pre-commit hook templates: Reformat pre-commit hook's message templates: Use heredoc in pre-commit hook | 25 July 2013, 02:21:07 UTC |
| 29143fc | Junio C Hamano | 25 July 2013, 02:21:02 UTC | Merge branch 'mh/ref-races-optim-invalidate-cached' * mh/ref-races-optim-invalidate-cached: refs: do not invalidate the packed-refs cache unnecessarily | 25 July 2013, 02:21:02 UTC |
| 0c544a2 | Junio C Hamano | 25 July 2013, 02:20:58 UTC | Merge branch 'sb/misc-fixes' Assorted code cleanups and a minor fix. * sb/misc-fixes: diff.c: Do not initialize a variable, which gets reassigned anyway. commit: Fix a memory leak in determine_author_info daemon.c:handle: Remove unneeded check for null pointer. | 25 July 2013, 02:20:59 UTC |
| 1762224 | Junio C Hamano | 25 July 2013, 02:19:24 UTC | Merge branch 'tr/line-log' Fix "log -L" command line parsing bugs. * tr/line-log: t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant) 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 | 25 July 2013, 02:19:24 UTC |
| 6083861 | Jiang Xin | 24 July 2013, 02:22:04 UTC | git-clean: implement partial matching for selection Document for interactive git-clean says: "You also could say `c` or `clean` above as long as the choice is unique". But it's not true, because only hotkey `c` and full match (`clean`) could work. Implement partial matching via find_unique function to make the document right. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2013, 02:16:51 UTC |
| 309422e | Jiang Xin | 23 July 2013, 22:22:43 UTC | Documentation/git-clean: fix description for range The descriptions of "select by numbers" section for interactive git-clean are borrowed from git-add, and one sentence should be replaced. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 July 2013, 02:16:13 UTC |
| 7891046 | Stefan Beller | 24 July 2013, 17:55:18 UTC | .mailmap: combine more (email, name) to individual persons I got more responses from people regarding the .mailmap file. All added persons gave permission to add them to the .mailmap file. Signed-off-by: Stefan Beller <stefanbeller@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 23:04:37 UTC |
| 69fb960 | Jeff King | 24 July 2013, 08:03:43 UTC | document 'quiet' receive-pack capability This was added in c207e34 (fix push --quiet: add 'quiet' capability to receive-pack, 2012-01-08) but never documented. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 22:57:01 UTC |
| af60826 | Jeff King | 24 July 2013, 08:03:13 UTC | document 'agent' protocol capability This was added in ff5effd (include agent identifier in capability string, 2012-08-03), but neither the syntax nor the semantics were ever documented outside of the commit message. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 22:57:01 UTC |
| 9354b9a | Jeff King | 24 July 2013, 08:01:59 UTC | docs: note that receive-pack knows side-band-64k capability The protocol-capabilities documentation notes that any capabilities not explicitly mentioned for receive-pack work only for upload-pack. Receive-pack has advertised and understood side-band-64k since 38a81b4 (receive-pack: Wrap status reports inside side-band-64k, 2010-02-05), but we do not mention it explicitly. Let's do so. Note that receive-pack does not understand side-band, which was obsolete by that point. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 22:57:01 UTC |
| 9a621ad | Jeff King | 24 July 2013, 08:01:21 UTC | docs: fix 'report-status' protocol capability thinko The report-status capability is understood by receive-pack, not upload-pack. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 22:57:01 UTC |
| e78095c | Brandon Casey | 18 January 2013, 19:24:01 UTC | git-completion.bash: replace zsh notation that breaks bash 3.X 50c5885e (git-completion.bash: replace zsh notation that breaks bash 3.X, 2013-01-18) fixed a zsh-ism introduced earlier to append to an array, which older versions of bash (3.0) did not grok. This was again broken by 734b2f05 (completion: synchronize zsh wrapper, 2013-05-08). Cherry-pick the fix again to let those with older bash use the completion script. Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 15:45:49 UTC |
| d3a486c | Junio C Hamano | 24 July 2013, 14:53:25 UTC | t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant) Wnen I rewrote "cat b.c | wc -l" into "wc -l <b.c" to squash in a suggestion on the list to this series, I screwed up subsequent rebase. Fix it up. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 July 2013, 14:53:25 UTC |
| 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 |
