| 6e97ef3 | Junio C Hamano | 05 January 2011, 22:49:19 UTC | Git 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 January 2011, 22:49:19 UTC |
| 9d9f5e7 | Jonathan Nieder | 04 September 2010, 00:44:39 UTC | gitweb: skip logo in atom feed when there is none With v1.5.0-rc0~169 (gitweb: Fix Atom feed <logo>: it is $logo, not $logo_url, 2006-12-04), the logo URI to be written to Atom feeds was corrected but the case of no logo forgotten. Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 January 2011, 18:48:37 UTC |
| 57da204 | Robin H. Johnson | 29 December 2010, 21:02:31 UTC | t9001: Fix test prerequisites Add in missing Perl prerequisites for new tests of send-email. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 December 2010, 21:39:05 UTC |
| 1736793 | Junio C Hamano | 28 December 2010, 21:48:54 UTC | Prepare for 1.7.3.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 21:48:54 UTC |
| a121d53 | Junio C Hamano | 28 December 2010, 21:45:12 UTC | Merge branch 'jk/commit-die-on-bogus-ident' into maint * jk/commit-die-on-bogus-ident: commit: die before asking to edit the log message ident: die on bogus date format | 28 December 2010, 21:45:12 UTC |
| 359f34f | Junio C Hamano | 28 December 2010, 21:44:58 UTC | Merge branch 'ks/blame-worktree-textconv-cached' into maint * ks/blame-worktree-textconv-cached: fill_textconv(): Don't get/put cache if sha1 is not valid t/t8006: Demonstrate blame is broken when cachetextconv is on | 28 December 2010, 21:44:58 UTC |
| 58c58c8 | Junio C Hamano | 28 December 2010, 21:43:10 UTC | Merge branch 'jc/maint-rebase-rewrite-last-skip' into maint * jc/maint-rebase-rewrite-last-skip: rebase --skip: correctly wrap-up when skipping the last patch | 28 December 2010, 21:43:10 UTC |
| 2f73969 | Junio C Hamano | 28 December 2010, 21:42:55 UTC | Merge branch 'jc/maint-am-abort-safely' into maint * jc/maint-am-abort-safely: am --abort: keep unrelated commits since the last failure and warn | 28 December 2010, 21:42:55 UTC |
| 0ec9ee3 | Junio C Hamano | 28 December 2010, 21:23:20 UTC | Merge branch 'kb/maint-status-cquote' into maint * kb/maint-status-cquote: status: Quote paths with spaces in short format | 28 December 2010, 21:23:20 UTC |
| 5cd3e10 | Robin H. Johnson | 27 December 2010, 08:03:43 UTC | Fix false positives in t3404 due to SHELL=/bin/false If the user's shell in NSS passwd is /bin/false (eg as found during Gentoo's package building), the git-rebase exec tests will fail, because they call $SHELL around the command, and in the existing testcase, $SHELL was not being cleared sufficently. This lead to false positive failures of t3404 on systems where the package build user was locked down as noted above. Signed-off-by: "Robin H. Johnson" <robbat2@gentoo.org> X-Gentoo-Bug: 349083 X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=349083 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 December 2010, 19:22:16 UTC |
| 26517de | Junio C Hamano | 26 December 2010, 19:18:39 UTC | Merge branch 'rs/maint-diff-fd-leak' into maint * rs/maint-diff-fd-leak: close file on error in read_mmfile() | 26 December 2010, 19:18:39 UTC |
| 5fd8981 | René Scharfe | 25 December 2010, 12:38:46 UTC | close file on error in read_mmfile() Reported in http://qa.debian.org/daca/cppcheck/sid/git_1.7.2.3-2.2.html and in http://thread.gmane.org/gmane.comp.version-control.git/123042. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 December 2010, 19:17:18 UTC |
| c2ed29b | Brandon Casey | 22 December 2010, 23:58:52 UTC | test-lib.sh/test_decode_color(): use octal not hex in awk script POSIX awk seems to explicitly not support hexadecimal escape sequences. From http://pubs.opengroup.org/onlinepubs/009695399/: Regular expressions in awk have been extended somewhat... One sequence that is not supported is hexadecimal value escapes beginning with '\x'. This affects the awk on IRIX 6.5, and causes t4015.56 to fail. Use octal instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2010, 03:46:52 UTC |
| ef88ad2 | Junio C Hamano | 23 December 2010, 00:50:28 UTC | rebase --skip: correctly wrap-up when skipping the last patch When "rebase --skip" is used to skip the last patch in the series, the code to wrap up the rewrite by copying the notes from old to new commits and also by running the post-rewrite hook was bypassed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 December 2010, 00:50:28 UTC |
| 77e5726 | Jonathan Nieder | 21 December 2010, 20:27:55 UTC | t0050: fix printf format strings for portability Unlike bash and ksh, dash passes through hexadecimal \xcc escapes. So when run with dash, these tests *pass* (since '\xcc' is a perfectly reasonable filename) but they are not testing what was intended. Use octal escapes instead, in the spirit of v1.6.1-rc1~55^2 (2008-11-09). Reported-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 21:26:32 UTC |
| 00f66f0 | Ramsay Jones | 21 December 2010, 18:50:47 UTC | t3419-*.sh: Fix arithmetic expansion syntax error Some shells, for example dash versions older than 0.5.4, need to spell a variable reference as '$N' rather than 'N' in an arithmetic expansion. In order to avoid the syntax error, we change the offending variable reference from 'i' to '$i' in function scramble. There is nothing bash specific to this test script (and we shouldn't have any bash dependent test). Fix its shebang line. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 20:26:21 UTC |
| 7b3b7e3 | Junio C Hamano | 21 December 2010, 18:35:53 UTC | am --abort: keep unrelated commits since the last failure and warn After making commits (either by pulling or doing their own work) after a failed "am", the user will be reminded by next "am" invocation that there was a failed "am" that the user needs to decide to resolve or to get rid of the old "am" attempt. The "am --abort" option was meant to help the latter. However, it rewinded the HEAD back to the beginning of the failed "am" attempt, discarding commits made (perhaps by mistake) since. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 19:16:28 UTC |
| 4c28e4a | Junio C Hamano | 21 December 2010, 01:00:36 UTC | commit: die before asking to edit the log message When determine_author_info() returns to the calling prepare_to_commit(), we already know the pieces of information necessary to determine what author ident will be used in the final message, but deferred making a call to fmt_ident() before the final commit_tree(). Most importantly, we would open the editor to ask the user to compose the log message before it. As one important side effect of fmt_ident() is to error out when the given information is malformed, this resulted in us spawning the editor first and then refusing to commit due to error, even though we had enough information to detect the error before starting the editor, which was annoying. Move the fmt_ident() call to the end of determine_author_info() where we have final determination of author info to rectify this. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 December 2010, 01:45:51 UTC |
| 4579bb4 | Jeff King | 13 December 2010, 17:02:25 UTC | ident: die on bogus date format If the user gives "git commit --date=foobar", we silently ignore the --date flag. We should note the error. This patch puts the fix at the lowest level of fmt_ident, which means it also handles GIT_AUTHOR_DATE=foobar, as well. There are two down-sides to this approach: 1. Technically this breaks somebody doing something like "git commit --date=now", which happened to work because bogus data is the same as "now". Though we do explicitly handle the empty string, so anybody passing an empty variable through the environment will still work. If the error is too much, perhaps it can be downgraded to a warning? 2. The error checking happens _after_ the commit message is written, which can be annoying to the user. We can put explicit checks closer to the beginning of git-commit, but that feels a little hack-ish; suddenly git-commit has to care about how fmt_ident works. Maybe we could simply call fmt_ident earlier? Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 18:28:19 UTC |
| 9ec09b0 | Kirill Smelkov | 18 December 2010, 14:54:12 UTC | fill_textconv(): Don't get/put cache if sha1 is not valid When blaming files in the working tree, the filespec is marked with !sha1_valid, as we have not given the contents an object name yet. The function to cache textconv results (keyed on the object name), however, didn't check this condition, and ended up on storing the cached result under a random object name. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 02:41:32 UTC |
| b1b14ec | Kirill Smelkov | 18 December 2010, 14:54:11 UTC | t/t8006: Demonstrate blame is broken when cachetextconv is on I have a git repository with lots of .doc and .pdf files. There diff works ok, but blaming is painfully slow without textconv cache, and with textconv cache, blame says lots of lines are 'Not Yet Committed' which is wrong. Here is a test that demonstrates the problem. Cc: Axel Bonnet <axel.bonnet@ensimag.imag.fr> Cc: Clément Poulain <clement.poulain@ensimag.imag.fr> Cc: Diane Gasselin <diane.gasselin@ensimag.imag.fr> Cc: Jeff King <peff@peff.net> Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 December 2010, 02:17:00 UTC |
| 05bb5a2 | Jakub Narebski | 18 December 2010, 20:02:13 UTC | gitweb: Include links to feeds in HTML header only for '200 OK' response To do that, generating "<link />"s to feeds were refactored into print_feed_meta() subroutine, to keep nesting (indent) level in git_header_html() low. This has also the advantage of making code more clear. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:45 UTC |
| 0c806a0 | Mark Lodato | 18 December 2010, 05:38:38 UTC | fsck docs: remove outdated and useless diagnostic In git-fsck(1), there was a reference to the warning "<tree> has full pathnames in it". This exact wording has not been used since 2005 (commit f1f0d0889e55), when the wording was changed slightly. More importantly, the description of that warning was useless, and there were many other similar warning messages which were not document at all. Since all these warnings are fairly obvious, there is no need for them to be in the man page. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| b34f69f | Thomas Rast | 18 December 2010, 16:17:53 UTC | userdiff: fix typo in ruby and python word regexes Both had an unclosed ] that ruined the safeguard against not matching a non-space char. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 December 2010, 06:58:40 UTC |
| 8e8aa44 | Vasyl' Vavrychuk | 16 December 2010, 22:38:42 UTC | trace.c: mark file-local function static Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 21:40:32 UTC |
| 4be0c35 | Jiang Xin | 16 December 2010, 07:16:49 UTC | Fix typo in git-gc document. The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: Jiang Xin <jiangxin@ossxp.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 December 2010, 19:53:53 UTC |
| 4a689af | Michael J Gruber | 14 December 2010, 09:18:35 UTC | difftool: provide basename to external tools Currently, only configured diff helpers get the basename of the file being compared. Tools specified with "git difftool -x" only get the names of temporary files for the different versions. Export BASE so that an external tool can read the name from the environment. Rather than using a third argument, this avoids breaking existing scripts which may somewhat carelessly be using "$@" rather than "$1" "$2". Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:36 UTC |
| 51bacee | Michael J Gruber | 14 December 2010, 09:18:34 UTC | git-difftool.txt: correct the description of $BASE and describe $MERGED Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 December 2010, 21:01:31 UTC |
| fa1c854 | Junio C Hamano | 15 December 2010, 19:47:40 UTC | Git 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:47:40 UTC |
| b91779f | Junio C Hamano | 15 December 2010, 19:45:36 UTC | Git 1.7.2.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:45:36 UTC |
| 9db41eb | Junio C Hamano | 15 December 2010, 19:40:40 UTC | Git 1.7.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:40:40 UTC |
| cb198b3 | Junio C Hamano | 15 December 2010, 19:38:19 UTC | Git 1.7.0.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:38:19 UTC |
| abf411e | Junio C Hamano | 15 December 2010, 19:32:57 UTC | Git 1.6.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:32:57 UTC |
| ec82874 | Junio C Hamano | 15 December 2010, 19:27:41 UTC | Git 1.6.5.9 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:27:41 UTC |
| 88fcc52 | Junio C Hamano | 15 December 2010, 19:19:11 UTC | Git 1.6.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:19:11 UTC |
| 3017ed6 | Jakub Narebski | 14 December 2010, 23:34:01 UTC | gitweb: Introduce esc_attr to escape attributes of HTML elements It is needed only to escape attributes of handcrafted HTML elements, and not those generated using CGI.pm subroutines / methods for HTML generation. While at it, add esc_url and esc_html where needed, and prefer to use CGI.pm HTML generating methods than handcrafted HTML code. Most of those are probably unnecessary (could be exploited only by person with write access to gitweb config, or at least access to the repository). This fixes CVE-2010-3906 Reported-by: Emanuele Gentili <e.gentili@tigersecurity.it> Helped-by: John 'Warthog9' Hawley <warthog9@kernel.org> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 December 2010, 19:16:31 UTC |
| ada6a41 | Junio C Hamano | 14 December 2010, 15:51:35 UTC | Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:52 UTC |
| 3055d78 | Clemens Buchacher | 15 November 2010, 19:52:19 UTC | use persistent memory for rejected paths An aborted merge prints the list of rejected paths as part of the error message. Since commit f66caaf9 (do not overwrite files in leading path), some of those paths do not have static buffers, so we have to keep a copy. Use string_list's to accomplish this. This changes the order of the list to the order in which the paths are processed. Previously, it was reversed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:13 UTC |
| b1735b1 | Clemens Buchacher | 09 October 2010, 13:53:00 UTC | do not overwrite files in leading path If the work tree contains an untracked file x, and unpack-trees wants to checkout a path x/*, the file x is removed unconditionally. Instead, apply the same checks that are normally used for untracked files, and abort if the file cannot be removed. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:12 UTC |
| f7e3bd3 | Clemens Buchacher | 09 October 2010, 13:52:59 UTC | lstat_cache: optionally return match_len Return match_len so that the caller can know which leading path component matched. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:11 UTC |
| 6838d1a | Clemens Buchacher | 09 October 2010, 13:52:58 UTC | add function check_ok_to_remove() This wraps some inline code into the function check_ok_to_remove(), which will later be used for leading path components as well. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:55:10 UTC |
| 175659b | Clemens Buchacher | 10 October 2010, 08:38:58 UTC | t7607: add leading-path tests Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:54:05 UTC |
| 18a1d89 | Clemens Buchacher | 10 October 2010, 08:35:43 UTC | t7607: use test-lib functions and check MERGE_HEAD Use the test_commit and test_path_is_missing functions from the test library. Also make sure that a merge which fails due to pre-merge checks aborts properly and does not leave MERGE_HEAD behind. The "will not overwrite removed file" test is an exception to this. It notices the untracked file at a stage where the merge is already well under way. Therefore we cannot abort the merge without major restructuring. See the following thread for more details. http://mid.gmane.org/7vskopwxej.fsf@gitster.siamese.dyndns.org Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 December 2010, 16:09:56 UTC |
| 40d675f | Junio C Hamano | 14 December 2010, 15:50:20 UTC | Merge branch 'jc/maint-no-openssl-build-fix' into maint * jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL | 14 December 2010, 15:50:20 UTC |
| b69fb78 | Junio C Hamano | 14 December 2010, 15:36:23 UTC | Merge branch 'ja/maint-pull-rebase-doc' into maint * ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase | 14 December 2010, 15:36:23 UTC |
| 6b090e1 | Junio C Hamano | 14 December 2010, 15:36:10 UTC | Merge branch 'tc/http-urls-ends-with-slash' into maint * tc/http-urls-ends-with-slash: http-fetch: rework url handling http-push: add trailing slash at arg-parse time, instead of later on http-push: check path length before using it http-push: Normalise directory names when pushing to some WebDAV servers http-backend: use end_url_with_slash() url: add str wrapper for end_url_with_slash() shift end_url_with_slash() from http.[ch] to url.[ch] t5550-http-fetch: add test for http-fetch t5550-http-fetch: add missing '&&' | 14 December 2010, 15:36:10 UTC |
| 5b57076 | Junio C Hamano | 14 December 2010, 15:36:00 UTC | Merge branch 'nd/maint-hide-checkout-index-from-error' into maint * nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages | 14 December 2010, 15:36:00 UTC |
| 006f424 | Junio C Hamano | 14 December 2010, 15:35:50 UTC | Merge branch 'jk/maint-reflog-bottom' into maint * jk/maint-reflog-bottom: reflogs: clear flags properly in corner case | 14 December 2010, 15:35:50 UTC |
| 37ad7ca | Junio C Hamano | 14 December 2010, 15:35:44 UTC | Merge branch 'mz/rebase-abort-reflog-fix' into maint * mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref | 14 December 2010, 15:35:44 UTC |
| e0cbf12 | Junio C Hamano | 14 December 2010, 15:35:31 UTC | Merge branch 'mz/maint-rebase-stat-config' into maint * mz/maint-rebase-stat-config: rebase: only show stat if configured to true | 14 December 2010, 15:35:31 UTC |
| 187b259 | Junio C Hamano | 14 December 2010, 15:35:18 UTC | Merge branch 'gc/http-with-non-ascii-username-url' into maint * gc/http-with-non-ascii-username-url: Fix username and password extraction from HTTP URLs t5550: test HTTP authentication and userinfo decoding Conflicts: t/lib-httpd/apache.conf | 14 December 2010, 15:35:18 UTC |
| c6d059b | Junio C Hamano | 11 December 2010, 00:35:00 UTC | Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 December 2010, 00:35:00 UTC |
| 7bf040c | Junio C Hamano | 11 December 2010, 00:13:14 UTC | Merge branch 'jk/maint-decorate-01-bool' into maint * jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values | 11 December 2010, 00:13:14 UTC |
| aa78384 | Junio C Hamano | 11 December 2010, 00:13:03 UTC | Merge branch 'mg/maint-tag-rfc1991' into maint * mg/maint-tag-rfc1991: tag: recognize rfc1991 signatures tag: factor out sig detection for tag display tag: factor out sig detection for body edits verify-tag: factor out signature detection t/t7004-tag: test handling of rfc1991 signatures | 11 December 2010, 00:13:03 UTC |
| af41867 | Junio C Hamano | 11 December 2010, 00:12:51 UTC | Merge branch 'ks/maint-getenv-fix' into maint * ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case | 11 December 2010, 00:12:51 UTC |
| 1a3e302 | Alejandro R. Sedeño | 10 December 2010, 18:44:15 UTC | Add --force to git-send-email documentation Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 December 2010, 18:50:32 UTC |
| 4b5f94c | Junio C Hamano | 09 December 2010, 18:38:16 UTC | Merge branch 'jn/ignore-doc' into maint * jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections | 09 December 2010, 18:38:16 UTC |
| 6aa6a92 | Junio C Hamano | 09 December 2010, 18:36:51 UTC | Merge branch 'jn/cherry-pick-refresh-index' into maint * jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index | 09 December 2010, 18:36:51 UTC |
| 11cf80d | Junio C Hamano | 09 December 2010, 18:36:47 UTC | Merge branch 'jl/add-p-reverse-message' into maint * jl/add-p-reverse-message: Correct help blurb in checkout -p and friends | 09 December 2010, 18:36:47 UTC |
| 8577def | Junio C Hamano | 09 December 2010, 18:36:39 UTC | Merge branch 'np/diff-in-corrupt-repository' into maint * np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing | 09 December 2010, 18:36:39 UTC |
| a59c872 | Junio C Hamano | 09 December 2010, 18:36:36 UTC | Merge branch 'fc/apply-p2-get-header-name' into maint * fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1 | 09 December 2010, 18:36:36 UTC |
| 5605685 | Junio C Hamano | 09 December 2010, 18:36:23 UTC | Merge branch 'np/pack-broken-boundary' into maint * np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption | 09 December 2010, 18:36:23 UTC |
| ded4dfd | Junio C Hamano | 09 December 2010, 18:36:16 UTC | Merge branch 'ak/apply-non-git-epoch' into maint * ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone | 09 December 2010, 18:36:16 UTC |
| ae0a37c | Junio C Hamano | 09 December 2010, 18:36:10 UTC | Merge branch 'cm/diff-check-at-eol' into maint * cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF | 09 December 2010, 18:36:10 UTC |
| d3334d9 | Junio C Hamano | 09 December 2010, 18:36:04 UTC | Merge branch 'tc/smart-http-post-redirect' into maint * tc/smart-http-post-redirect: smart-http: Don't change POST to GET when following redirect | 09 December 2010, 18:36:04 UTC |
| fa8f1ca | Junio C Hamano | 09 December 2010, 18:35:21 UTC | Merge branch 'ab/require-perl-5.8' into maint * ab/require-perl-5.8: perl: use "use warnings" instead of -w perl: bump the required Perl version to 5.8 from 5.6.[21] | 09 December 2010, 18:35:21 UTC |
| 8828aa3 | Alan Raison | 09 December 2010, 16:03:05 UTC | contrib/hooks/post-receive-email: fix return values from prep_for_email The function was returning 0 for failure and 1 for success which was breaking the logic in the main loop. It now also returns in all cases, rather than exiting. Signed-off-by: Alan Raison <alan@theraisons.me.uk> Acked-by: Kevin P. Fleming <kpfleming@digium.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 December 2010, 17:34:11 UTC |
| 5b02b9b | Junio C Hamano | 08 December 2010, 22:54:13 UTC | Do not link with -lcrypto under NO_OPENSSL With 401857c (imap-send: link against libcrypto for HMAC and others, 2010-11-24) we started linking imap-send unconditionally with -lcrypto by mistake; disable this when we are building under NO_OPENSSL. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2010, 22:54:13 UTC |
| f34e9ed | Michael J Gruber | 07 December 2010, 09:07:11 UTC | git-rm.txt: Fix quoting Literal " produces typographically incorrect quotations, but "works" in most circumstances. In the subheadings of git-rm.txt, it "works" for the html backend but not for the docbook conversion to nroff: double "" and spurious double spaces appear in the output. Replace "incorrect" quotations by ``correct'' ones, and fix other "quotations" which are really `code fragments`. This should make git-rm.txt "-clean. Reported-by: Jeff King <peff@peff.net> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2010, 21:13:21 UTC |
| 6079ec6 | Junio C Hamano | 03 December 2010, 23:18:06 UTC | Git 1.7.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2010, 23:23:01 UTC |
| f36a4fa | Giuseppe Bilotta | 03 December 2010, 16:47:35 UTC | CodingGuidelines: mention whitespace preferences for shell scripts Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2010, 23:22:59 UTC |
| 3bae8d4 | Jonathan Nieder | 03 December 2010, 20:04:17 UTC | Documentation: do not misinterpret pull refspec as bold text Use the {asterisk} entity to avoid mistreating the asterisks in "(e.g., refs/heads/*:refs/remotes/origin/*)" as delimiters for bold text. From a quick search with 'git grep -e "\*.*\*"', this seems to be the last example of this particular formatting problem. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2010, 23:22:52 UTC |
| c4f4157 | Jari Aalto | 03 December 2010, 08:20:54 UTC | git-pull.txt: Mention branch.autosetuprebase In "Options related to merging" mention also related option branch.autosetuprebase in git-config(1). Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2010, 19:16:45 UTC |
| 7e4eb21 | Junio C Hamano | 02 December 2010, 20:24:42 UTC | Prepare for 1.7.3.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 22:31:17 UTC |
| 2850c1a | Junio C Hamano | 02 December 2010, 22:28:01 UTC | Git 1.7.2.4 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 22:28:01 UTC |
| bd01c6d | Junio C Hamano | 02 December 2010, 20:18:49 UTC | Git 1.7.1.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 20:18:49 UTC |
| cbcab75 | Junio C Hamano | 02 December 2010, 20:06:06 UTC | Git 1.7.0.8 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 20:13:27 UTC |
| be1b055 | Junio C Hamano | 02 December 2010, 19:23:50 UTC | Documentation: Fix mark-up of lines with more than one tilde The manual pages of cherry-pick and revert had examples with two revisions on the same line in the examples section, that looked like this: git cherry-pick master~4 master~2:: Unfortunately, this is taken as a mark-up to make the part between two tildes, "4 master", subscript. Use {tilde} to make it explicit that we do want ~ characters in these places (backslash does not help). Reported-by: Sylvain Rabot <sylvain.rabot@f-secure.com> Helped-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2010, 19:30:35 UTC |
| 47f16e8 | Junio C Hamano | 02 December 2010, 19:27:13 UTC | Merge branch 'cb/maint-orphan-merge-noclobber' into maint * cb/maint-orphan-merge-noclobber: do not overwrite untracked during merge from unborn branch | 02 December 2010, 19:27:13 UTC |
| 54d04f2 | Junio C Hamano | 02 December 2010, 19:27:08 UTC | Merge branch 'jk/add-e-doc' into maint * jk/add-e-doc: docs: give more hints about how "add -e" works docs: give more hints about how "add -e" works | 02 December 2010, 19:27:08 UTC |
| 1f238da | Junio C Hamano | 02 December 2010, 19:26:49 UTC | Merge branch 'bg/maint-gitweb-test-lib' into maint * bg/maint-gitweb-test-lib: t/gitweb-lib: Don't pass constant to decode_utf8 | 02 December 2010, 19:26:49 UTC |
| a49e9af | Junio C Hamano | 02 December 2010, 19:26:40 UTC | Merge branch 'tr/maint-merge-file-subdir' into maint * tr/maint-merge-file-subdir: merge-file: correctly find files when called in subdir prefix_filename(): safely handle the case where pfx_len=0 | 02 December 2010, 19:26:40 UTC |
| 9f6774e | Junio C Hamano | 02 December 2010, 19:26:24 UTC | Merge branch 'ks/no-textconv-symlink' into maint * ks/no-textconv-symlink: blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664'' blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks blame,cat-file: Prepare --textconv tests for correctly-failing conversion program | 02 December 2010, 19:26:24 UTC |
| f3a70e9 | Junio C Hamano | 02 December 2010, 19:25:36 UTC | Merge branch 'bc/fortran-userdiff' into maint * bc/fortran-userdiff: userdiff.c: add builtin fortran regex patterns | 02 December 2010, 19:25:36 UTC |
| 5501bf8 | Junio C Hamano | 02 December 2010, 00:40:26 UTC | Merge branch 'maint-1.7.2' into maint * maint-1.7.2: add: introduce add.ignoreerrors synonym for add.ignore-errors bash: Match lightweight tags in prompt git-commit.txt: (synopsis): move -i and -o before "--" | 02 December 2010, 00:40:26 UTC |
| 2de132f | Junio C Hamano | 02 December 2010, 00:40:20 UTC | Merge branch 'maint-1.7.1' into maint-1.7.2 * maint-1.7.1: add: introduce add.ignoreerrors synonym for add.ignore-errors | 02 December 2010, 00:40:20 UTC |
| e760924 | Junio C Hamano | 02 December 2010, 00:37:34 UTC | Merge branch 'maint-1.7.0' into maint-1.7.1 * maint-1.7.0: add: introduce add.ignoreerrors synonym for add.ignore-errors | 02 December 2010, 00:37:34 UTC |
| 6b3020a | Jonathan Nieder | 01 December 2010, 18:36:15 UTC | add: introduce add.ignoreerrors synonym for add.ignore-errors The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add a config option to ignore errors for git-add, 2008-05-12) does not follow the usual convention for naming values in the git configuration file. What convention? Glad you asked. The section name indicates the affected subsystem. The subsection name, if any, indicates which of an unbound set of things to set the value for. The variable name describes the effect of tweaking this knob. The section and variable names can be broken into words using bumpyCaps in documentation as a hint to the reader. These word breaks are not significant at the level of code, since the section and variable names are not case sensitive. The name "add.ignore-errors" includes a dash, meaning a naive configuration file like [add] ignoreErrors does not have any effect. Avoid such confusion by renaming to the more consistent add.ignoreErrors, but keep the old version for backwards compatibility. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2010, 21:40:12 UTC |
| bd40d25 | knittl | 01 December 2010, 13:17:00 UTC | bash: Match lightweight tags in prompt The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2010, 19:51:59 UTC |
| dc91e1b | Jari Aalto | 01 December 2010, 14:51:25 UTC | git-commit.txt: (synopsis): move -i and -o before "--" All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2010, 19:26:43 UTC |
| 9474a02 | Martin von Zweigbergk | 09 November 2010, 20:59:00 UTC | rebase: only show stat if configured to true If rebase.stat is set to true, a diffstat should be displayed. If it is not set, it should default to false. However, if it is explicitly set to false (or other value), a diffstat is still displayed, which is probably not what most users would expect. Show diffstat only if it is set to true. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2010, 22:49:54 UTC |
| d43e907 | Nguyễn Thái Ngọc Duy | 28 November 2010, 04:36:38 UTC | entry.c: remove "checkout-index" from error messages Back then when entry.c was part of checkout-index (or checkout-cache at that time [1]). It makes sense to print the command name in error messages. Nowadays entry.c is in libgit and can be used by any commands, printing "git checkout-index: blah" does no more than confusion. The error messages without it still give enough information. [1] 12dccc1 (Make fiel checkout function available to the git library - 2005-06-05) Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2010, 22:03:07 UTC |
| 6f5185b | Tay Ray Chuan | 25 November 2010, 08:21:10 UTC | http-fetch: rework url handling Do away with a second url variable, rewritten_url, and make url non-const. This is safe because the functions called with url (ie. get_http_walker() and walker_fetch()) do not modify it (ie. marked with const char *). Also, replace code that adds a trailing slash with a call to str_end_url_with_slash(). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:46 UTC |
| 1462d1a | Tay Ray Chuan | 25 November 2010, 08:21:09 UTC | http-push: add trailing slash at arg-parse time, instead of later on That way, we don't have to update repo->path and repo->path_len again after adding the trailing slash. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:46 UTC |
| dfc2dcd | Tay Ray Chuan | 25 November 2010, 08:21:08 UTC | http-push: check path length before using it We use path_len to skip the base url/path, but we do not know for sure if path does indeed contain the base url/path. Check if this is so. Helped-by: Johnathan Nieder <jrnieder@gmail.com> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:46 UTC |
| 0fdadc5 | Tay Ray Chuan | 25 November 2010, 08:21:07 UTC | http-push: Normalise directory names when pushing to some WebDAV servers Fix a bug when pushing to WebDAV servers which do not use a trailing slash for collection names. The previous implementation fails to see that the requested resource "refs/" is the same resource as "refs" and loads every reference twice (once for refs/ and once for refs). This implementation normalises every collection name by appending a trailing slash if necessary. This can be tested with old versions of Apache (such as the WebDAV server of GMX, Apache 2.0.63). Based-on-patch-by: Gabriel Corona <gabriel.corona@enst-bretagne.fr> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:45 UTC |
| cf688cc | Tay Ray Chuan | 25 November 2010, 08:21:06 UTC | http-backend: use end_url_with_slash() Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:45 UTC |
| 3793a30 | Tay Ray Chuan | 25 November 2010, 08:21:05 UTC | url: add str wrapper for end_url_with_slash() Helped-by: Johnathan Nieder <jrnieder@gmail.com> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:45 UTC |
| 1966d9f | Tay Ray Chuan | 25 November 2010, 08:21:04 UTC | shift end_url_with_slash() from http.[ch] to url.[ch] This allows non-http/curl users to access it too (eg. http-backend.c). Update include headers in end_url_with_slash() users too. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:45 UTC |
| 6cfc028 | Tay Ray Chuan | 25 November 2010, 08:21:03 UTC | t5550-http-fetch: add test for http-fetch Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 November 2010, 22:50:45 UTC |
