git, branch v1.8.0-rc2

Git 1.8.0-rc2

2012-10-11T18:18:56Z

Signed-off-by: Junio C Hamano

Merge branch 'rr/git-uri-doc'

2012-10-10T21:57:26Z

* rr/git-uri-doc: Git url doc: mark ftp/ftps as read-only and deprecate them

Merge branch 'bw/cp-a-is-gnuism'

2012-10-10T21:57:09Z

* bw/cp-a-is-gnuism: tests: "cp -a" is a GNUism

Merge branch 'nd/doc-ignore'

2012-10-10T21:57:02Z

* nd/doc-ignore: gitignore.txt: suggestions how to get literal # or ! at the beginning

Merge branch 'jc/doc-long-options'

2012-10-10T21:56:52Z

* jc/doc-long-options: gitcli: parse-options lets you omit tail of long options

Sync with maint

2012-10-10T21:54:33Z

* maint: attr: a note about the order of .gitattributes lookup

Merge git://bogomips.org/git-svn

2012-10-10T20:53:56Z

* git://bogomips.org/git-svn: svn test: escape peg revision separator using empty peg rev git svn: work around SVN 1.7 mishandling of svn:special changes

svn test: escape peg revision separator using empty peg rev

2012-10-10T20:11:57Z

This test script uses "svn cp" to create a branch with an @-sign in its name: svn cp "pr ject/trunk" "pr ject/branches/not-a@{0}reflog" That sets up for later tests that fetch the branch and check that git svn mangles the refname appropriately. Unfortunately, modern svn versions interpret path arguments with an @-sign as an example of path@revision syntax (which pegs a path to a particular revision) and truncate the path or error out with message "svn: E205000: Syntax error parsing peg revision '{0}reflog'". When using subversion 1.6.x, escaping the @ sign as %40 avoids trouble (see 08fd28bb, 2010-07-08). Newer versions are stricter: $ svn cp "$repo/pr ject/trunk" "$repo/pr ject/branches/not-a%40{reflog}" svn: E205000: Syntax error parsing peg revision '%7B0%7Dreflog' The recommended method for escaping a literal @ sign in a path passed to subversion is to add an empty peg revision at the end of the path ("branches/not-a@{0}reflog@"). Do that. Pre-1.6.12 versions of Subversion probably treat the trailing @ as another literal @-sign (svn issue 3651). Luckily ever since v1.8.0-rc0~155^2~7 (t9118: workaround inconsistency between SVN versions, 2012-07-28) the test can survive that. Tested with Debian Subversion 1.6.12dfsg-6 and 1.7.5-1 and r1395837 of Subversion trunk (1.8.x). Signed-off-by: Jonathan Nieder Tested-by: Michael J Gruber Signed-off-by: Eric Wong

git svn: work around SVN 1.7 mishandling of svn:special changes

2012-10-10T20:02:33Z

Subversion represents symlinks as ordinary files with content starting with "link " and the svn:special property set to "*". Thus a file can switch between being a symlink and a non-symlink simply by toggling its svn:special property, and new checkouts will automatically write a file of the appropriate type. Likewise, in subversion 1.6 and older, running "svn update" would notice changes in filetype and update the working copy appropriately. Starting in subversion 1.7 (issue 4091), changes to the svn:special property trip an assertion instead: $ svn up svn-tree Updating 'svn-tree': svn: E235000: In file 'subversion/libsvn_wc/update_editor.c' \ line 1583: assertion failed (action == svn_wc_conflict_action_edit \ || action == svn_wc_conflict_action_delete || action == \ svn_wc_conflict_action_replace) Revisions prepared with ordinary svn commands ("svn add" and not "svn propset") don't trip this because they represent these filetype changes using a replace operation, which is approximately equivalent to removal followed by adding a new file and works fine. Follow suit. Noticed using t9100. After this change, git-svn's file-to-symlink changes are sent in a format that modern "svn update" can handle and tests t9100.11-13 pass again. [ew: s,git-svn\.perl,perl/Git/SVN/Editor.pm,g] Signed-off-by: Jonathan Nieder Signed-off-by: Eric Wong

MALLOC_CHECK: Allow checking to be disabled from config.mak

2012-10-10T18:15:35Z

The malloc checks can be disabled using the TEST_NO_MALLOC_CHECK variable, either from the environment or command line of an 'make test' invocation. In order to allow the malloc checks to be disabled from the 'config.mak' file, we add TEST_NO_MALLOC_CHECK to the environment using an export directive. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano