Skip to content

Commit 7ecc9b1

Browse files
gitstergitster
committed
Merge branch 'maint' into jc/verify-pack-stat
* maint: (95 commits) verify-pack -v: do not report "chain length 0" t5510: harden the way verify-pack is used gitweb/README: Document $base_url Documentation: git submodule: add missing options to synopsis Better usage string for reflog. hg-to-git: don't import the unused popen2 module send-email: remove debug trace config: Keep inner whitespace verbatim GIT 1.6.4 GIT 1.6.3.4 config.txt: document add.ignore-errors request-pull: allow ls-remote to notice remote.$nickname.uploadpack Update the documentation of the raw diff output format git-rerere.txt: Clarify ambiguity of the config variable t9143: do not fail if Compress::Zlib is missing Trivial path quoting fixes in git-instaweb GIT 1.6.4-rc3 Documentation/config.txt: a variable can be defined on the section header line git svn: make minimize URL more reliable over http(s) Disable asciidoc 8.4.1+ semantics for `{plus}` and friends ...
2 parents c9c3c67 + 5dc36a5 commit 7ecc9b1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1381
-457
lines changed

‎Documentation/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ endif
8484
#
8585

8686
ifdef ASCIIDOC8
87-
ASCIIDOC_EXTRA += -a asciidoc7compatible
87+
ASCIIDOC_EXTRA += -a asciidoc7compatible -a no-inline-literal
8888
endif
8989
ifdef DOCBOOK_XSL_172
9090
ASCIIDOC_EXTRA += -a git-asciidoc-no-roff

‎Documentation/RelNotes-1.6.3.4.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
GIT v1.6.3.4 Release Notes
2+
==========================
3+
4+
Fixes since v1.6.3.3
5+
--------------------
6+
7+
* "git add --no-ignore-errors" did not override configured
8+
add.ignore-errors configuration.
9+
10+
* "git apply --whitespace=fix" did not fix trailing whitespace on an
11+
incomplete line.
12+
13+
* "git branch" opened too many commit objects unnecessarily.
14+
15+
* "git checkout -f $commit" with a path that is a file (or a symlink) in
16+
the work tree to a commit that has a directory at the path issued an
17+
unnecessary error message.
18+
19+
* "git diff -c/--cc" was very inefficient in coalescing the removed lines
20+
shared between parents.
21+
22+
* "git diff -c/--cc" showed removed lines at the beginning of a file
23+
incorrectly.
24+
25+
* "git remote show nickname" did not honor configured
26+
remote.nickname.uploadpack when inspecting the branches at the remote.
27+
28+
* "git request-pull" when talking to the terminal for a preview
29+
showed some of the output in the pager.
30+
31+
* "git request-pull start nickname [end]" did not honor configured
32+
remote.nickname.uploadpack when it ran git-ls-remote against the remote
33+
repository to learn the current tip of branches.
34+
35+
Includes other documentation updates and minor fixes.
36+

‎Documentation/RelNotes-1.6.4.txt‎

Lines changed: 69 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,6 @@ branch pointed at by its HEAD, gets a large warning. You can choose what
2222
should happen upon such a push by setting the configuration variable
2323
receive.denyDeleteCurrent in the receiving repository.
2424

25-
When the user does not tell "git push" what to push, it has always
26-
pushed matching refs. For some people it is unexpected, and a new
27-
configuration variable push.default has been introduced to allow
28-
changing a different default behaviour. To advertise the new feature,
29-
a big warning is issued if this is not configured and a git push without
30-
arguments is attempted.
31-
3225

3326
Updates since v1.6.3
3427
--------------------
@@ -38,26 +31,67 @@ Updates since v1.6.3
3831
* gitweb Perl style clean-up.
3932

4033
* git-svn updates, including a new --authors-prog option to map author
41-
names by invoking an external program.
34+
names by invoking an external program, 'git svn reset' to unwind
35+
'git svn fetch', support for more than one branches, documenting
36+
of the useful --minimize-url feature, new "git svn gc" command, etc.
4237

4338
(portability)
4439

4540
* We feed iconv with "UTF-8" instead of "utf8"; the former is
46-
understood more widely.
41+
understood more widely. Similarly updated test scripts to use
42+
encoding names more widely understood (e.g. use "ISO8859-1" instead
43+
of "ISO-8859-1").
44+
45+
* Various portability fixes/workarounds for different vintages of
46+
SunOS, IRIX, and Windows.
47+
48+
* Git-over-ssh transport on Windows supports PuTTY plink and TortoisePlink.
4749

4850
(performance)
4951

52+
* Many repeated use of lstat() are optimized out in "checkout" codepath.
53+
54+
* git-status (and underlying git-diff-index --cached) are optimized
55+
to take advantage of cache-tree information in the index.
56+
5057
(usability, bells and whistles)
5158

5259
* "git add --edit" lets users edit the whole patch text to fine-tune what
5360
is added to the index.
5461

55-
* "git log --graph" draws graphs more compactly by using horizonal lines
62+
* "git am" accepts StGIT series file as its input.
63+
64+
* "git bisect skip" skips to a more randomly chosen place in the hope
65+
to avoid testing a commit that is too close to a commit that is
66+
already known to be untestable.
67+
68+
* "git cvsexportcommit" learned -k option to stop CVS keywords expansion
69+
70+
* "git fast-export" learned to handle history simplification more
71+
gracefully.
72+
73+
* "git fast-export" learned an option --tag-of-filtered-object to handle
74+
dangling tags resulting from history simplification more usefully.
75+
76+
* "git grep" learned -p option to show the location of the match using the
77+
same context hunk marker "git diff" uses.
78+
79+
* https transport can optionally be told that the used client
80+
certificate is password protected, in which case it asks the
81+
password only once.
82+
83+
* "git imap-send" is IPv6 aware.
84+
85+
* "git log --graph" draws graphs more compactly by using horizontal lines
5686
when able.
5787

5888
* "git log --decorate" shows shorter refnames by stripping well-known
5989
refs/* prefix.
6090

91+
* "git push $name" honors remote.$name.pushurl if present before
92+
using remote.$name.url. In other words, the URL used for fetching
93+
and pushing can be different.
94+
6195
* "git send-email" understands quoted aliases in .mailrc files (might
6296
have to be backported to 1.6.3.X).
6397

@@ -69,10 +103,17 @@ Updates since v1.6.3
69103
* "add" and "update" subcommands to "git submodule" learned --reference
70104
option to use local clone with references.
71105

106+
* "git submodule update" learned --rebase option to update checked
107+
out submodules by rebasing the local changes.
108+
109+
* "gitweb" can optionally use gravatar to adorn author/committer names.
110+
72111
(developers)
73112

74113
* A major part of the "git bisect" wrapper has moved to C.
75114

115+
* Formatting with the new version of AsciiDoc 8.4.1 is now supported.
116+
76117
Fixes since v1.6.3
77118
------------------
78119

@@ -82,12 +123,25 @@ release, unless otherwise noted.
82123
Here are fixes that this release has, but have not been backported to
83124
v1.6.3.X series.
84125

126+
* "git diff-tree -r -t" used to omit new or removed directories from
127+
the output. df533f3 (diff-tree -r -t: include added/removed
128+
directories in the output, 2009-06-13) may need to be cherry-picked
129+
to backport this fix.
130+
85131
* The way Git.pm sets up a Repository object was not friendly to callers
86132
that chdir around. It now internally records the repository location
87133
as an absolute path when autodetected.
88134

89-
---
90-
exec >/var/tmp/1
91-
echo O=$(git describe master)
92-
O=v1.6.3.1-168-g23807fa
93-
git shortlog --no-merges $O..master ^maint
135+
* Removing a section with "git config --remove-section", when its
136+
section header has a variable definition on the same line, lost
137+
that variable definition.
138+
139+
* "git rebase -p --onto" used to always leave side branches of a merge
140+
intact, even when both branches are subject to rewriting.
141+
142+
* "git repack" used to faithfully follow grafts and considered true
143+
parents recorded in the commit object unreachable from the commit.
144+
After such a repacking, you cannot remove grafts without corrupting
145+
the repository.
146+
147+
* "git send-email" did not detect erroneous loops in alias expansion.

‎Documentation/config.txt‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ There is also a case insensitive alternative `[section.subsection]` syntax.
4949
In this syntax, subsection names follow the same restrictions as for section
5050
names.
5151

52-
All the other lines are recognized as setting variables, in the form
52+
All the other lines (and the remainder of the line after the section
53+
header) are recognized as setting variables, in the form
5354
'name = value'. If there is no equal sign on the line, the entire line
5455
is taken as 'name' and the variable is recognized as boolean "true".
5556
The variable names are case-insensitive and only alphanumeric
@@ -1387,6 +1388,50 @@ rerere.enabled::
13871388
default enabled if you create `rr-cache` directory under
13881389
`$GIT_DIR`, but can be disabled by setting this option to false.
13891390

1391+
sendemail.identity::
1392+
A configuration identity. When given, causes values in the
1393+
'sendemail.<identity>' subsection to take precedence over
1394+
values in the 'sendemail' section. The default identity is
1395+
the value of 'sendemail.identity'.
1396+
1397+
sendemail.smtpencryption::
1398+
See linkgit:git-send-email[1] for description. Note that this
1399+
setting is not subject to the 'identity' mechanism.
1400+
1401+
sendemail.smtpssl::
1402+
Deprecated alias for 'sendemail.smtpencryption = ssl'.
1403+
1404+
sendemail.<identity>.*::
1405+
Identity-specific versions of the 'sendemail.*' parameters
1406+
found below, taking precedence over those when the this
1407+
identity is selected, through command-line or
1408+
'sendemail.identity'.
1409+
1410+
sendemail.aliasesfile::
1411+
sendemail.aliasfiletype::
1412+
sendemail.bcc::
1413+
sendemail.cc::
1414+
sendemail.cccmd::
1415+
sendemail.chainreplyto::
1416+
sendemail.confirm::
1417+
sendemail.envelopesender::
1418+
sendemail.from::
1419+
sendemail.multiedit::
1420+
sendemail.signedoffbycc::
1421+
sendemail.smtppass::
1422+
sendemail.suppresscc::
1423+
sendemail.suppressfrom::
1424+
sendemail.to::
1425+
sendemail.smtpserver::
1426+
sendemail.smtpserverport::
1427+
sendemail.smtpuser::
1428+
sendemail.thread::
1429+
sendemail.validate::
1430+
See linkgit:git-send-email[1] for description.
1431+
1432+
sendemail.signedoffcc::
1433+
Deprecated alias for 'sendemail.signedoffbycc'.
1434+
13901435
showbranch.default::
13911436
The default set of branches for linkgit:git-show-branch[1].
13921437
See linkgit:git-show-branch[1].

‎Documentation/diff-format.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
The output format from "git-diff-index", "git-diff-tree",
1+
Raw output format
2+
-----------------
3+
4+
The raw output format from "git-diff-index", "git-diff-tree",
25
"git-diff-files" and "git diff --raw" are very similar.
36

47
These commands all compare two sets of things; what is
@@ -16,6 +19,9 @@ git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]::
1619
git-diff-files [<pattern>...]::
1720
compares the index and the files on the filesystem.
1821

22+
The "git-diff-tree" command begins its ouput by printing the hash of
23+
what is being compared. After that, all the commands print one output
24+
line per changed file.
1925

2026
An output line is formatted this way:
2127

‎Documentation/git-diff-files.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ omit diff output for unmerged entries and just show "Unmerged".
4343
-q::
4444
Remain silent even on nonexistent files
4545

46-
Output format
47-
-------------
46+
4847
include::diff-format.txt[]
4948

5049

‎Documentation/git-diff-index.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ include::diff-options.txt[]
3434
'git-diff-index' say that all non-checked-out files are up
3535
to date.
3636

37-
Output format
38-
-------------
3937
include::diff-format.txt[]
4038

4139
Operating Modes

‎Documentation/git-diff-tree.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,8 +159,7 @@ HEAD commits it finds, which is even more interesting.
159159

160160
in case you care).
161161

162-
Output format
163-
-------------
162+
164163
include::diff-format.txt[]
165164

166165

‎Documentation/git-diff.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,7 @@ include::diff-options.txt[]
8484
the diff to the named paths (you can give directory
8585
names and get diff for all files under them).
8686

87-
Output format
88-
-------------
87+
8988
include::diff-format.txt[]
9089

9190
EXAMPLES

‎Documentation/git-fast-export.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,17 @@ when encountering a signed tag. With 'strip', the tags will be made
3636
unsigned, with 'verbatim', they will be silently exported
3737
and with 'warn', they will be exported, but you will see a warning.
3838

39+
--tag-of-filtered-object=(abort|drop|rewrite)::
40+
Specify how to handle tags whose tagged objectis filtered out.
41+
Since revisions and files to export can be limited by path,
42+
tagged objects may be filtered completely.
43+
+
44+
When asking to 'abort' (which is the default), this program will die
45+
when encountering such a tag. With 'drop' it will omit such tags from
46+
the output. With 'rewrite', if the tagged object is a commit, it will
47+
rewrite the tag to tag an ancestor commit (via parent rewriting; see
48+
linkgit:git-rev-list[1])
49+
3950
-M::
4051
-C::
4152
Perform move and/or copy detection, as described in the
@@ -71,6 +82,12 @@ marks the same across runs.
7182
allow that. So fake a tagger to be able to fast-import the
7283
output.
7384

85+
[git-rev-list-args...]::
86+
A list of arguments, acceptable to 'git-rev-parse' and
87+
'git-rev-list', that specifies the specific objects and references
88+
to export. For example, `master\~10..master` causes the
89+
current master reference to be exported along with all objects
90+
added since its 10th ancestor commit.
7491

7592
EXAMPLES
7693
--------

0 commit comments

Comments
 (0)