Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e264687

Browse files
coder280coder280
committed
Merge pull request #5 from git/master
0228
2 parents 00d7d73 + 2de3478 commit e264687

File tree

300 files changed

+32270
-14866
lines changed

Some content is hidden

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

300 files changed

+32270
-14866
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
/test-dump-cache-tree
183183
/test-scrap-cache-tree
184184
/test-genrandom
185+
/test-hashmap
185186
/test-index-version
186187
/test-line-buffer
187188
/test-match-trees

‎Documentation/Makefile‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
MAN1_TXT =
33
MAN5_TXT =
44
MAN7_TXT =
5+
TECH_DOCS =
6+
ARTICLES =
7+
SP_ARTICLES =
58

69
MAN1_TXT += $(filter-out \
710
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
@@ -37,12 +40,12 @@ MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
3740
OBSOLETE_HTML = git-remote-helpers.html
3841
DOC_HTML = $(MAN_HTML) $(OBSOLETE_HTML)
3942

40-
ARTICLES = howto-index
43+
ARTICLES += howto-index
4144
ARTICLES += everyday
4245
ARTICLES += git-tools
4346
ARTICLES += git-bisect-lk2009
4447
# with their own formatting rules.
45-
SP_ARTICLES = user-manual
48+
SP_ARTICLES += user-manual
4649
SP_ARTICLES += howto/new-command
4750
SP_ARTICLES += howto/revert-branch-rebase
4851
SP_ARTICLES += howto/using-merge-subtree
@@ -60,7 +63,8 @@ SP_ARTICLES += howto/maintain-git
6063
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
6164
SP_ARTICLES += $(API_DOCS)
6265

63-
TECH_DOCS = technical/index-format
66+
TECH_DOCS += technical/http-protocol
67+
TECH_DOCS += technical/index-format
6468
TECH_DOCS += technical/pack-format
6569
TECH_DOCS += technical/pack-heuristics
6670
TECH_DOCS += technical/pack-protocol
@@ -324,7 +328,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in
324328

325329
user-manual.xml: user-manual.txt user-manual.conf
326330
$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
327-
$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d book -o $@+ $< && \
331+
$(ASCIIDOC) $(ASCIIDOC_EXTRA) -b docbook -d article -o $@+ $< && \
328332
mv $@+ $@
329333

330334
technical/api-index.txt: technical/api-index-skel.txt \

‎Documentation/RelNotes/1.8.5.3.txt‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
Git v1.8.5.3 Release Notes
2+
==========================
3+
4+
Fixes since v1.8.5.2
5+
--------------------
6+
7+
* The "--[no-]informative-errors" options to "git daemon" were parsed
8+
a bit too loosely, allowing any other string after these option
9+
names.
10+
11+
* A "gc" process running as a different user should be able to stop a
12+
new "gc" process from starting.
13+
14+
* An earlier "clean-up" introduced an unnecessary memory leak to the
15+
credential subsystem.
16+
17+
* "git mv A B/", when B does not exist as a directory, should error
18+
out, but it didn't.
19+
20+
* "git rev-parse <revs> -- <paths>" did not implement the usual
21+
disambiguation rules the commands in the "git log" family used in
22+
the same way.
23+
24+
* "git cat-file --batch=", an admittedly useless command, did not
25+
behave very well.
26+
27+
Also contains typofixes, documentation updates and trivial code clean-ups.

‎Documentation/RelNotes/1.8.5.4.txt‎

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
Git v1.8.5.4 Release Notes
2+
==========================
3+
4+
Fixes since v1.8.5.3
5+
--------------------
6+
7+
* "git fetch --depth=0" was a no-op, and was silently ignored.
8+
Diagnose it as an error.
9+
10+
* Remote repository URL expressed in scp-style host:path notation are
11+
parsed more carefully (e.g. "foo/bar:baz" is local, "[::1]:/~user" asks
12+
to connect to user's home directory on host at address ::1.
13+
14+
* SSL-related options were not passed correctly to underlying socket
15+
layer in "git send-email".
16+
17+
* "git commit -v" appends the patch to the log message before
18+
editing, and then removes the patch when the editor returned
19+
control. However, the patch was not stripped correctly when the
20+
first modified path was a submodule.
21+
22+
* "git mv A B/", when B does not exist as a directory, should error
23+
out, but it didn't.
24+
25+
* When we figure out how many file descriptors to allocate for
26+
keeping packfiles open, a system with non-working getrlimit() could
27+
cause us to die(), but because we make this call only to get a
28+
rough estimate of how many is available and we do not even attempt
29+
to use up all file descriptors available ourselves, it is nicer to
30+
fall back to a reasonable low value rather than dying.
31+
32+
* "git log --decorate" did not handle a tag pointed by another tag
33+
nicely.
34+
35+
* "git add -A" (no other arguments) in a totally empty working tree
36+
used to emit an error.
37+
38+
* There is no reason to have a hardcoded upper limit of the number of
39+
parents for an octopus merge, created via the graft mechanism, but
40+
there was.
41+
42+
* The implementation of 'git stash $cmd "stash@{...}"' did not quote
43+
the stash argument properly and left it split at IFS whitespace.
44+
45+
* The documentation to "git pull" hinted there is an "-m" option
46+
because it incorrectly shared the documentation with "git merge".
47+
48+
Also contains typofixes, documentation updates and trivial code clean-ups.

‎Documentation/RelNotes/1.8.5.5.txt‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
Git v1.8.5.5 Release Notes
2+
==========================
3+
4+
Fixes since v1.8.5.4
5+
--------------------
6+
7+
* The pathspec matching code, while comparing two trees (e.g. "git
8+
diff A B -- path1 path2") was too aggressive and failed to match
9+
some paths when multiple pathspecs were involved.
10+
11+
* "git repack --max-pack-size=8g" stopped being parsed correctly when
12+
the command was reimplemented in C.
13+
14+
* A recent update to "git send-email" broke platforms where
15+
/etc/ssl/certs/ directory exists but cannot be used as SSL_ca_path
16+
(e.g. Fedora rawhide).
17+
18+
* A handful of bugs around interpreting $branch@{upstream} notation
19+
and its lookalike, when $branch part has interesting characters,
20+
e.g. "@", and ":", have been fixed.
21+
22+
* "git clone" would fail to clone from a repository that has a ref
23+
directly under "refs/", e.g. "refs/stash", because different
24+
validation paths do different things on such a refname. Loosen the
25+
client side's validation to allow such a ref.
26+
27+
* "git log --left-right A...B" lost the "leftness" of commits
28+
reachable from A when A is a tag as a side effect of a recent
29+
bugfix. This is a regression in 1.8.4.x series.
30+
31+
* "git merge-base --octopus" used to leave cleaning up suboptimal
32+
result to the caller, but now it does the clean-up itself.
33+
34+
* "git mv A B/", when B does not exist as a directory, should error
35+
out, but it didn't.
36+
37+
Also contains typofixes, documentation updates and trivial code clean-ups.

0 commit comments

Comments
 (0)