Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Junio C Hamano 2009-03-21 23:24:11 -07:00
commit c511549e0c
4 changed files with 35 additions and 22 deletions

View File

@ -0,0 +1,35 @@
GIT v1.6.2.2 Release Notes
==========================

Fixes since v1.6.2.1
--------------------

* A longstanding confusing description of what --pickaxe option of
git-diff does has been clarified in the documentation.

* "git diff --pickaxe-regexp" did not count overlapping matches
correctly.

* "git-fetch" in a repository that was not cloned from anywhere said
it cannot find 'origin', which was hard to understand for new people.

* "git-format-patch --numbered-files --stdout" did not have to die of
incompatible options; it now simply ignores --numbered-files as no files
are produced anyway.

* "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE.

* "git-read-tree A B C..." without -m option has been broken for a long
time.

* git-send-email ignored --in-reply-to when --no-thread was given.

* 'git-submodule add' did not tolerate extra slashes and ./ in the path it
accepted from the command line; it now is more lenient.


---
exec >/var/tmp/1
O=v1.6.2.1-23-g67c176f
echo O=$(git describe maint)
git shortlog --no-merges $O..maint

View File

@ -104,28 +104,9 @@ release, unless otherwise noted.
Here are fixes that this release has, but have not been backported to Here are fixes that this release has, but have not been backported to
v1.6.2.X series. v1.6.2.X series.


* "git diff --pickaxe-regexp" did not count overlapping matches
correctly (backport by cherry-picking 50fd699).

* "git-fetch" in a repository that was not cloned from anywhere said
it cannot find 'origin', which was hard to understand for new people.

* git-gc spent excessive amount of time to decide if an object appears * git-gc spent excessive amount of time to decide if an object appears
in a locally existing pack (if needed, backport by merging 69e020a). in a locally existing pack (if needed, backport by merging 69e020a).


* "git-ls-files --deleted" did not work well with GIT_DIR&GIT_WORK_TREE
(backport by cherry-picking 8ad3dae).

* "git-read-tree A B C..." without -m option has been broken for a long time
(backport by merging jc/maint-1.6.0-read-tree-overlay)

* 'git-submodule add' did not tolerate extra slashes and ./ in the
path it accepted from the command line; it now is more lenient
(if needed, backport by merging db75ada).

* git-send-email ignored --in-reply-to when --no-thread was given
(backport by merging tr/maint-1.6.0-send-email-irt)

--- ---
exec >/var/tmp/1 exec >/var/tmp/1
O=v1.6.2.1-213-g7d4e3a7 O=v1.6.2.1-213-g7d4e3a7

View File

@ -97,7 +97,6 @@ include::diff-options.txt[]
--numbered-files:: --numbered-files::
Output file names will be a simple number sequence Output file names will be a simple number sequence
without the default first line of the commit appended. without the default first line of the commit appended.
Mutually exclusive with the --stdout option.


-k:: -k::
--keep-subject:: --keep-subject::

View File

@ -958,8 +958,6 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
die ("-n and -k are mutually exclusive."); die ("-n and -k are mutually exclusive.");
if (keep_subject && subject_prefix) if (keep_subject && subject_prefix)
die ("--subject-prefix and -k are mutually exclusive."); die ("--subject-prefix and -k are mutually exclusive.");
if (numbered_files && use_stdout)
die ("--numbered-files and --stdout are mutually exclusive.");


argc = setup_revisions(argc, argv, &rev, "HEAD"); argc = setup_revisions(argc, argv, &rev, "HEAD");
if (argc > 1) if (argc > 1)