- 19 12月, 2010 1 次提交
-
-
由 Thomas Rast 提交于
Both had an unclosed ] that ruined the safeguard against not matching a non-space char. Signed-off-by: NThomas Rast <trast@student.ethz.ch> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 18 12月, 2010 2 次提交
-
-
由 Vasyl' Vavrychuk 提交于
Signed-off-by: NVasyl' Vavrychuk <vvavrychuk@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jiang Xin 提交于
The variable gc.packrefs for git-gc can be set to true, false and "notbare", not "nobare". Signed-off-by: NJiang Xin <jiangxin@ossxp.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 17 12月, 2010 2 次提交
-
-
由 Michael J Gruber 提交于
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: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Michael J Gruber 提交于
Signed-off-by: NMichael J Gruber <git@drmicha.warpmail.net> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 16 12月, 2010 8 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Jakub 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: NEmanuele Gentili <e.gentili@tigersecurity.it> Helped-by: NJohn 'Warthog9' Hawley <warthog9@kernel.org> Helped-by: NJonathan Nieder <jrnieder@gmail.com> Signed-off-by: NJakub Narebski <jnareb@gmail.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 15 12月, 2010 7 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens 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: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens 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: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
Return match_len so that the caller can know which leading path component matched. Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 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: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens Buchacher 提交于
Signed-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Clemens 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.orgSigned-off-by: NClemens Buchacher <drizzd@aon.at> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 14 12月, 2010 8 次提交
-
-
由 Junio C Hamano 提交于
* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
-
由 Junio C Hamano 提交于
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
-
由 Junio 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 '&&'
-
由 Junio C Hamano 提交于
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
-
由 Junio C Hamano 提交于
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
-
由 Junio C Hamano 提交于
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
-
由 Junio C Hamano 提交于
* mz/maint-rebase-stat-config: rebase: only show stat if configured to true
-
由 Junio 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
-
- 11 12月, 2010 5 次提交
-
-
由 Junio C Hamano 提交于
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
由 Junio C Hamano 提交于
* jk/maint-decorate-01-bool: log.decorate: accept 0/1 bool values
-
由 Junio 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
-
由 Junio C Hamano 提交于
* ks/maint-getenv-fix: setup: make sure git_dir path is in a permanent buffer, getenv(3) case
-
由 Alejandro R. Sedeño 提交于
Signed-off-by: NAlejandro R. Sedeño <asedeno@mit.edu> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
-
- 10 12月, 2010 7 次提交
-
-
由 Junio C Hamano 提交于
* jn/ignore-doc: Documentation: point to related commands from gitignore Documentation: split gitignore page into sections
-
由 Junio C Hamano 提交于
* jn/cherry-pick-refresh-index: cherry-pick/revert: transparently refresh index
-
由 Junio C Hamano 提交于
* jl/add-p-reverse-message: Correct help blurb in checkout -p and friends
-
由 Junio C Hamano 提交于
* np/diff-in-corrupt-repository: diff: don't presume empty file when corresponding object is missing
-
由 Junio C Hamano 提交于
* fc/apply-p2-get-header-name: test: git-apply -p2 rename/chmod only Fix git-apply with -p greater than 1
-
由 Junio C Hamano 提交于
* np/pack-broken-boundary: make pack-objects a bit more resilient to repo corruption
-
由 Junio 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
-