| e6363a4 | Junio C Hamano | 01 March 2013, 21:15:29 UTC | Git 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 21:15:29 UTC |
| 8b1bd02 | Thomas Rast | 01 March 2013, 20:06:17 UTC | Make !pattern in .gitattributes non-fatal Before 82dce99 (attr: more matching optimizations from .gitignore, 2012-10-15), .gitattributes did not have any special treatment of a leading '!'. The docs, however, always said The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. By those rules, leading '!' means pattern negation. So 82dce99 correctly determined that this kind of line makes no sense and should be disallowed. However, users who actually had a rule for files starting with a '!' are in a bad position: before 82dce99 '!' matched that literal character, so it is conceivable that users have .gitattributes with such lines in them. After 82dce99 the unescaped version was disallowed in such a way that git outright refuses to run(!) most commands in the presence of such a .gitattributes. It therefore becomes very hard to fix, let alone work with, such repositories. Let's at least allow the users to fix their repos: change the fatal error into a warning. Reported-by: mathstuf@gmail.com Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 20:24:45 UTC |
| 1d38c69 | Junio C Hamano | 01 March 2013, 18:37:40 UTC | Merge branch 'wk/user-manual' into maint * wk/user-manual: user-manual: Flesh out uncommitted changes and submodule updates user-manual: Use request-pull to generate "please pull" text user-manual: Reorganize the reroll sections, adding 'git rebase -i' | 01 March 2013, 18:37:40 UTC |
| 5e24858 | Andrew Wong | 01 March 2013, 17:23:57 UTC | Documentation/githooks: Fix linkgit Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2013, 18:19:22 UTC |
| 8d44277 | Junio C Hamano | 27 February 2013, 18:09:59 UTC | Update draft release notes to 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2013, 18:09:59 UTC |
| 6f0c336 | Junio C Hamano | 27 February 2013, 18:04:26 UTC | Merge branch 'ef/non-ascii-parse-options-error-diag' into maint * ef/non-ascii-parse-options-error-diag: parse-options: report uncorrupted multi-byte options | 27 February 2013, 18:04:26 UTC |
| 28db111 | Junio C Hamano | 27 February 2013, 18:01:21 UTC | Merge branch 'wk/man-deny-current-branch-is-default-these-days' into maint * wk/man-deny-current-branch-is-default-these-days: user-manual: typofix (ofthe->of the) user-manual: Update for receive.denyCurrentBranch=refuse | 27 February 2013, 18:01:21 UTC |
| c054ef9 | Junio C Hamano | 27 February 2013, 17:59:19 UTC | Merge branch 'jn/less-reconfigure' into maint * jn/less-reconfigure: Makefile: avoid infinite loop on configure.ac change | 27 February 2013, 17:59:19 UTC |
| 31e54bb | Brad King | 27 February 2013, 00:41:34 UTC | Documentation/submodule: Add --force to update synopsis In commit 9db31bdf (submodule: Add --force option for git submodule update, 2011-04-01) we added the option to the implementation's usage synopsis but forgot to add it to the synopsis in the command documentation. Add the option to the synopsis in the same location it is reported in usage and re-wrap the options to avoid long lines. Signed-off-by: Brad King <brad.king@kitware.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2013, 15:31:01 UTC |
| 7a0d8db | Junio C Hamano | 25 February 2013, 16:15:40 UTC | Prepare for 1.8.1.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 16:26:25 UTC |
| cd9c038 | Junio C Hamano | 25 February 2013, 16:04:19 UTC | Merge branch 'jc/mention-tracking-for-pull-default' into maint * jc/mention-tracking-for-pull-default: doc: mention tracking for pull.default | 25 February 2013, 16:04:20 UTC |
| 5cc5f09 | Junio C Hamano | 25 February 2013, 16:04:17 UTC | Merge branch 'mm/config-intro-in-git-doc' into maint * mm/config-intro-in-git-doc: git.txt: update description of the configuration mechanism | 25 February 2013, 16:04:18 UTC |
| 92f561d | Junio C Hamano | 25 February 2013, 16:04:05 UTC | Merge branch 'da/p4merge-mktemp-fix' into maint * da/p4merge-mktemp-fix: p4merge: fix printf usage | 25 February 2013, 16:04:05 UTC |
| 8552e2e | Junio C Hamano | 25 February 2013, 16:04:03 UTC | Merge branch 'bw/get-tz-offset-perl' into maint * bw/get-tz-offset-perl: cvsimport: format commit timestamp ourselves without using strftime perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases Move Git::SVN::get_tz to Git::get_tz_offset | 25 February 2013, 16:04:03 UTC |
| b79faa9 | Junio C Hamano | 25 February 2013, 16:04:01 UTC | Merge branch 'al/mergetool-printf-fix' into maint * al/mergetool-printf-fix: difftool--helper: fix printf usage git-mergetool: print filename when it contains % | 25 February 2013, 16:04:01 UTC |
| 75288cc | Junio C Hamano | 25 February 2013, 16:03:59 UTC | Merge branch 'jx/utf8-printf-width' into maint * jx/utf8-printf-width: Add utf8_fprintf helper that returns correct number of columns | 25 February 2013, 16:03:59 UTC |
| d08d259 | Junio C Hamano | 25 February 2013, 16:03:57 UTC | Merge branch 'mg/bisect-doc' into maint * mg/bisect-doc: git-bisect.txt: clarify that reset quits bisect | 25 February 2013, 16:03:57 UTC |
| 7927f51 | Junio C Hamano | 25 February 2013, 16:03:54 UTC | Merge branch 'sp/smart-http-content-type-check' into maint * sp/smart-http-content-type-check: http_request: reset "type" strbuf before adding t5551: fix expected error output Verify Content-Type from smart HTTP servers | 25 February 2013, 16:03:54 UTC |
| d49f9f1 | Junio C Hamano | 25 February 2013, 16:03:51 UTC | Merge branch 'jc/combine-diff-many-parents' into maint * jc/combine-diff-many-parents: t4038: add tests for "diff --cc --raw <trees>" combine-diff: lift 32-way limit of combined diff | 25 February 2013, 16:03:51 UTC |
| 66d12f9 | Junio C Hamano | 25 February 2013, 16:03:44 UTC | Merge branch 'jk/apply-similaritly-parsing' into maint * jk/apply-similaritly-parsing: builtin/apply: tighten (dis)similarity index parsing | 25 February 2013, 16:03:44 UTC |
| 7be0931 | Junio C Hamano | 25 February 2013, 16:03:37 UTC | Merge branch 'jk/remote-helpers-doc' into maint * jk/remote-helpers-doc: Rename {git- => git}remote-helpers.txt | 25 February 2013, 16:03:37 UTC |
| aaf4f28 | Junio C Hamano | 25 February 2013, 16:03:34 UTC | Merge branch 'ab/gitweb-use-same-scheme' into maint * ab/gitweb-use-same-scheme: gitweb: refer to picon/gravatar images over the same scheme | 25 February 2013, 16:03:34 UTC |
| c0e96dd | Junio C Hamano | 25 February 2013, 16:03:32 UTC | Merge branch 'zk/clean-report-failure' into maint * zk/clean-report-failure: git-clean: Display more accurate delete messages | 25 February 2013, 16:03:32 UTC |
| 0e0c3f2 | Junio C Hamano | 25 February 2013, 16:03:27 UTC | Merge branch 'nd/clone-no-separate-git-dir-with-bare' into maint * nd/clone-no-separate-git-dir-with-bare: clone: forbid --bare --separate-git-dir <dir> | 25 February 2013, 16:03:27 UTC |
| a8e00d7 | Junio C Hamano | 25 February 2013, 16:03:20 UTC | Merge branch 'da/p4merge-mktemp' into maint * da/p4merge-mktemp: mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder | 25 February 2013, 16:03:20 UTC |
| 4f021b3 | Greg Price | 25 February 2013, 05:27:20 UTC | Documentation: "advice" is uncountable "Advice" is a mass noun, not a count noun; it's not ordinarily pluralized. Signed-off-by: Greg Price <price@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2013, 15:31:28 UTC |
| 7f1b697 | Jeff King | 21 February 2013, 06:26:14 UTC | Makefile: avoid infinite loop on configure.ac change If you are using autoconf and change the configure.ac, the Makefile will notice that config.status is older than configure.ac, and will attempt to rebuild and re-run the configure script to pick up your changes. The first step in doing so is to run "make configure". Unfortunately, this tries to include config.mak.autogen, which depends on config.status, which depends on configure.ac; so we must rebuild config.status. Which leads to us running "make configure", and so on. It's easy to demonstrate with: make configure ./configure touch configure.ac make We can break this cycle by not re-invoking make to build "configure", and instead just putting its rules inline into our config.status rebuild procedure. We can avoid a copy by factoring the rules into a make variable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2013, 07:56:05 UTC |
| dff9f88 | Junio C Hamano | 19 February 2013, 05:48:05 UTC | Git 1.8.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:54:22 UTC |
| 0ee7198 | Junio C Hamano | 20 February 2013, 05:54:15 UTC | Merge branch 'ob/imap-send-ssl-verify' into maint * ob/imap-send-ssl-verify: imap-send: support subjectAltName as well imap-send: the subject of SSL certificate must match the host imap-send: move #ifdef around | 20 February 2013, 05:54:15 UTC |
| e174744 | Oswald Buddenhagen | 15 February 2013, 20:59:53 UTC | imap-send: support subjectAltName as well Check not only the common name of the certificate subject, but also check the subject alternative DNS names as well, when verifying that the certificate matches that of the host we are trying to talk to. Signed-off-by: Oswald Buddenhagen <ossi@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:47:22 UTC |
| b62fb07 | Oswald Buddenhagen | 15 February 2013, 20:50:35 UTC | imap-send: the subject of SSL certificate must match the host We did not check a valid certificate's subject at all, and would have happily talked with a wrong host after connecting to an incorrect address and getting a valid certificate that does not belong to the host we intended to talk to. Signed-off-by: Oswald Buddenhagen <ossi@kde.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2013, 05:47:22 UTC |
| 9148673 | W. Trevor King | 19 February 2013, 10:05:02 UTC | user-manual: Flesh out uncommitted changes and submodule updates If you try and update a submodule with a dirty working directory, you get an error message like: $ git submodule update error: Your local changes to the following files would be overwritten by checkout: ... Please, commit your changes or stash them before you can switch branches. Aborting ... Mention this in the submodule notes. The previous phrase was short enough that I originally thought it might have been referring to the reflog note (obviously, uncommitted changes will not show up in the reflog either ;). Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:30 UTC |
| ae6ef55 | W. Trevor King | 19 February 2013, 10:05:01 UTC | user-manual: Use request-pull to generate "please pull" text Less work and more error checking (e.g. does a merge base exist?). Add an explicit push before request-pull to satisfy request-pull, which checks to make sure the references are publically available. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:30 UTC |
| 6c26bf4 | W. Trevor King | 19 February 2013, 10:05:00 UTC | user-manual: Reorganize the reroll sections, adding 'git rebase -i' I think this interface is often more convenient than extended cherry picking or using 'git format-patch'. In fact, I removed the cherry-pick section entirely. The entry-level suggestions for rerolling are now: 1. git commit --amend 2. git format-patch origin git reset --hard origin ...edit and reorder patches... git am *.patch 3. git rebase -i origin Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 20:56:11 UTC |
| 1e1fe52 | Junio C Hamano | 15 February 2013, 20:32:19 UTC | imap-send: move #ifdef around Instead of adding an early return to the inside of the ssl_socket_connect() function for NO_OPENSSL compilation, split it into a separate stub function. No functional change, but the next change to extend ssl_socket_connect() will become easier to read this way. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2013, 00:33:07 UTC |
| 50995ed | Junio C Hamano | 18 February 2013, 20:43:00 UTC | user-manual: typofix (ofthe->of the) Noticed by Drew Northup Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 20:43:00 UTC |
| 7ed1690 | W. Trevor King | 18 February 2013, 00:16:01 UTC | user-manual: use -o latest.tar.gz to create a gzipped tarball This functionality was introduced by 0e804e09 (archive: provide builtin .tar.gz filter, 2011-07-21) for v1.7.7. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:52 UTC |
| 632cc3e | W. Trevor King | 18 February 2013, 00:15:58 UTC | user-manual: use 'git config --global user.*' for setup A simple command line call is easier than spawning an editor, especially for folks new to ideas like the "command line" and "text editors". This is also the approach suggested by 'git commit' if you try and commit without having configured user.name or user.email. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:47 UTC |
| 47adb8a | W. Trevor King | 18 February 2013, 00:15:56 UTC | user-manual: mention 'git remote add' for remote branch config I hardly ever setup remote.<name>.url using 'git config'. While it may be instructive to do so, we should also point out 'git remote add'. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:42 UTC |
| d1471e0 | W. Trevor King | 18 February 2013, 00:15:55 UTC | user-manual: give 'git push -f' as an alternative to +master This mirrors existing language in the description of 'git fetch'. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:37 UTC |
| e9b4908 | W. Trevor King | 18 February 2013, 00:15:53 UTC | user-manual: use 'remote add' to setup push URLs There is no need to use here documents to setup this configuration. It is easier, less confusing, and more robust to use `git remote add` directly. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2013, 08:48:30 UTC |
| c0179c0 | Matthieu Moy | 14 February 2013, 15:36:54 UTC | git.txt: update description of the configuration mechanism The old Git version where it appeared is now useful only to historians, not to normal users. Also, the text was mentioning only the per-repo config file, but this is a good place to teach that customization can also be made per-user. While at it, remove a now-defunct e-mail from an example. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2013, 17:05:55 UTC |
| d9be248 | W. Trevor King | 08 February 2013, 17:04:20 UTC | user-manual: Update for receive.denyCurrentBranch=refuse acd2a45 (Refuse updating the current branch in a non-bare repository via push, 2009-02-11) changed the default to refuse such a push, but it forgot to update the docs. 7d182f5 (Documentation: receive.denyCurrentBranch defaults to 'refuse', 2010-03-17) updated Documentation/config.txt, but forgot to update the user manual. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2013, 18:54:58 UTC |
| d32805d | Matthieu Moy | 12 February 2013, 09:24:44 UTC | Replace filepattern with pathspec for consistency pathspec is the most widely used term, and is the one defined in gitglossary.txt. <filepattern> was used only in the synopsys for git-add and git-commit, and in git-add.txt. Get rid of it. This patch is obtained with by running: perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern` Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2013, 18:05:38 UTC |
| b141a47 | Erik Faye-Lund | 11 February 2013, 23:13:48 UTC | parse-options: report uncorrupted multi-byte options Because our command-line parser considers only one byte at the time for short-options, we incorrectly report only the first byte when multi-byte input was provided. This makes user-errors slightly awkward to diagnose for instance under UTF-8 locale and non-English keyboard layouts. Report the whole argument-string when a non-ASCII short-option is detected. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Improved-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 23:19:30 UTC |
| c082196 | Jiang Xin | 09 February 2013, 06:31:09 UTC | Add utf8_fprintf helper that returns correct number of columns Since command usages can be translated, they may include utf-8 encoded strings, and the output in console may not align well any more. This is because strlen() is different from strwidth() on utf-8 strings. A wrapper utf8_fprintf() can help to return the correct number of columns required. Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Reviewed-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 19:29:45 UTC |
| c787a45 | Michael J Gruber | 11 February 2013, 08:35:04 UTC | git-bisect.txt: clarify that reset quits bisect "reset" can be easily misunderstood as resetting a bisect session to its start without finishing it. Clarify that it actually quits the bisect session. Reported-by: Andreas Mohr <andi@lisas.de> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 16:40:34 UTC |
| 901fd18 | W. Trevor King | 10 February 2013, 15:10:27 UTC | user-manual: Rewrite git-gc section for automatic packing This should have happened back in 2007, when `git gc` learned about auto (e9831e8, git-gc --auto: add documentation, 2007-09-17). Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 04:39:26 UTC |
| da2c7b3 | W. Trevor King | 10 February 2013, 15:10:39 UTC | user-manual: Fix 'you - Git' -> 'you--Git' typo Use an em-dash, not a hyphen, to join these clauses. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 04:39:25 UTC |
| de3f2c7 | W. Trevor King | 10 February 2013, 15:10:37 UTC | user-manual: Fix 'http' -> 'HTTP' typos HTTP is an acronym which has not (yet) made the transition to word status (unlike "laser", probably because lasers are inherently cooler than HTTP ;). Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 February 2013, 04:39:20 UTC |
| ddd2369 | W. Trevor King | 10 February 2013, 15:10:36 UTC | user-manual: Fix 'both: so' -> 'both; so' typo The clause "so `git log ...` will return no commits..." is independent, not a description of "both", so a semicolon is more appropriate. Signed-off-by: W. Trevor King <wking@tremily.us> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2013, 22:18:57 UTC |
| d272c84 | David Aguilar | 10 February 2013, 01:21:25 UTC | p4merge: fix printf usage Do not use a random string as if it is a format string for printf when showing it literally; instead feed it to '%s' format. Reported-by: Asheesh Laroia <asheesh@asheesh.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2013, 19:40:52 UTC |
| 2a9ccff | David Aguilar | 10 February 2013, 01:21:25 UTC | difftool--helper: fix printf usage Do not use a random string as if it is a format string for printf when showing it literally; instead feed it to '%s' format. Reported-by: Asheesh Laroia <asheesh@asheesh.org> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 February 2013, 19:35:50 UTC |
| 48c9162 | Ben Walton | 09 February 2013, 21:46:58 UTC | cvsimport: format commit timestamp ourselves without using strftime Some implementations of strftime(3) lack support for "%z". Also there is no need for %s in git-cvsimport as the supplied time is already in seconds since the epoch. For %z, use the function get_tz_offset provided by Git.pm instead. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2013, 22:41:49 UTC |
| 75f7b5d | Ben Walton | 09 February 2013, 21:46:57 UTC | perl/Git.pm: fix get_tz_offset to properly handle DST boundary cases When passed a local time that was on the boundary of a DST change, get_tz_offset returned a GMT offset that was incorrect (off by one hour). This is because the time was converted to GMT and then back to a time stamp via timelocal() which cannot disambiguate boundary cases as noted in its documentation. Modify this algorithm, using an approach suggested in http://article.gmane.org/gmane.comp.version-control.git/213871 to first convert the timestamp in question to two broken down forms with localtime() and gmtime(), and then compute what timestamps these two broken down forms would represent in GMT (i.e. a timezone that does not have DST issues) by applying timegm() on them. The difference between the resulting timestamps is the timezone offset. This avoids the ambigious conversion and allows a correct time to be returned on every occassion. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2013, 22:34:18 UTC |
| 68868ff | Ben Walton | 09 February 2013, 21:46:56 UTC | Move Git::SVN::get_tz to Git::get_tz_offset This function has utility outside of the SVN module for any routine that needs the equivalent of GNU strftime's %z formatting option. Move it to the top-level Git.pm so that non-SVN modules don't need to import the SVN module to use it. The rename makes the purpose of the function clearer. Signed-off-by: Ben Walton <bdwalton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 February 2013, 22:01:28 UTC |
| 59cf706 | Asheesh Laroia | 08 February 2013, 01:16:24 UTC | git-mergetool: print filename when it contains % If git-mergetool was invoked with files with a percent sign (%) in their names, it would print an error. For example, if you were calling mergetool on a file called "%2F": printf: %2F: invalid directive Do not pass random string to printf as if it were a valid format. Use format string "%s" and pass the string as data to be formatted instead. Signed-off-by: Asheesh Laroia <asheesh@asheesh.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 February 2013, 21:10:06 UTC |
| f350082 | Junio C Hamano | 07 February 2013, 23:21:10 UTC | Git 1.8.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 February 2013, 23:21:10 UTC |
| 57ff170 | Junio C Hamano | 07 February 2013, 23:16:04 UTC | Merge branch 'mz/pick-unborn' into maint "git cherry-pick" did not replay a root commit to an unborn branch. * mz/pick-unborn: learn to pick/revert into unborn branch tests: move test_cmp_rev to test-lib-functions | 07 February 2013, 23:16:04 UTC |
| 5abbeb4 | Junio C Hamano | 07 February 2013, 23:16:00 UTC | Merge branch 'nd/fix-perf-parameters-in-tests' into maint * nd/fix-perf-parameters-in-tests: test-lib.sh: unfilter GIT_PERF_* | 07 February 2013, 23:16:00 UTC |
| 696c359 | Junio C Hamano | 07 February 2013, 23:15:23 UTC | Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into maint Scripts to test bash completion was inherently flaky as it was affected by whatever random things the user may have on $PATH. * jc/do-not-let-random-file-interfere-with-completion-tests: t9902: protect test from stray build artifacts | 07 February 2013, 23:15:23 UTC |
| 7728473 | Junio C Hamano | 07 February 2013, 23:15:08 UTC | Merge branch 'ft/transport-report-segv' into maint A failure to push due to non-ff while on an unborn branch dereferenced a NULL pointer when showing an error message. * ft/transport-report-segv: push: fix segfault when HEAD points nowhere | 07 February 2013, 23:15:08 UTC |
| d2216a4 | Junio C Hamano | 07 February 2013, 23:14:54 UTC | Merge branch 'sb/gpg-plug-fd-leak' into maint We forgot to close the file descriptor reading from "gpg" output, killing "git log --show-signature" on a long history. * sb/gpg-plug-fd-leak: gpg: close stderr once finished with it in verify_signed_buffer() | 07 February 2013, 23:14:54 UTC |
| 427c6d0 | Junio C Hamano | 07 February 2013, 23:14:22 UTC | Merge branch 'jc/fake-ancestor-with-non-blobs' into maint Rebasing the history of superproject with change in the submodule has been broken since v1.7.12. * jc/fake-ancestor-with-non-blobs: apply: diagnose incomplete submodule object name better apply: simplify build_fake_ancestor() git-am: record full index line in the patch used while rebasing | 07 February 2013, 23:14:22 UTC |
| 45bb6cb | Junio C Hamano | 07 February 2013, 23:13:34 UTC | Merge branch 'jn/auto-depend-workaround-buggy-ccache' into maint Buggy versions of ccache broke the auto-generation of dependencies. * jn/auto-depend-workaround-buggy-ccache: Makefile: explicitly set target name for autogenerated dependencies | 07 February 2013, 23:13:34 UTC |
| 3443db5 | Jeff King | 06 February 2013, 10:39:52 UTC | http_request: reset "type" strbuf before adding Callers may pass us a strbuf which we use to record the content-type of the response. However, we simply appended to it rather than overwriting its contents, meaning that cruft in the strbuf gave us a bogus type. E.g., the multiple requests triggered by http_request could yield a type like "text/plainapplication/x-git-receive-pack-advertisement". Reported-by: Michael Schubert <mschub@elegosoft.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 February 2013, 15:50:56 UTC |
| edbc00e | John Keeping | 05 February 2013, 21:39:49 UTC | t4038: add tests for "diff --cc --raw <trees>" Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2013, 21:54:30 UTC |
| af3aec4 | Junio C Hamano | 05 February 2013, 00:21:42 UTC | t5551: fix expected error output We should probably get rid of the check of message instead, but in the meantime this should do. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 February 2013, 00:21:42 UTC |
| 4656bf4 | Shawn Pearce | 31 January 2013, 21:02:07 UTC | Verify Content-Type from smart HTTP servers Before parsing a suspected smart-HTTP response verify the returned Content-Type matches the standard. This protects a client from attempting to process a payload that smells like a smart-HTTP server response. JGit has been doing this check on all responses since the dawn of time. I mistakenly failed to include it in git-core when smart HTTP was introduced. At the time I didn't know how to get the Content-Type from libcurl. I punted, meant to circle back and fix this, and just plain forgot about it. Signed-off-by: Shawn Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2013, 18:22:36 UTC |
| 42f50f8 | Junio C Hamano | 04 February 2013, 18:21:10 UTC | Start preparing for 1.8.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 February 2013, 18:21:10 UTC |
| 390ac27 | Junio C Hamano | 04 February 2013, 18:04:57 UTC | Merge branch 'bc/git-p4-for-python-2.4' into maint * bc/git-p4-for-python-2.4: INSTALL: git-p4 does not support Python 3 git-p4.py: support Python 2.4 git-p4.py: support Python 2.5 | 04 February 2013, 18:04:58 UTC |
| 6cc0149 | Junio C Hamano | 04 February 2013, 18:04:44 UTC | Merge branch 'nd/edit-branch-desc-while-detached' into maint Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. * nd/edit-branch-desc-while-detached: branch: no detached HEAD check when editing another branch's description | 04 February 2013, 18:04:44 UTC |
| 7f3d409 | Junio C Hamano | 04 February 2013, 18:04:26 UTC | Merge branch 'jn/do-not-drop-username-when-reading-from-etc-mailname' into maint We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. * jn/do-not-drop-username-when-reading-from-etc-mailname: ident: do not drop username when reading from /etc/mailname | 04 February 2013, 18:04:26 UTC |
| 3d00a5c | Junio C Hamano | 04 February 2013, 18:04:22 UTC | Merge branch 'jk/cvsimport-does-not-work-with-cvsps3' into maint * jk/cvsimport-does-not-work-with-cvsps3: git-cvsimport.txt: cvsps-2 is deprecated | 04 February 2013, 18:04:23 UTC |
| 61947de | Junio C Hamano | 04 February 2013, 18:04:10 UTC | Merge branch 'dl/am-hg-locale' into maint "git am" did not parse datestamp correctly from Hg generated patch, when it is run in a locale outside C (or en) * dl/am-hg-locale: am: invoke perl's strftime in C locale | 04 February 2013, 18:04:10 UTC |
| ba8748e | Junio C Hamano | 04 February 2013, 18:04:06 UTC | Merge branch 'jc/help' into maint * jc/help: help: include <common-cmds.h> only in one file | 04 February 2013, 18:04:06 UTC |
| 686b895 | Junio C Hamano | 04 February 2013, 18:03:41 UTC | Merge branch 'jc/merge-blobs' into maint * jc/merge-blobs: Makefile: Replace merge-file.h with merge-blobs.h in LIB_H merge-tree: fix d/f conflicts merge-tree: add comments to clarify what these functions are doing merge-tree: lose unused "resolve_directories" merge-tree: lose unused "flags" from merge_list Which merge_file() function do you mean? | 04 February 2013, 18:03:41 UTC |
| 2173205 | Junio C Hamano | 04 February 2013, 18:03:35 UTC | Merge branch 'jc/doc-maintainer' into maint * jc/doc-maintainer: howto/maintain: document "### match next" convention in jch/pu branch howto/maintain: mark titles for asciidoc Documentation: update "howto maintain git" | 04 February 2013, 18:03:35 UTC |
| 5617394 | Junio C Hamano | 04 February 2013, 18:03:13 UTC | Merge branch 'bc/fix-array-syntax-for-3.0-in-completion-bash' into maint Command line completion code was inadvertently made incompatible with older versions of bash by using a newer array notation. * bc/fix-array-syntax-for-3.0-in-completion-bash: git-completion.bash: replace zsh notation that breaks bash 3.X | 04 February 2013, 18:03:13 UTC |
| afcb6ac | John Keeping | 03 February 2013, 14:37:11 UTC | builtin/apply: tighten (dis)similarity index parsing This was prompted by an incorrect warning issued by clang [1], and a suggestion by Linus to restrict the range to check for values greater than INT_MAX since these will give bogus output after casting to int. In fact the (dis)similarity index is a percentage, so reject values greater than 100. [1] http://article.gmane.org/gmane.comp.version-control.git/213857 Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2013, 21:47:43 UTC |
| 7766705 | Junio C Hamano | 03 February 2013, 21:08:18 UTC | combine-diff: lift 32-way limit of combined diff The "raw" format of combine-diff output is supposed to have as many colons as there are parents at the beginning, then blob modes for these parents, and then object names for these parents. We weren't however prepared to handle a more than 32-way merge and did not show the correct number of colons in such a case. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 February 2013, 21:08:18 UTC |
| 6978934 | Jonathan Nieder | 18 November 2011, 23:23:24 UTC | Makefile: explicitly set target name for autogenerated dependencies "gcc -MF depfile -MMD -MP -c -o path/to/file.o" produces a makefile snippet named "depfile" describing what files are needed to build the target given by "-o". When ccache versions before v3.0pre0~187 (Fix handling of the -MD and -MDD options, 2009-11-01) run, they execute gcc -MF depfile -MMD -MP -E instead to get the final content for hashing. Notice that the "-c -o" combination is replaced by "-E". The result is a target name without a leading path. Thus when building git with such versions of ccache with COMPUTE_HEADER_DEPENDENCIES enabled, the generated makefile snippets define dependencies for the wrong target: $ make builtin/add.o GIT_VERSION = 1.7.8.rc3 * new build flags or prefix CC builtin/add.o $ head -1 builtin/.depend/add.o.d add.o: builtin/add.c cache.h git-compat-util.h compat/bswap.h strbuf.h \ After a change in a header file, object files in a subdirectory are not automatically rebuilt by "make": $ touch cache.h $ make builtin/add.o $ Luckily we can prevent trouble by explicitly supplying the name of the target to ccache and gcc, using the -MQ option. Do so. Reported-and-tested-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Reported-by: : 허종만 <jongman.heo@samsung.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Reviewed-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 February 2013, 02:09:33 UTC |
| bd4a3d6 | John Keeping | 31 January 2013, 21:59:50 UTC | Rename {git- => git}remote-helpers.txt When looking up a topic via "git help <topic>", git-help prepends "git-" to topics that are the names of commands (either builtin or found on the path) and "git" (no hyphen) to any other topic name. "git-remote-helpers" is not the name of a command, so "git help remote-helpers" looks for "gitremote-helpers" and does not find it. Fix this by renaming "git-remote-helpers.txt" to "gitremote-helpers.txt". Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2013, 22:12:34 UTC |
| e28efb1 | Junio C Hamano | 01 February 2013, 03:33:27 UTC | apply: diagnose incomplete submodule object name better "git am -3" uses this function to build a tree that records how the preimage the patch was created from would have looked like. An abbreviated object name on the index line is ordinarily sufficient for us to figure out the object name the preimage tree would have contained, but a change to a submodule by definition shows an object name of a submodule commit which our repository should not have, and get_sha1_blob() is not an appropriate way to read it (or get_sha1() for that matter). Use get_sha1_hex() and complain if we do not find a full object name there. We could read from the payload part of the patch to learn the full object name of the commit, but the primary user "git rebase" has been fixed to give us a full object name, so this should suffice for now. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2013, 04:30:55 UTC |
| e2afb0b | Junio C Hamano | 01 February 2013, 03:19:44 UTC | apply: simplify build_fake_ancestor() The local variable sha1_ptr in the build_fake_ancestor() function used to either point at the null_sha1[] (if the ancestor did not have the path) or at sha1[] (if we read the object name into the local array), but 7a98869 (apply: get rid of --index-info in favor of --build-fake-ancestor, 2007-09-17) made the "missing in the ancestor" case unnecessary, hence sha1_ptr, when used, always points at the local array. Get rid of the unneeded variable, and restructure the if/else cascade a bit to make it easier to read. There should be no behaviour change. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2013, 04:30:55 UTC |
| 4ae6d46 | Junio C Hamano | 01 February 2013, 03:26:21 UTC | git-am: record full index line in the patch used while rebasing Earlier, a230949 (am --rebasing: get patch body from commit, not from mailbox, 2012-06-26) learned to regenerate patch body from the commit object while rebasing, instead of reading from the rebase-am front-end. While doing so, it used "git diff-tree" but without giving it the "--full-index" option. This does not matter for in-repository objects; during rebasing, any abbreviated object name should uniquely identify them. But we may be rebasing a commit that contains a change to a gitlink, in which case we usually should not have the object (it names a commit in the submodule). A full object name is necessary to later reconstruct a fake ancestor index for them. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2013, 04:30:55 UTC |
| fa23348 | Junio C Hamano | 31 January 2013, 20:50:38 UTC | doc: mention tracking for pull.default When looking at a configuration file edited long time ago, a user may find 'pull.default = tracking' and wonder what it means, but earlier we stopped mentioning this value, even though the code still support it and more importantly, we have no intention to force old timers to update their configuration files. Instead of not mentioning it, add it to the description in a way that makes it clear that users have no reason to add new uses of it preferring over 'upstream', by not listing it as a separate item on the same footing as other values but as a deprecated synonym of the 'upstream' in its description. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 February 2013, 01:00:56 UTC |
| 7dac3f8 | Stephen Boyd | 31 January 2013, 18:18:40 UTC | gpg: close stderr once finished with it in verify_signed_buffer() Failing to close the stderr pipe in verify_signed_buffer() causes git to run out of file descriptors if there are many calls to verify_signed_buffer(). An easy way to trigger this is to run git log --show-signature --merges | grep "key" on the linux kernel git repo. Eventually it will fail with error: cannot create pipe for gpg: Too many open files error: could not run gpg. Close the stderr pipe so that this can't happen. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2013, 19:10:44 UTC |
| 1d2c14d | Fraser Tweedale | 31 January 2013, 12:22:51 UTC | push: fix segfault when HEAD points nowhere After a push of a branch other than the current branch fails in a no-ff error and if you are still on an unborn branch, the code recently added to report the failure dereferenced a null pointer while checking the name of the current branch. Signed-off-by: Fraser Tweedale <frase@frase.id.au> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 January 2013, 16:09:53 UTC |
| 2e4f04f | Junio C Hamano | 30 January 2013, 19:17:59 UTC | INSTALL: git-p4 does not support Python 3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2013, 19:17:59 UTC |
| 75135b2 | Nguyễn Thái Ngọc Duy | 28 January 2013, 01:18:13 UTC | branch: no detached HEAD check when editing another branch's description Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 January 2013, 16:59:56 UTC |
| e1b6ff4 | Junio C Hamano | 30 January 2013, 15:47:46 UTC | Merge branch 'tb/t0050-maint' into maint Update tests that were expecting to fail due to a bug that was fixed earlier. * tb/t0050-maint: t0050: Use TAB for indentation t0050: honor CASE_INSENSITIVE_FS in add (with different case) t0050: known breakage vanished in merge (case change) | 30 January 2013, 15:47:46 UTC |
| 025ea58 | Junio C Hamano | 29 January 2013, 19:18:54 UTC | Merge branch 'nd/fix-directory-attrs-off-by-one' into maint The attribute mechanism didn't allow limiting attributes to be applied to only a single directory itself with "path/" like the exclude mechanism does. The initial implementation of this that was merged to 'maint' and 1.8.1.1 had severe performance degradations. * nd/fix-directory-attrs-off-by-one: attr: avoid calling find_basename() twice per path attr: fix off-by-one directory component length calculation | 29 January 2013, 19:20:10 UTC |
| da2987d | Junio C Hamano | 29 January 2013, 19:18:31 UTC | Merge branch 'ph/rebase-preserve-all-merges' into maint "git rebase --preserve-merges" lost empty merges in recent versions of Git. * ph/rebase-preserve-all-merges: rebase --preserve-merges: keep all merge commits including empty ones | 29 January 2013, 19:18:31 UTC |
| 33b29fd | Junio C Hamano | 29 January 2013, 19:10:58 UTC | README: update stale and/or incorrect information Ramkumar Ramachandra noticed that the old address for the marc archive no longer works. Update it to its marc.info address, and also refer to the gmane site. Remove the reference to "note from the maintainer", which is not usually followed by any useful discussion on status, direction nor tasks. Also replace the reference to "What's in git.git" with "What's cooking". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2013, 19:17:44 UTC |
| 5748558 | Andrej E Baranov | 28 January 2013, 23:41:32 UTC | gitweb: refer to picon/gravatar images over the same scheme With the current code, the images from picon and gravatar are requested over http://, and browsers give mixed contents warning when gitweb is served over https://. Just drop the scheme: part from the URL, so that these external sites are accessed over https:// in such a case. Signed-off-by: Andrej E Baranov <admin@andrej-andb.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 January 2013, 02:58:50 UTC |
| 53cdd4e | Junio C Hamano | 28 January 2013, 19:17:54 UTC | Git 1.8.1.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 January 2013, 19:17:54 UTC |
| a77133e | Junio C Hamano | 28 January 2013, 19:13:31 UTC | Merge branch 'ss/help-htmlpath-config-doc' into maint * ss/help-htmlpath-config-doc: config.txt: Document help.htmlpath config parameter | 28 January 2013, 19:13:31 UTC |
| 6d7c1c8 | Junio C Hamano | 28 January 2013, 19:13:07 UTC | Merge branch 'nd/attr-debug-fix' into maint * nd/attr-debug-fix: attr: make it build with DEBUG_ATTR again | 28 January 2013, 19:13:07 UTC |
| 7025616 | Junio C Hamano | 28 January 2013, 19:12:47 UTC | Merge branch 'ds/completion-silence-in-tree-path-probe' into maint * ds/completion-silence-in-tree-path-probe: git-completion.bash: silence "not a valid object" errors | 28 January 2013, 19:12:47 UTC |
