Commit 373654ee authored by Junio C Hamano's avatar Junio C Hamano

Merge branch 'maint'

* maint:
  Prepare for v1.6.1.1 maintenance release
  Documentation/diff-options.txt: unify options
  gitweb: Fix export check in git_get_projects_list

parents 9c6c304d 936b7057
GIT v1.6.1.1 Release Notes
Fixes since v1.6.1
* "git describe --all" complained when a commit is described with a tag,
which was nonsense.
* "git log --pretty=format:%s" did not handle a multi-line subject the
same way as built-in log listers (i.e. shortlog, --pretty=oneline, etc.)
* "git daemon", and "git merge-file" are more careful when freopen fails
and barf, instead of going on and writing to unopened filehandle.
Other documentation fixes.
exec >/var/tmp/1
echo O=$(git describe maint)
git shortlog --no-merges $O..maint
......@@ -19,16 +19,12 @@ endif::git-format-patch[]
Generate patch (see section on generating patches).
{git-diff? This is the default.}
Synonym for "-p".
Shorthand for "--unified=<n>".
Generate diffs with <n> lines of context instead of
the usual three. Implies "-p".
......@@ -190,31 +186,25 @@ endif::git-format-patch[]
can name which subdirectory to make the output relative
to by giving a <path> as an argument.
Treat all files as text.
Shorthand for "--text".
Ignore changes in whitespace at EOL.
Ignore changes in amount of whitespace. This ignores whitespace
at line end, and considers all other sequences of one or
more whitespace characters to be equivalent.
Shorthand for "--ignore-space-change".
Ignore whitespace when comparing lines. This ignores
differences even if one line has whitespace where the other
line has none.
Shorthand for "--ignore-all-space".
Make the program exit with codes similar to diff(1).
That is, it exits with 1 if there were differences and
......@@ -2147,8 +2147,9 @@ sub git_get_projects_list {
my $subdir = substr($File::Find::name, $pfxlen + 1);
# we check related file in $projectroot
if (check_export_ok("$projectroot/$filter/$subdir")) {
push @list, { path => ($filter ? "$filter/" : '') . $subdir };
my $path = ($filter ? "$filter/" : '') . $subdir;
if (check_export_ok("$projectroot/$path")) {
push @list, { path => $path };
$File::Find::prune = 1;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment