summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-12-15Git 1.7.3.4v1.7.3.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.2.5v1.7.2.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.1.4v1.7.1.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.0.9v1.7.0.9Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.6.3v1.6.6.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.5.9v1.6.5.9Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.4.5v1.6.4.5Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15gitweb: Introduce esc_attr to escape attributes of HTML elementsJakub Narebski
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>
2010-12-14Prepare for 1.7.3.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-14use persistent memory for rejected pathsClemens Buchacher
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>
2010-12-14do not overwrite files in leading pathClemens Buchacher
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>
2010-12-14lstat_cache: optionally return match_lenClemens Buchacher
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>
2010-12-14add function check_ok_to_remove()Clemens Buchacher
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>
2010-12-14t7607: add leading-path testsClemens Buchacher
Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-14t7607: use test-lib functions and check MERGE_HEADClemens Buchacher
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>
2010-12-14Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano
* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
2010-12-14Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
2010-12-14Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano
* 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 '&&'
2010-12-14Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
2010-12-14Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
2010-12-14Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
2010-12-14Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
2010-12-14Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano
* 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
2010-12-10Prepare for 1.7.3.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-10Merge branch 'jk/maint-decorate-01-bool' into maintJunio C Hamano
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
2010-12-10Merge branch 'mg/maint-tag-rfc1991' into maintJunio C Hamano
* 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
2010-12-10Merge branch 'ks/maint-getenv-fix' into maintJunio C Hamano
* ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case
2010-12-10Add --force to git-send-email documentationAlejandro R. Sedeño
Signed-off-by: Alejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-09Merge branch 'jn/ignore-doc' into maintJunio C Hamano
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
2010-12-09Merge branch 'jn/cherry-pick-refresh-index' into maintJunio C Hamano
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
2010-12-09Merge branch 'jl/add-p-reverse-message' into maintJunio C Hamano
* jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
2010-12-09Merge branch 'fc/apply-p2-get-header-name' into maintJunio C Hamano
* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1
2010-12-09Merge branch 'np/pack-broken-boundary' into maintJunio C Hamano
* np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption
2010-12-09Merge branch 'ak/apply-non-git-epoch' into maintJunio C Hamano
* ak/apply-non-git-epoch: apply: handle patches with funny filename and colon in timezone apply: Recognize epoch timestamps with : in the timezone
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano
* cm/diff-check-at-eol: diff --check: correct line numbers of new blank lines at EOF
2010-12-09Merge branch 'tc/smart-http-post-redirect' into maintJunio C Hamano
* tc/smart-http-post-redirect: smart-http: Don't change POST to GET when following redirect
2010-12-09Merge branch 'ab/require-perl-5.8' into maintJunio C Hamano
* 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]
2010-12-09contrib/hooks/post-receive-email: fix return values from prep_for_emailAlan Raison
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>
2010-12-08Do not link with -lcrypto under NO_OPENSSLJunio C Hamano
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>
2010-12-07git-rm.txt: Fix quotingMichael J Gruber
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>
2010-12-03Git 1.7.3.3v1.7.3.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03CodingGuidelines: mention whitespace preferences for shell scriptsGiuseppe Bilotta
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-03Documentation: do not misinterpret pull refspec as bold textJonathan Nieder
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>
2010-12-03git-pull.txt: Mention branch.autosetuprebaseJari Aalto
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>
2010-12-02Prepare for 1.7.3.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.2.4v1.7.2.4Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.1.3v1.7.1.3Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Git 1.7.0.8v1.7.0.8Junio C Hamano
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-02Documentation: Fix mark-up of lines with more than one tildeJunio C Hamano
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>
generated by cgit v1.3 (git 2.53.0) at 2026-04-15 10:34:30 +0000