user/sven/git.git, branch v1.8.0.2

Git 1.8.0.2

2012-12-10T21:05:47Z

Signed-off-by: Junio C Hamano

Documentation/git-stash.txt: add a missing verb

2012-12-10T16:18:25Z

Signed-off-by: Sébastien Loriot Signed-off-by: Junio C Hamano

git(1): remove a defunct link to "list of authors"

2012-12-09T08:33:04Z

The linked page has not been showing the promised "more complete list" for more than 6 months by now, and nobody has resurrected the list there nor elsewhere since then. Signed-off-by: Junio C Hamano

Update draft release notes to 1.8.0.2

2012-12-07T22:16:38Z

Signed-off-by: Junio C Hamano

Merge branch 'jc/doc-push-satellite' into maint

2012-12-07T22:11:21Z

* jc/doc-push-satellite: Documentation/git-push.txt: clarify the "push from satellite" workflow

Merge branch 'jc/same-encoding' into maint

2012-12-07T22:10:56Z

Various codepaths checked if two encoding names are the same using ad-hoc code and some of them ended up asking iconv() to convert between "utf8" and "UTF-8". The former is not a valid way to spell the encoding name, but often people use it by mistake, and we equated them in some but not all codepaths. Introduce a new helper function to make these codepaths consistent. * jc/same-encoding: reencode_string(): introduce and use same_encoding()

Merge branch 'lt/diff-stat-show-0-lines' into maint

2012-12-07T22:10:17Z

"git diff --stat" miscounted the total number of changed lines when binary files were involved and hidden beyond --stat-count. It also miscounted the total number of changed files when there were unmerged paths. * lt/diff-stat-show-0-lines: t4049: refocus tests diff --shortstat: do not count "unmerged" entries diff --stat: do not count "unmerged" entries diff --stat: move the "total count" logic to the last loop diff --stat: use "file" temporary variable to refer to data->files[i] diff --stat: status of unmodified pair in diff-q is not zero test: add failing tests for "diff --stat" to t4049 Fix "git diff --stat" for interesting - but empty - file changes

git-fast-import.txt: improve documentation for quoted paths

2012-11-29T19:49:51Z

The documentation mentioned only newlines and double quotes as characters needing escaping, but the backslash also needs it. Also, the documentation was not clearly saying that double quotes around the file name were required (double quotes in the examples could be interpreted as part of the sentence, not part of the actual string). Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

git-remote-mediawiki: escape ", \, and LF in file names

2012-11-29T19:16:33Z

A mediawiki page can contain, and even start with a " character, we have to escape it when generating the fast-export stream, as well as \ character. While we're there, also escape newlines, but I don't think we can get them from MediaWiki pages. Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

t4049: refocus tests

2012-11-29T17:46:30Z

The primary thing Linus's patch wanted to change was to make sure that 0-line change appears for a mode-only change. Update the first test to chmod a file that we can see in the output (limited by --stat-count) to demonstrate it. Also make sure to use test_chmod and compare the index and the tree, so that we can run this test even on a filesystem without permission bits. Later two tests are about fixes to separate issues that were introduced and/or uncovered by Linus's patch as a side effect, but the issues are not related to mode-only changes. Remove chmod from the tests. Signed-off-by: Junio C Hamano