Skip to main content

Browse the archive

https://github.com/git/git
23 July 2024, 09:13:25 UTC
sort by:
Revision Author Date Message Commit Date
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
2bcd9ec Tay Ray Chuan 25 November 2010, 08:21:02 UTC t5550-http-fetch: add missing '&&' Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 26 November 2010, 22:50:44 UTC
16529f2 Junio C Hamano 24 November 2010, 20:47:42 UTC Merge branch 'jl/maint-pull-tags-doc' into maint * jl/maint-pull-tags-doc: pull: Remove --tags option from manpage 24 November 2010, 20:47:42 UTC
4713fd9 Junio C Hamano 24 November 2010, 20:47:27 UTC Merge branch 'kb/maint-diff-ws-check' into maint * kb/maint-diff-ws-check: diff: handle lines containing only whitespace and tabs better test-lib: extend test_decode_color to handle more color codes 24 November 2010, 20:47:27 UTC
a33fb40 Junio C Hamano 24 November 2010, 20:47:18 UTC Merge branch 'jm/mailmap' into maint * jm/mailmap: t4203: do not let "git shortlog" DWIM based on tty t4203 (mailmap): stop hardcoding commit ids and dates mailmap: fix use of freed memory 24 November 2010, 20:47:18 UTC
0f024af Junio C Hamano 24 November 2010, 20:47:10 UTC Merge branch 'tr/maint-git-repack-tmpfile' into maint * tr/maint-git-repack-tmpfile: repack: place temporary packs under .git/objects/pack/ 24 November 2010, 20:47:10 UTC
9bdef78 Junio C Hamano 24 November 2010, 20:47:04 UTC Merge branch 'jk/maint-apply-no-binary' into maint * jk/maint-apply-no-binary: apply: don't segfault on binary files with missing data 24 November 2010, 20:47:04 UTC
d2a9922 Junio C Hamano 24 November 2010, 20:46:46 UTC Merge branch 'jn/send-pack-error' into maint * jn/send-pack-error: send-pack: avoid redundant "pack-objects died with strange error" 24 November 2010, 20:46:46 UTC
a274f5b Junio C Hamano 24 November 2010, 20:46:40 UTC Merge branch 'ak/submodule-sync' into maint * ak/submodule-sync: submodule sync: Update "submodule.<name>.url" for empty directories 24 November 2010, 20:46:40 UTC
e7b9b80 Junio C Hamano 24 November 2010, 20:46:32 UTC Merge branch 'jk/maint-rev-list-nul' into maint * jk/maint-rev-list-nul: rev-list: handle %x00 NUL in user format 24 November 2010, 20:46:32 UTC
9cffe20 Junio C Hamano 24 November 2010, 20:46:26 UTC Merge branch 'cb/diff-fname-optim' into maint * cb/diff-fname-optim: diff: avoid repeated scanning while looking for funcname do not search functions for patch ID add rebase patch id tests 24 November 2010, 20:46:26 UTC
78bce6c Junio C Hamano 24 November 2010, 20:46:20 UTC Merge branch 'jk/no-textconv-symlink' into maint * jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks 24 November 2010, 20:46:20 UTC
42a038c Junio C Hamano 24 November 2010, 20:46:17 UTC Merge branch 'dk/maint-blame-el' into maint * dk/maint-blame-el: git-blame.el: Add (require 'format-spec) 24 November 2010, 20:46:17 UTC
385cc9d Junio C Hamano 24 November 2010, 20:46:14 UTC Merge branch 'aw/git-p4-deletion' into maint * aw/git-p4-deletion: Fix handling of git-p4 on deleted files 24 November 2010, 20:46:14 UTC
6cf9bf6 Junio C Hamano 24 November 2010, 20:45:39 UTC Merge branch 'kf/post-receive-sample-hook' into maint * kf/post-receive-sample-hook: post-receive-email: ensure sent messages are not empty 24 November 2010, 20:45:39 UTC
be0a4c8 Junio C Hamano 24 November 2010, 20:45:07 UTC Merge branch 'jk/repack-reuse-object' into maint * jk/repack-reuse-object: Documentation: pack.compression: explain how to recompress repack: add -F flag to let user choose between --no-reuse-delta/object Conflicts: Documentation/git-repack.txt 24 November 2010, 20:45:07 UTC
2f9d2e2 Junio C Hamano 24 November 2010, 20:44:46 UTC Merge branch 'bc/fix-cherry-pick-root' into maint * bc/fix-cherry-pick-root: builtin/revert.c: don't dereference a NULL pointer 24 November 2010, 20:44:46 UTC
eeae6d7 Junio C Hamano 24 November 2010, 20:44:41 UTC Merge branch 'uk/fix-author-ident-sed-script' into maint * uk/fix-author-ident-sed-script: get_author_ident_from_commit(): remove useless quoting 24 November 2010, 20:44:41 UTC
c5d2901 Junio C Hamano 24 November 2010, 20:44:35 UTC Merge branch 'ab/makefile-track-cc' into maint * ab/makefile-track-cc: Makefile: add CC to TRACK_CFLAGS 24 November 2010, 20:44:35 UTC
109a803 Junio C Hamano 24 November 2010, 20:44:26 UTC Merge branch 'mg/reset-doc' into maint * mg/reset-doc: git-reset.txt: make modes description more consistent git-reset.txt: point to git-checkout git-reset.txt: use "working tree" consistently git-reset.txt: reset --soft is not a no-op git-reset.txt: reset does not change files in target git-reset.txt: clarify branch vs. branch head 24 November 2010, 20:44:26 UTC
71d35bd Junio C Hamano 24 November 2010, 20:44:12 UTC Merge branch 'tr/send-email-refuse-sending-unedited-cover-letter' into maint * tr/send-email-refuse-sending-unedited-cover-letter: send-email: Refuse to send cover-letter template subject 24 November 2010, 20:44:12 UTC
401857c Diego Elio Pettenò 24 November 2010, 20:03:53 UTC imap-send: link against libcrypto for HMAC and others When using stricter linkers, such as GNU gold or Darwin ld, transitive dependencies are not counted towards symbol resolution. If we don't link imap-send to libcrypto, we'll have undefined references to the HMAC_*, EVP_* and ERR_* functions families. Signed-off-by: Diego Elio Pettenò <flameeyes@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2010, 20:23:48 UTC
83acaae Joe Perches 20 November 2010, 23:06:05 UTC git-send-email.perl: Deduplicate "to:" and "cc:" entries with names If an email address in the "to:" list is in the style "First Last <email@domain.tld>", ie: not just a bare address like "email@domain.tld", and the same named entry style exists in the "cc:" list, the current logic will not remove the entry from the "cc:" list. Add logic to better deduplicate the "cc:" list by also matching the email address with angle brackets. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2010, 18:10:35 UTC
ffa1eea Jeff King 22 November 2010, 04:42:53 UTC reflogs: clear flags properly in corner case The reflog-walking mechanism is based on the regular revision traversal. We just rewrite the parents of each commit in fake_reflog_parent to point to the commit in the next reflog entry instead of the real parents. However, the regular revision traversal tries not to show the same commit twice, and so sets the SHOWN flag on each commit it shows. In a reflog, however, we may want to see the same commit more than once if it appears in the reflog multiple times (which easily happens, for example, if you do a reset to a prior state). The fake_reflog_parent function takes care of this by clearing flags, including SHOWN. Unfortunately, it does so at the very end of the function, and it is possible to return early from the function if there is no fake parent to set up (e.g., because we are at the very first reflog entry on the branch). In such a case the flag is not cleared, and the entry is skipped by the revision traversal machinery as already shown. You can see this by walking the log of a ref which is set to its very first commit more than once (the test below shows such a situation). In this case the reflog walk will fail to show the entry for the initial creation of the ref. We don't want to simply move the flag-clearing to the top of the function; we want to make sure flags set during the fake-parent installation are also cleared. Instead, let's hoist the flag-clearing out of the fake_reflog_parent function entirely. It's not really about fake parents anyway, and the only caller is the get_revision machinery. Reported-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Jeff King <peff@peff.net> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2010, 00:24:24 UTC
729ec9e Martin von Zweigbergk 21 November 2010, 11:11:21 UTC rebase --abort: do not update branch ref If a non-interactive rebase of a ref fails at commit X and is aborted by the user, the ref will be updated twice. First to point at X (with the reflog message "rebase finished: $head_name onto $onto"), and then back to $orig_head. It should not be updated at all. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2010, 00:23:10 UTC
e93368d Erik Faye-Lund 23 November 2010, 19:53:08 UTC mingw: do not set errno to 0 on success Currently do_lstat always sets errno to 0 on success. This incorrectly overwrites previous errors. Fetch the error-code into a temporary variable instead, and assign that to errno on failure. Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 24 November 2010, 00:08:01 UTC
1c7d402 Nguyễn Thái Ngọc Duy 15 November 2010, 06:42:44 UTC clean: remove redundant variable baselen baselen used to be the result of common_prefix() when it was made builtin. Since 1d8842d (Add 'fill_directory()' helper function for directory traversal - 2009-05-14), its value will always be zero. Remove it because it's no longer variable. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2010, 21:26:38 UTC
5d268ed Junio C Hamano 17 November 2010, 21:18:19 UTC Merge branch 'mz/maint-rebase-X-fix' into maint * mz/maint-rebase-X-fix: t3402: test "rebase -s<strategy> -X<opt>" 17 November 2010, 21:18:19 UTC
11fe3f7 Martin von Zweigbergk 12 November 2010, 18:55:58 UTC Documentation/git-pull: clarify configuration The sentence about 'branch.<name>.rebase' refers to the first sentence in the paragraph and not to the sentence about avoiding rebasing non-local changes. Clarify this. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> 17 November 2010, 21:17:46 UTC
back to top