| 1599999 | Junio C Hamano | 27 December 2012, 23:57:20 UTC | Git 1.8.0.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:57:20 UTC |
| 6ecc01f | Junio C Hamano | 12 December 2012, 18:06:24 UTC | git(1): show link to contributor summary page We earlier removed a link to list of contributors that pointed to a defunct page; let's use a working one from Ohloh.net to replace it instead. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:40:09 UTC |
| 2b05d9f | Junio C Hamano | 27 December 2012, 23:38:34 UTC | Merge branch 'sl/maint-git-svn-docs' into maint * sl/maint-git-svn-docs: git-svn: Note about tags. git-svn: Expand documentation for --follow-parent git-svn: Recommend use of structure options. git-svn: Document branches with at-sign(@). | 27 December 2012, 23:38:34 UTC |
| 008c208 | Sebastian Leske | 23 November 2012, 07:29:38 UTC | git-svn: Note about tags. Document that 'git svn' will import SVN tags as branches. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 197a80d | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Expand documentation for --follow-parent Describe what the option --follow-parent does, and what happens if it is set or unset. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 91583a6 | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Recommend use of structure options. Document that when using git svn, one should usually either use the directory structure options to import branches as branches, or only import one subdirectory. The default behaviour of cloning all branches and tags as subdirectories in the working copy is usually not what the user wants. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| d658835 | Sebastian Leske | 30 November 2012, 07:16:30 UTC | git-svn: Document branches with at-sign(@). git svn sometimes creates branches with an at-sign in the name (branchname@revision). These branches confuse many users and it is a FAQ why they are created. Document when git svn creates them. Signed-off-by: Sebastian Leske <sebastian.leske@sleske.name> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:38:26 UTC |
| 4017edc | Junio C Hamano | 27 December 2012, 23:34:37 UTC | Merge branch 'gb/maint-doc-svn-log-window-size' into maint * branch 'gb/maint-doc-svn-log-window-size': Document git-svn fetch --log-window-size parameter | 27 December 2012, 23:34:37 UTC |
| 8c6bda0 | Junio C Hamano | 27 December 2012, 23:32:27 UTC | Merge branch 'km/maint-doc-git-reset' into maint * branch 'km/maint-doc-git-reset': doc: git-reset: make "<mode>" optional | 27 December 2012, 23:32:27 UTC |
| 6cf9614 | Max Horn | 27 November 2012, 23:03:21 UTC | git-remote-helpers.txt: document invocation before input format In the distant past, the order things were documented was 'Invocation', 'Commands', 'Capabilities', ... Then it was decided that before giving a list of Commands, there should be an overall description of the 'Input format', which was a wise decision. However, this description was put as the very first thing, with the rationale that any implementor would want to know that first. However, it seems an implementor would actually first need to know how the remote helper will be invoked, so moving 'Invocation' to the front again seems logical. Moreover, we now don't switch from discussing the input format to the invocation style and then back to input related stuff. Signed-off-by: Max Horn <max@quendi.de> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:30:14 UTC |
| 0a1b59e | Junio C Hamano | 27 December 2012, 23:27:46 UTC | Merge branch 'jk/avoid-mailto-invalid-in-doc' into maint * jk/avoid-mailto-invalid-in-doc: Documentation: don't link to example mail addresses | 27 December 2012, 23:27:46 UTC |
| 4f96f1f | Junio C Hamano | 27 December 2012, 23:24:51 UTC | Merge branch 'tj/maint-doc-commit-sign' into maint * branch 'tj/maint-doc-commit-sign': Add -S, --gpg-sign option to manpage of "git commit" | 27 December 2012, 23:25:03 UTC |
| 0b830ac | Ramkumar Ramachandra | 13 November 2012, 15:42:44 UTC | Documentation: move diff.wordRegex from config.txt to diff-config.txt 19299a8 (Documentation: Move diff.<driver>.* from config.txt to diff-config.txt, 2011-04-07) moved the diff configuration options to diff-config.txt, but forgot about diff.wordRegex, which was left behind in config.txt. Fix this. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 December 2012, 23:21:46 UTC |
| c2999ad | Junio C Hamano | 23 December 2012, 04:38:07 UTC | Merge branch 'jc/doc-diff-blobs' into maint * jc/doc-diff-blobs: Documentation: Describe "git diff <blob> <blob>" separately | 23 December 2012, 04:38:07 UTC |
| a7b5e91 | Junio C Hamano | 23 December 2012, 04:38:02 UTC | Merge branch 'cr/doc-checkout-branch' into maint * cr/doc-checkout-branch: Documentation/git-checkout.txt: document 70c9ac2 behavior Documentation/git-checkout.txt: clarify usage | 23 December 2012, 04:38:02 UTC |
| 2b19658 | Junio C Hamano | 23 December 2012, 04:37:42 UTC | Merge branch 'ta/api-index-doc' into maint * ta/api-index-doc: Remove misleading date from api-index-skel.txt | 23 December 2012, 04:37:42 UTC |
| ffcd76b | Junio C Hamano | 23 December 2012, 04:37:33 UTC | Merge branch 'as/doc-for-devs' into maint * as/doc-for-devs: Documentation: move support for old compilers to CodingGuidelines SubmittingPatches: add convention of prefixing commit messages | 23 December 2012, 04:37:33 UTC |
| e970ec3 | Junio C Hamano | 23 December 2012, 04:37:27 UTC | Merge branch 'sl/readme-gplv2' into maint * sl/readme-gplv2: README: it does not matter who the current maintainer is README: Git is released under the GPLv2, not just "the GPL" | 23 December 2012, 04:37:27 UTC |
| 21b3401 | Junio C Hamano | 23 December 2012, 04:37:22 UTC | Merge branch 'jc/fetch-tags-doc' into maint * jc/fetch-tags-doc: fetch --tags: clarify documentation | 23 December 2012, 04:37:22 UTC |
| df54d59 | Junio C Hamano | 23 December 2012, 04:37:09 UTC | Merge branch 'nd/index-format-doc' into maint * nd/index-format-doc: index-format.txt: clarify what is "invalid" | 23 December 2012, 04:37:09 UTC |
| ccc3ae7 | Junio C Hamano | 23 December 2012, 04:36:42 UTC | Merge branch 'jk/mailmap-cleanup' into maint * jk/mailmap-cleanup: contrib: update stats/mailmap script .mailmap: normalize emails for Linus Torvalds .mailmap: normalize emails for Jeff King .mailmap: fix broken entry for Martin Langhoff .mailmap: match up some obvious names/emails | 23 December 2012, 04:36:42 UTC |
| 66afe50 | Junio C Hamano | 23 December 2012, 04:35:34 UTC | Merge branch 'ta/doc-cleanup' into maint * ta/doc-cleanup: Documentation: build html for all files in technical and howto Documentation/howto: convert plain text files to asciidoc Documentation/technical: convert plain text files to asciidoc Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1 Split over-long synopsis in git-fetch-pack.txt into several lines | 23 December 2012, 04:35:34 UTC |
| 854dfda | Thomas Ackermann | 22 December 2012, 18:34:27 UTC | Sort howto documents in howto-index.txt Howto documents in howto-index.txt were listed in a rather random order. So better sort them. Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2012, 04:26:56 UTC |
| bd52900 | Junio C Hamano | 18 December 2012, 19:35:28 UTC | Documentation: Describe "git diff <blob> <blob>" separately As it was not a common operation, it was described as if it is a side note for the more common two-commit variant, but this mode behaves very differently, e.g. it does not make any sense to ask recursive behaviour, or give the command a pathspec. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:35:28 UTC |
| 086cb91 | Junio C Hamano | 18 December 2012, 19:26:24 UTC | t7004: do not create unneeded gpghome/gpg.conf when GPG is not used These tests themselves are properly protected by the GPG prerequisite, but one of the set-up steps outside the test_expect_success block unconditionally assumed that there is a gpghome/ directory, which is not true if GPG is not being used. It may be a good idea to move the whole set-up steps in the test but that is a follow-up topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:26:24 UTC |
| 00bb437 | Chris Rorvick | 17 December 2012, 06:45:02 UTC | Documentation/git-checkout.txt: document 70c9ac2 behavior Document the behavior implemented in 70c9ac2 (DWIM "git checkout frotz" to "git checkout -b frotz origin/frotz"). Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:07:44 UTC |
| e1cdf63 | Chris Rorvick | 17 December 2012, 06:45:01 UTC | Documentation/git-checkout.txt: clarify usage The forms of checkout that do not take a path are lumped together in the DESCRIPTION section, but the description for this group is dominated by explanation of the -b|-B form. Split these apart for more clarity. Signed-off-by: Chris Rorvick <chris@rorvick.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 19:04:52 UTC |
| 8e8c881 | Junio C Hamano | 18 December 2012, 18:50:07 UTC | Merge branch 'jk/pickaxe-textconv' into maint "git log -p -S<string>" now looks for the <string> after applying the textconv filter (if defined); earlier it inspected the contents of the blobs without filtering. | 18 December 2012, 18:50:07 UTC |
| 31d66aa | Sitaram Chamarty | 18 December 2012, 10:47:09 UTC | clarify -M without % symbol in diff-options Signed-off-by: Sitaram Chamarty <sitaramc@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 December 2012, 16:46:15 UTC |
| a26fd03 | Adam Spiers | 16 December 2012, 19:36:00 UTC | Documentation: move support for old compilers to CodingGuidelines The "Try to be nice to older C compilers" text is clearly a guideline to be borne in mind whilst coding rather than when submitting patches. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 02:30:53 UTC |
| 6a5b649 | Adam Spiers | 16 December 2012, 19:35:59 UTC | SubmittingPatches: add convention of prefixing commit messages Conscientious newcomers to git development will read SubmittingPatches and CodingGuidelines, but could easily miss the convention of prefixing commit messages with a single word identifying the file or area the commit touches. Signed-off-by: Adam Spiers <git@adamspiers.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 02:30:50 UTC |
| f430ed8 | John Keeping | 16 December 2012, 14:00:29 UTC | Documentation: don't link to example mail addresses Email addresses in documentation are converted into mailto: hyperlinks in the HTML output and footnotes in man pages. This isn't desirable for cases where the address is used as an example and is not valid. Particularly annoying is the example "jane@laptop.(none)" which appears in git-shortlog(1) as "jane@laptop[1].(none)", with note 1 saying: 1. jane@laptop mailto:jane@laptop Fix this by escaping these email addresses with a leading backslash, to prevent Asciidoc expanding them as inline macros. In the case of mailmap.txt, render the address monospaced so that it matches the block examples surrounding that paragraph. Helped-by: Jeff King <peff@peff.net> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2012, 01:59:07 UTC |
| a041c9c | Thomas Ackermann | 16 December 2012, 08:42:49 UTC | Remove misleading date from api-index-skel.txt Signed-off-by: Thomas Ackermann <th.acker@arcor.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 19:57:41 UTC |
| 71ce415 | Junio C Hamano | 16 December 2012, 06:24:10 UTC | README: it does not matter who the current maintainer is The audience of this introductory document does not have to know nor interact with the maintainer, so drop the mention of him. Other documents such as SubmittingPatches may be a more suitable place to have it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 06:24:10 UTC |
| 779d7e9 | Stefano Lattarini | 14 December 2012, 15:37:47 UTC | README: Git is released under the GPLv2, not just "the GPL" And this is clearly stressed by Linus in the COPYING file. So make it clear in the README as well, to avoid possible misunderstandings. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2012, 06:22:53 UTC |
| f0cb2f1 | Junio C Hamano | 14 December 2012, 00:19:45 UTC | fetch --tags: clarify documentation Explain that --tags is just like another explicit refspec on the command line and as such overrides the default refspecs configured via the remote.$name.fetch variable. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2012, 00:19:45 UTC |
| bdd478d | Matthew Daley | 13 December 2012, 13:36:30 UTC | Fix sizeof usage in get_permutations Currently it gets the size of an otherwise unrelated, unused variable instead of the expected struct size. Signed-off-by: Matthew Daley <mattjd@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 19:13:44 UTC |
| 75940a0 | Manlio Perillo | 13 December 2012, 17:57:19 UTC | git.txt: add missing info about --git-dir command-line option Unlike other environment variables (e.g. GIT_WORK_TREE, GIT_NAMESPACE), the Documentation/git.txt file did not mention that the GIT_DIR environment variable can also be set using the --git-dir command line option. Signed-off-by: Manlio Perillo <manlio.perillo@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 18:54:01 UTC |
| 4a6385f | Nguyễn Thái Ngọc Duy | 13 December 2012, 01:14:47 UTC | index-format.txt: clarify what is "invalid" A cache-tree entry with a negative entry count is considered invalid by the current Git; it records that we do not know the object name of a tree that would result by writing the directory covered by the cache-tree as a tree object. Clarify that any entry with a negative entry count is invalid, but the implementations must write -1 there. This way, we can later decide to allow writers to use negative values other than -1 to encode optional information on such invalidated entries without harming interoperability; we do not know what will be encoded and how, so we keep these other negative values as reserved for now. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 December 2012, 18:12:25 UTC |
| 53474eb | Jeff King | 12 December 2012, 11:41:41 UTC | contrib: update stats/mailmap script This version changes quite a few things: 1. The original parsed the mailmap file itself, and it did it wrong (it did not understand entries with an extra email key). Instead, this version uses git's "%aE" and "%aN" formats to have git perform the mapping, meaning we do not have to read .mailmap at all, but still operate on the current state that git sees (and it also works properly from subdirs). 2. The original would find multiple names for an email, but not the other way around. This version can do either or both. If we find multiple emails for a name, the resolution is less obvious than the other way around. However, it can still be a starting point for a human to investigate. 3. The original would order only by count, not by recency. This version can do either. Combined with showing the counts, it can be easier to decide how to resolve. 4. This version shows similar entries in a blank-delimited stanza, which makes it more clear which options you are picking from. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 0e23064 | Jeff King | 12 December 2012, 11:41:04 UTC | .mailmap: normalize emails for Linus Torvalds Linus used a lot of different per-machine email addresses in the early days. This means that "git shortlog -nse" does not aggregate his counts, and he is listed well below where he should be (8th instead of 3rd). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| c4878fd | Jeff King | 12 December 2012, 11:38:26 UTC | .mailmap: normalize emails for Jeff King I never meant anything special by using my @github.com address; it is merely a mistake that it has sometimes bled through to patches. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 32d979e | Jeff King | 12 December 2012, 11:38:06 UTC | .mailmap: fix broken entry for Martin Langhoff Commit adc3192 (Martin Langhoff has a new e-mail address, 2010-10-05) added a mailmap entry, but forgot that both the old and new email addresses need to appear for one to be mapped to the other (i.e., we do not key mailmap emails by name). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 055e578 | Jeff King | 12 December 2012, 11:36:35 UTC | .mailmap: match up some obvious names/emails This patch updates git's .mailmap in cases where multiple names are matched to a single email. The "master" name for each email was chosen by: 1. If the only difference is in the presence or absence of accented characters, the accented form is chosen (under the assumption that it is the natural spelling, and accents are sometimes stripped in email). 2. Otherwise, the most commonly used name is chosen. 3. If all names are equally common, the most recently used name is chosen. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 December 2012, 19:09:11 UTC |
| 50b03b0 | Anders Kaseorg | 11 December 2012, 23:20:24 UTC | git-prompt: Document GIT_PS1_DESCRIBE_STYLE GIT_PS1_DESCRIBE_STYLE was introduced in v1.6.3.2~35. Document it in the header comments. Signed-off-by: Anders Kaseorg <andersk@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2012, 23:36:13 UTC |
| 3e53891 | Junio C Hamano | 10 December 2012, 21:05:47 UTC | Git 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 21:05:47 UTC |
| 5badfdc | Sébastien Loriot | 10 December 2012, 07:22:34 UTC | Documentation/git-stash.txt: add a missing verb Signed-off-by: Sébastien Loriot <sloriot.ml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2012, 16:18:25 UTC |
| ac046c0 | Junio C Hamano | 07 December 2012, 17:54:50 UTC | git(1): remove a defunct link to "list of authors" The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2012, 08:33:04 UTC |
| a859d3e | Junio C Hamano | 07 December 2012, 22:16:38 UTC | Update draft release notes to 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2012, 22:16:38 UTC |
| f07f413 | Junio C Hamano | 07 December 2012, 22:11:21 UTC | Merge branch 'jc/doc-push-satellite' into maint * jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow | 07 December 2012, 22:11:21 UTC |
| fff26a6 | Junio C Hamano | 07 December 2012, 22:10:56 UTC | Merge branch 'jc/same-encoding' into maint Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding() | 07 December 2012, 22:10:56 UTC |
| 6a40284 | Junio C Hamano | 07 December 2012, 22:10:17 UTC | Merge branch 'lt/diff-stat-show-0-lines' into maint "git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total count" logic to the last loop diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: status of unmodified pair in diff-q is not zero test: add failing tests for "diff --stat" to t4049 Fix "git diff --stat" for interesting - but empty - file changes | 07 December 2012, 22:10:17 UTC |
| 7c65b2e | Matthieu Moy | 29 November 2012, 19:11:32 UTC | git-fast-import.txt: improve documentation for quoted paths The documentation mentioned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sentence, not part of the actual string). Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2012, 19:49:51 UTC |
| 462d97d | Matthieu Moy | 29 November 2012, 17:00:55 UTC | git-remote-mediawiki: escape ", \, and LF in file names A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2012, 19:16:33 UTC |
| de90959 | Junio C Hamano | 29 November 2012, 17:46:30 UTC | t4049: refocus tests The primary thing Linus's patch wanted to change was to make sure that 0-line change appears for a mode-only change. Update the first test to chmod a file that we can see in the output (limited by --stat-count) to demonstrate it. Also make sure to use test_chmod and compare the index and the tree, so that we can run this test even on a filesystem without permission bits. Later two tests are about fixes to separate issues that were introduced and/or uncovered by Linus's patch as a side effect, but the issues are not related to mode-only changes. Remove chmod from the tests. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2012, 17:46:30 UTC |
| 93341d8 | Junio C Hamano | 28 November 2012, 21:40:02 UTC | Start preparing for 1.8.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2012, 21:40:02 UTC |
| 1d05d1d | Junio C Hamano | 28 November 2012, 20:05:30 UTC | Merge branch 'rh/maint-gitweb-highlight-ext' into maint Syntax highlighting in "gitweb" was not quite working. * rh/maint-gitweb-highlight-ext: gitweb.perl: fix %highlight_ext mappings | 28 November 2012, 20:05:30 UTC |
| 2a7f6ff | Junio C Hamano | 28 November 2012, 20:04:32 UTC | Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint "git p4" used to try expanding malformed "$keyword$" that spans across multiple lines. * pw/maint-p4-rcs-expansion-newline: git p4: RCS expansion should not span newlines | 28 November 2012, 20:04:50 UTC |
| 4047fec | Ralf Thielow | 28 November 2012, 18:27:02 UTC | completion: add options --single-branch and --branch to "git clone" Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2012, 20:01:16 UTC |
| b48990e | Junio C Hamano | 27 November 2012, 23:52:27 UTC | Documentation/git-push.txt: clarify the "push from satellite" workflow The context of the example to push into refs/remotes/satellite/ hierarchy of the other repository needs to be spelled out explicitly for the value of this example to be fully appreciated. Make it so. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2012, 06:39:08 UTC |
| 20c8cde | Junio C Hamano | 27 November 2012, 22:19:36 UTC | diff --shortstat: do not count "unmerged" entries Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 22:19:36 UTC |
| 86ef7b3 | Junio C Hamano | 27 November 2012, 21:29:00 UTC | Merge branch 'nd/maint-compat-fnmatch-fix' into maint * nd/maint-compat-fnmatch-fix: compat/fnmatch: fix off-by-one character class's length check | 27 November 2012, 21:29:00 UTC |
| ed20513 | Junio C Hamano | 27 November 2012, 21:28:45 UTC | Merge branch 'jh/update-ref-d-through-symref' into maint * jh/update-ref-d-through-symref: Fix failure to delete a packed ref through a symref t1400-update-ref: Add test verifying bug with symrefs in delete_ref() | 27 November 2012, 21:28:45 UTC |
| a7c940e | Junio C Hamano | 27 November 2012, 21:28:31 UTC | Merge branch 'esr/maint-doc-fast-import' into maint * esr/maint-doc-fast-import: doc/fast-import: clarify how content states are built | 27 November 2012, 21:28:31 UTC |
| 2207e10 | Junio C Hamano | 27 November 2012, 21:28:18 UTC | Merge branch 'wtk/submodule-doc-fixup' into maint * wtk/submodule-doc-fixup: git-submodule: wrap branch option with "<>" in usage strings. | 27 November 2012, 21:28:18 UTC |
| 82dfc2c | Junio C Hamano | 27 November 2012, 20:05:10 UTC | diff --stat: do not count "unmerged" entries Even though we show a separate *UNMERGED* entry in the patch and diffstat output (or in the --raw format, for that matter) in addition to and separately from the diff against the specified stage (defaulting to #2) for unmerged paths, they should not be counted in the total number of files affected---that would lead to counting the same path twice. The separation done by the previous step makes this fix simple and straightforward. Among the filepairs in diff_queue, paths that weren't modified, and the extra "unmerged" entries do not count as total number of files. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 21:21:15 UTC |
| a20d3c0 | Junio C Hamano | 27 November 2012, 19:47:46 UTC | diff --stat: move the "total count" logic to the last loop The diffstat generation logic, with --stat-count limit, is implemented as three loops. - The first counts the width necessary to show stats up to specified number of entries, and notes up to how many entries in the data we need to iterate to show the graph; - The second iterates that many times to draw the graph, adjusts the number of "total modified files", and counts the total added/deleted lines for the part that was shown in the graph; - The third iterates over the remainder and only does the part to count "total added/deleted lines" and to adjust "total modified files" without drawing anything. Move the logic to count added/deleted lines and modified files from the second loop to the third loop. This incidentally fixes a bug. The third loop was not filtering binary changes (counted in bytes) from the total added/deleted as it should. The second loop implemented this correctly, so if a binary change appeared earlier than the --stat-count cutoff, the code counted number of added/deleted lines correctly, but if it appeared beyond the cutoff, the number of lines would have mixed with the byte count in the buggy third loop. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 21:21:15 UTC |
| af0ed81 | Junio C Hamano | 27 November 2012, 19:24:54 UTC | diff --stat: use "file" temporary variable to refer to data->files[i] The generated code shouldn't change but it is easier to read. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 21:21:15 UTC |
| 99bfd40 | Junio C Hamano | 27 November 2012, 19:17:14 UTC | diff --stat: status of unmodified pair in diff-q is not zero It is spelled DIFF_STATUS_UNKNOWN these days, and is different from zero. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 21:21:15 UTC |
| 9667ccb | Junio C Hamano | 27 November 2012, 20:55:00 UTC | test: add failing tests for "diff --stat" to t4049 There are a few problems in diff.c around --stat area, partially caused by the recent 74faaa1 (Fix "git diff --stat" for interesting - but empty - file changes, 2012-10-17), and largely caused by the earlier change that introduced when --stat-count was added. Add a few test pieces to t4049 to expose the issues. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 21:21:15 UTC |
| 6b6e063 | Mark Szepieniec | 27 November 2012, 01:37:34 UTC | Documentation: improve phrasing in git-push.txt The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Signed-off-by: Mark Szepieniec <mszepien@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2012, 17:12:58 UTC |
| d1eded4 | Antoine Pelisse | 26 November 2012, 19:21:54 UTC | Fix typo in remote set-head usage parenthesis are not matching in `builtin_remote_sethead_usage` as a square bracket is closing something never opened. Signed-off-by: Antoine Pelisse <apelisse@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2012, 21:27:45 UTC |
| cad06d4 | Paul Gortmaker | 22 November 2012, 03:19:57 UTC | Makefile: hide stderr of curl-config test You will get $ make distclean 2>&1 | grep curl /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found /bin/sh: curl-config: not found $ if you don't have a curl development package installed. The intent is not to alarm the user, but just to test if there is a new enough curl installed. However, if you look at search engine suggested completions, the above "error" messages are confusing people into thinking curl is a hard requirement. Redirect this error output to /dev/null as it is not necessary to be shown to the end users. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2012, 18:31:11 UTC |
| ed9fe75 | Junio C Hamano | 26 November 2012, 02:40:34 UTC | Git 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2012, 02:40:34 UTC |
| 5956732 | Junio C Hamano | 26 November 2012, 02:35:50 UTC | Merge branch 'jk/checkout-out-of-unborn' into maint * jk/checkout-out-of-unborn: checkout: print a message when switching unborn branches | 26 November 2012, 02:35:50 UTC |
| ccf1bb3 | Junio C Hamano | 26 November 2012, 02:35:46 UTC | Merge branch 'cn/config-missing-path' into maint * cn/config-missing-path: config: don't segfault when given --path with a missing value | 26 November 2012, 02:35:46 UTC |
| 326922f | Junio C Hamano | 26 November 2012, 02:35:41 UTC | Merge branch 'jk/maint-gitweb-xss' into maint Fixes an XSS vulnerability in gitweb. * jk/maint-gitweb-xss: gitweb: escape html in rss title | 26 November 2012, 02:35:41 UTC |
| 4db42b3 | Marc Khouzam | 23 November 2012, 14:02:22 UTC | Completion must sort before using uniq The user can be presented with invalid completion results when trying to complete a 'git checkout' command. This can happen when using a branch name prefix that matches multiple remote branches. For example, if available branches are: master remotes/GitHub/maint remotes/GitHub/master remotes/origin/maint remotes/origin/master When performing completion on 'git checkout ma' the user will be given the choices: maint master However, 'git checkout maint' will fail in this case, although completion previously said 'maint' was valid. Furthermore, when performing completion on 'git checkout mai', no choices will be suggested. So, the user is first told that the branch name 'maint' is valid, but when trying to complete 'mai' into 'maint', that completion is no longer valid. The completion results should never propose 'maint' as a valid branch name, since 'git checkout' will refuse it. The reason for this bug is that the uniq program only works with sorted input. The man page states "uniq prints the unique lines in a sorted file". When __git_refs uses the guess heuristic employed by checkout for tracking branches it wants to consider remote branches but only if the branch name is unique. To do that, it calls 'uniq -u'. However the input given to 'uniq -u' is not sorted. Therefore, in the above example, when dealing with 'git checkout ma', "__git_refs '' 1" will find the following list: master maint master maint master which, when passed to 'uniq -u' will remain the same. Therefore 'maint' will be wrongly suggested as a valid option. When dealing with 'git checkout mai', the list will be: maint maint which happens to be sorted and will be emptied by 'uniq -u', properly ignoring 'maint'. A solution for preventing the completion script from suggesting such invalid branch names is to first call 'sort' and then 'uniq -u'. Signed-off-by: Marc Khouzam <marc.khouzam@gmail.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 November 2012, 06:35:48 UTC |
| f10e386 | Nguyễn Thái Ngọc Duy | 11 November 2012, 10:13:57 UTC | compat/fnmatch: fix off-by-one character class's length check Character class "xdigit" is the only one that hits 6 character limit defined by CHAR_CLASS_MAX_LENGTH. All other character classes are 5 character long and therefore never caught by this. This should make xdigit tests in t3070 pass on Windows. Reported-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2012, 20:13:09 UTC |
| 1c03999 | Junio C Hamano | 20 November 2012, 18:16:14 UTC | Further preparation for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 November 2012, 18:16:14 UTC |
| 91d0cd9 | Junio C Hamano | 20 November 2012, 18:15:09 UTC | Merge branch 'mg/maint-pull-suggest-upstream-to' into maint * mg/maint-pull-suggest-upstream-to: push/pull: adjust missing upstream help text to changed interface | 20 November 2012, 18:15:09 UTC |
| cf48960 | Junio C Hamano | 20 November 2012, 18:14:55 UTC | Merge branch 'mm/maint-doc-commit-edit' into maint * mm/maint-doc-commit-edit: Document 'git commit --no-edit' explicitly | 20 November 2012, 18:14:55 UTC |
| cdcd793 | Junio C Hamano | 20 November 2012, 18:14:46 UTC | Merge branch 'as/maint-doc-fix-no-post-rewrite' into maint * as/maint-doc-fix-no-post-rewrite: commit: fixup misplacement of --no-post-rewrite description | 20 November 2012, 18:14:47 UTC |
| c5afc5b | Junio C Hamano | 20 November 2012, 18:14:41 UTC | Merge branch 'rs/lock-correct-ref-during-delete' into maint * rs/lock-correct-ref-during-delete: refs: lock symref that is to be deleted, not its target | 20 November 2012, 18:14:41 UTC |
| e87719f | Junio C Hamano | 20 November 2012, 18:14:28 UTC | Merge branch 'rf/maint-mailmap-off-by-one' into maint * rf/maint-mailmap-off-by-one: mailmap: avoid out-of-bounds memory access | 20 November 2012, 18:14:29 UTC |
| 35cae74 | Junio C Hamano | 20 November 2012, 18:03:12 UTC | Merge branch 'jk/maint-diff-grep-textconv' into maint "git diff -G<pattern>" did not honor textconv filter when looking for changes. * jk/maint-diff-grep-textconv: diff_grep: use textconv buffers for add/deleted files | 20 November 2012, 18:03:12 UTC |
| fd778c0 | Junio C Hamano | 20 November 2012, 17:57:44 UTC | Merge branch 'js/format-2047' into maint Various rfc2047 quoting issues around a non-ASCII name on the From: line in the output from format-patch have been corrected. * js/format-2047: format-patch tests: check quoting/encoding in To: and Cc: headers format-patch: fix rfc2047 address encoding with respect to rfc822 specials format-patch: make rfc2047 encoding more strict format-patch: introduce helper function last_line_length() format-patch: do not wrap rfc2047 encoded headers too late format-patch: do not wrap non-rfc2047 headers too early utf8: fix off-by-one wrapping of text | 20 November 2012, 17:57:44 UTC |
| 2808f6a | Junio C Hamano | 19 November 2012, 03:47:19 UTC | Start preparing for 1.8.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 November 2012, 03:47:19 UTC |
| 8b56a47 | Junio C Hamano | 19 November 2012, 03:44:36 UTC | Merge branch 'sz/maint-curl-multi-timeout' into maint Sometimes curl_multi_timeout() function suggested a wrong timeout value when there is no file descriptors to wait on and the http transport ended up sleeping for minutes in select(2) system call. A workaround has been added for this. * sz/maint-curl-multi-timeout: Fix potential hang in https handshake | 19 November 2012, 03:44:36 UTC |
| b98769e | Junio C Hamano | 19 November 2012, 03:34:09 UTC | Merge branch 'po/maint-refs-replace-docs' into maint The refs/replace hierarchy was not mentioned in the repository-layout docs. * po/maint-refs-replace-docs: Doc repository-layout: Show refs/replace | 19 November 2012, 03:34:09 UTC |
| 611addf | Junio C Hamano | 19 November 2012, 03:33:45 UTC | Merge branch 'ph/pull-rebase-detached' into maint "git pull --rebase" run while the HEAD is detached tried to find the upstream branch of the detached HEAD (which by definition does not exist) and emitted unnecessary error messages. * ph/pull-rebase-detached: git-pull: Avoid merge-base on detached head | 19 November 2012, 03:33:45 UTC |
| 78ba7e2 | Junio C Hamano | 19 November 2012, 03:33:20 UTC | Merge branch 'mm/maint-doc-remote-tracking' into maint Update "remote tracking branch" in the documentation to "remote-tracking branch". * mm/maint-doc-remote-tracking: Documentation: remote tracking branch -> remote-tracking branch | 19 November 2012, 03:33:20 UTC |
| 3a98669 | Junio C Hamano | 19 November 2012, 03:32:58 UTC | Merge branch 'rs/branch-del-symref' into maint A symbolic ref refs/heads/SYM was not correctly removed with "git branch -d SYM"; the command removed the ref pointed by SYM instead. * rs/branch-del-symref: branch: show targets of deleted symrefs, not sha1s branch: skip commit checks when deleting symref branches branch: delete symref branch, not its target branch: factor out delete_branch_config() branch: factor out check_branch_commit() | 19 November 2012, 03:32:58 UTC |
| dca5ed5 | Junio C Hamano | 19 November 2012, 03:32:30 UTC | Merge branch 'nd/grep-true-path' into maint "git grep -e pattern <tree>" asked the attribute system to read "<tree>:.gitattributes" file in the working tree, which was nonsense. * nd/grep-true-path: grep: stop looking at random places for .gitattributes | 19 November 2012, 03:32:30 UTC |
| 4607a8c | Junio C Hamano | 19 November 2012, 03:32:11 UTC | Merge branch 'jc/grep-pcre-loose-ends' (early part) into maint "git log -F -E --grep='<ere>'" failed to use the given <ere> pattern as extended regular expression, and instead looked for the string literally. * 'jc/grep-pcre-loose-ends' (early part): log --grep: use the same helper to set -E/-F options as "git grep" revisions: initialize revs->grep_filter using grep_init() grep: move pattern-type bits support to top-level grep.[ch] grep: move the configuration parsing logic to grep.[ch] builtin/grep.c: make configuration callback more reusable | 19 November 2012, 03:32:12 UTC |
| 6c95f53 | Junio C Hamano | 19 November 2012, 03:31:40 UTC | Merge branch 'da/mergetools-p4' into maint "git mergetool" feeds /dev/null as a common ancestor when dealing with an add/add conflict, but p4merge backend cannot handle it. Work it around by passing a temporary empty file. * da/mergetools-p4: mergetools/p4merge: Handle "/dev/null" | 19 November 2012, 03:31:40 UTC |
| 3424da1 | Junio C Hamano | 19 November 2012, 03:31:13 UTC | Merge branch 'jc/test-say-color-avoid-echo-escape' into maint The "say" function in the test scaffolding incorrectly allowed "echo" to interpret "\a" as if it were a C-string asking for a BEL output. * jc/test-say-color-avoid-echo-escape: test-lib: Fix say_color () not to interpret \a\b\c in the message | 19 November 2012, 03:31:14 UTC |
| d6ecf56 | Junio C Hamano | 19 November 2012, 03:29:44 UTC | Merge branch 'bw/config-lift-variable-name-length-limit' into maint The configuration parser had an unnecessary hardcoded limit on variable names that was not checked consistently. * bw/config-lift-variable-name-length-limit: Remove the hard coded length limit on variable names in config files | 19 November 2012, 03:29:44 UTC |
| 962c38e | Carlos Martín Nieto | 15 November 2012, 18:10:01 UTC | config: don't segfault when given --path with a missing value When given a variable without a value, such as '[section] var' and asking git-config to treat it as a path, git_config_pathname returns an error and doesn't modify its output parameter. show_config assumes that the call is always successful and sets a variable to indicate that vptr should be freed. In case of an error however, trying to do this will cause the program to be killed, as it's pointing to memory in the stack. Detect the error and return immediately to avoid freeing or accessing the uninitialed memory in the stack. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2012, 02:12:17 UTC |
| afa8c07 | Jeff King | 15 November 2012, 17:12:33 UTC | checkout: print a message when switching unborn branches When we switch to a new branch using checkout, we usually output a message indicating what happened. However, when we switch from an unborn branch to a new branch, we do not print anything, which may leave the user wondering what happened. The reason is that the unborn branch is a special case (see abe1998), and does not follow the usual switch_branches code path. Let's add a similar informational message to the special case to match the usual code path. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 November 2012, 01:36:26 UTC |
