Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
Git 1.7.1.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.1.4
Junio C Hamano
Git 1.7.0.9 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.7.0.9
Junio C Hamano
Git 1.6.6.3 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.6.3
Junio C Hamano
Git 1.6.5.9 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.5.9
Junio C Hamano
Git 1.6.4.5 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tags
v1.6.4.5
Jakub Narębski
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 leas…
Junio C Hamano
Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher
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 Buchac…
Clemens Buchacher
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>
Clemens Buchacher
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>
Clemens Buchacher
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>
Clemens Buchacher
t7607: add leading-path tests Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Clemens Buchacher
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 …
Junio C Hamano
Merge branch 'jc/maint-no-openssl-build-fix' into maint * jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
Junio C Hamano
Merge branch 'ja/maint-pull-rebase-doc' into maint * ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
Junio C Hamano
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.[…
Junio C Hamano
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
Junio C Hamano
Merge branch 'jk/maint-reflog-bottom' into maint * jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
Junio C Hamano
Merge branch 'mz/rebase-abort-reflog-fix' into maint * mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
Junio C Hamano
Merge branch 'mz/maint-rebase-stat-config' into maint * mz/maint-rebase-stat-config: rebase: only show stat if configured to true
Junio C Hamano
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
Junio C Hamano
Prepare for 1.7.3.4 Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jk/maint-decorate-01-bool' into maint * jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
Junio C Hamano
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
Junio C Hamano
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
Alejandro R. Sedeño
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>
Junio C Hamano
Merge branch 'jn/ignore-doc' into maint * jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
Junio C Hamano
Merge branch 'jn/cherry-pick-refresh-index' into maint * jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
Junio C Hamano
Merge branch 'jl/add-p-reverse-message' into maint * jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
Junio C Hamano
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
  1. Prev
  2. Next