summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-12-16Update draft release notes to 1.7.4Libravatar Junio C Hamano2-7/+43
We are getting closer to -rc0 ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-16Merge branch 'maint'Libravatar Junio C Hamano2-2/+5
* maint: difftool: provide basename to external tools git-difftool.txt: correct the description of $BASE and describe $MERGED
2010-12-16difftool: provide basename to external toolsLibravatar Michael J Gruber2-0/+2
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>
2010-12-16git-difftool.txt: correct the description of $BASE and describe $MERGEDLibravatar Michael J Gruber1-2/+3
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-16Merge branch 'kb/diff-C-M-synonym'Libravatar Junio C Hamano2-10/+10
* kb/diff-C-M-synonym: diff: use "find" instead of "detect" as prefix for long forms of -M and -C diff: add --detect-copies-harder as a synonym for --find-copies-harder
2010-12-16Merge branch 'jn/fast-import-blob-access'Libravatar Junio C Hamano3-31/+447
* jn/fast-import-blob-access: t9300: avoid short reads from dd t9300: remove unnecessary use of /dev/stdin fast-import: Allow cat-blob requests at arbitrary points in stream fast-import: let importers retrieve blobs fast-import: clarify documentation of "feature" command fast-import: stricter parsing of integer options Conflicts: fast-import.c
2010-12-16Merge branch 'jl/fetch-submodule-recursive'Libravatar Junio C Hamano8-17/+387
* jl/fetch-submodule-recursive: fetch_populated_submodules(): document dynamic allocation Submodules: Add the "fetchRecurseSubmodules" config option Add the 'fetch.recurseSubmodules' config setting fetch/pull: Add the --recurse-submodules option Conflicts: builtin/fetch.c
2010-12-16Merge branch 'rj/msvc-fix'Libravatar Junio C Hamano4-7/+8
* rj/msvc-fix: msvc: Fix macro redefinition warnings msvc: Fix build by adding missing INTMAX_MAX define msvc: git-daemon.exe: Fix linker "unresolved externals" error msvc: Fix compilation errors in compat/win32/sys/poll.c
2010-12-16Merge branch 'nd/extended-sha1-relpath'Libravatar Junio C Hamano5-4/+127
* nd/extended-sha1-relpath: get_sha1: teach ":$n:<path>" the same relative path logic get_sha1: support relative path ":path" syntax Make prefix_path() return char* without const Conflicts: sha1_name.c
2010-12-16Merge branch 'aa/status-hilite-branch'Libravatar Junio C Hamano7-9/+31
* aa/status-hilite-branch: default color.status.branch to "same as header" status: show branchname with a configurable color
2010-12-16Merge branch 'ak/describe-exact'Libravatar Junio C Hamano1-25/+60
* ak/describe-exact: describe: Delay looking up commits until searching for an inexact match describe: Store commit_names in a hash table by commit SHA1 describe: Do not use a flex array in struct commit_name describe: Use for_each_rawref
2010-12-16Merge branch 'nd/maint-relative'Libravatar Junio C Hamano1-0/+6
* nd/maint-relative: get_cwd_relative(): do not misinterpret root path
2010-12-16Merge branch 'jn/maint-svn-fe'Libravatar Junio C Hamano5-10/+38
* jn/maint-svn-fe: t9010 fails when no svn is available vcs-svn: fix intermittent repo_tree corruption treap: make treap_insert return inserted node t9010 (svn-fe): Eliminate dependency on svn perl bindings
2010-12-16Merge branch 'jc/maint-svn-info-test-fix'Libravatar Junio C Hamano1-72/+34
* jc/maint-svn-info-test-fix: t9119: do not compare "Text Last Updated" line from "svn info"
2010-12-16Merge branch 'jn/submodule-b-current'Libravatar Junio C Hamano2-20/+24
* jn/submodule-b-current: git submodule: Remove now obsolete tests before cloning a repo git submodule -b ... of current HEAD fails
2010-12-16Merge branch 'jn/maint-fast-import-object-reuse'Libravatar Junio C Hamano1-7/+2
* jn/maint-fast-import-object-reuse: fast-import: insert new object entries at start of hash bucket
2010-12-16Merge branch 'jn/fast-import-ondemand-checkpoint'Libravatar Junio C Hamano2-1/+47
* jn/fast-import-ondemand-checkpoint: fast-import: treat SIGUSR1 as a request to access objects early
2010-12-15Sync with 1.7.3.4Libravatar Junio C Hamano9-18/+114
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.3.4Libravatar Junio C Hamano9-18/+113
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.2.5Libravatar Junio C Hamano9-19/+111
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.1.4Libravatar Junio C Hamano8-19/+104
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.7.0.9Libravatar Junio C Hamano7-19/+96
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.6.3Libravatar Junio C Hamano6-19/+88
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.5.9Libravatar Junio C Hamano5-18/+64
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15Git 1.6.4.5Libravatar Junio C Hamano3-2/+22
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-15gitweb: Introduce esc_attr to escape attributes of HTML elementsLibravatar Jakub Narebski1-15/+22
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-14Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano3-305/+1654
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add Brazilian Portuguese (pt-BR) translation gitk: Make text selectable on Mac gitk: Prevent the text pane from becoming editable gitk: Add the equivalent of diff --color-words gitk: Update Swedish translation (290t) gitk: Show notes by default (like git log does)
2010-12-14Merge branch 'maint'Libravatar Junio C Hamano3-5/+14
* maint: Prepare for 1.7.3.4 use persistent memory for rejected paths do not overwrite files in leading path lstat_cache: optionally return match_len add function check_ok_to_remove() t7607: add leading-path tests t7607: use test-lib functions and check MERGE_HEAD Do not link with -lcrypto under NO_OPENSSL Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-14Prepare for 1.7.3.4Libravatar Junio C Hamano1-0/+10
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-14use persistent memory for rejected pathsLibravatar Clemens Buchacher4-42/+38
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 pathLibravatar Clemens Buchacher4-10/+31
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_lenLibravatar Clemens Buchacher1-16/+27
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()Libravatar Clemens Buchacher1-49/+58
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 testsLibravatar Clemens Buchacher1-0/+51
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_HEADLibravatar Clemens Buchacher1-23/+15
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 maintLibravatar Junio C Hamano1-0/+4
* jc/maint-no-openssl-build-fix: Do not link with -lcrypto under NO_OPENSSL
2010-12-14Merge branch 'ja/maint-pull-rebase-doc' into maintLibravatar Junio C Hamano1-2/+3
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
2010-12-14Merge branch 'tc/http-urls-ends-with-slash' into maintLibravatar Junio C Hamano9-40/+55
* 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 maintLibravatar Junio C Hamano1-8/+8
* nd/maint-hide-checkout-index-from-error: entry.c: remove "checkout-index" from error messages
2010-12-14Merge branch 'jk/maint-reflog-bottom' into maintLibravatar Junio C Hamano3-2/+37
* jk/maint-reflog-bottom: reflogs: clear flags properly in corner case
2010-12-14Merge branch 'mz/rebase-abort-reflog-fix' into maintLibravatar Junio C Hamano2-9/+22
* mz/rebase-abort-reflog-fix: rebase --abort: do not update branch ref
2010-12-14Merge branch 'mz/maint-rebase-stat-config' into maintLibravatar Junio C Hamano1-1/+2
* 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 maintLibravatar Junio C Hamano5-1/+51
* 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-14gitk: Add Brazilian Portuguese (pt-BR) translationLibravatar Alexandre Erwin Ittner1-0/+1277
Translating a SCM is tricky due to amount of jargon, so, I tried to keep the wording consistent with both the German and Italian git translations and the pt-BR translation of other SCMs. Signed-off-by: Alexandre Erwin Ittner <alexandre@ittner.com.br> Signed-off-by: Paul Mackerras <paulus@samba.org>
2010-12-13t800?-blame.sh: retitle uniquelyLibravatar Michael J Gruber2-0/+0
Currently we have three test files matching t800?-blame.sh. Rename the latter two to make it easier to spot where additions would go. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-13tests: flip executable bit on t9158Libravatar Jeff King1-0/+0
All tests are supposed to be executable. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-13tests: add some script lint checksLibravatar Jeff King1-2/+14
There are some common but minor errors we tend to make in writing test scripts: 1. Scripts are left non-executable. This is not usually noticed immediately because "make test" does not need the bit, but it is a matter of git policy to make them executable (and is a slight convenience when running individual scripts). 2. Two scripts are allocated the same number. Usually this happens on separate branches, and the problem only comes about during a merge. But since there is no textual conflict, the merger would have to be very observant to notice. This is also a minor error, but can make GIT_SKIP_TESTS ambiguous. This patch introduces a "test-lint" target which checks both. It is not invoked by default. You can invoke it as "make test-lint", or you can make it a prerequisite of running the tests by specifying "TEST_LINT = test-lint" in your config.mak or on the command line. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-13Avoid duplicate test number t7609Libravatar Johannes Sixt1-0/+0
Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-12t9300: avoid short reads from ddLibravatar Jonathan Nieder1-3/+3
dd is a thin wrapper around read(2). As open group Issue 7 explains: It shall read the input one block at a time, using the specified input block size; it shall then process the block of data actually returned, which could be smaller than the requested block size. Any short read --- for example from a pipe whose capacity cannot fill a block --- results in that block being truncated. As a result, the first cat-blob test (9300.114) fails on Mac OS X, where the pipe capacity is around 8 KiB. Fix the test by using a block size of 1. Each read will block until the next byte of input is available. It would be even nicer to use head -c which expresses the intention more clearly. Alas, IRIX "head" does not support the -c option. Reported-by: Brian Gernhardt <brian@gernhardtsoftware.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-12-12Merge branch 'ja/maint-pull-rebase-doc'Libravatar Junio C Hamano1-2/+3
* ja/maint-pull-rebase-doc: git-pull.txt: Mention branch.autosetuprebase
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 08:09:13 +0000