Skip to content

Commit 5bd148b

Browse files
gitstergitster
committed
Merge branch 'maint' to sync with GIT 1.5.2.2
2 parents c5f71ad + c7c8485 commit 5bd148b

File tree

10 files changed

+109
-6
lines changed

10 files changed

+109
-6
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ common-cmds.h
157157
*.tar.gz
158158
*.dsc
159159
*.deb
160-
git-core.spec
160+
git.spec
161161
*.exe
162162
*.[aos]
163163
*.py[co]

‎Documentation/Makefile‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ man7dir=$(mandir)/man7
3737

3838
ASCIIDOC=asciidoc
3939
ASCIIDOC_EXTRA =
40+
ifdef ASCIIDOC8
41+
ASCIIDOC_EXTRA += -a asciidoc7compatible
42+
endif
4043
INSTALL?=install
4144
DOC_REF = origin/man
4245

‎Documentation/RelNotes-1.5.2.2.txt‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
GIT v1.5.2.2 Release Notes
2+
==========================
3+
4+
Fixes since v1.5.2.1
5+
--------------------
6+
7+
* Usability fix
8+
9+
- git-gui is shipped with its updated blame interface. It is
10+
rumored that the older one was not just unusable but was
11+
active health hazard, but this one is actually pretty.
12+
Please see for yourself.
13+
14+
* Bugfixes
15+
16+
- "git checkout fubar" was utterly confused when there is a
17+
branch fubar and a tag fubar at the same time. It correctly
18+
checks out the branch fubar now.
19+
20+
- "git clone /path/foo" to clone a local /path/foo.git
21+
repository left an incorrect configuration.
22+
23+
- "git send-email" correctly unquotes RFC 2047 quoted names in
24+
the patch-email before using their values.
25+
26+
- We did not accept number of seconds since epoch older than
27+
year 2000 as a valid timestamp. We now interpret positive
28+
integers more than 8 digits as such, which allows us to
29+
express timestamps more recent than March 1973.
30+
31+
- git-cvsimport did not work when you have GIT_DIR to point
32+
your repository at a nonstandard location.
33+
34+
- Some systems (notably, Solaris) lack hstrerror() to make
35+
h_errno human readable; prepare a replacement
36+
implementation.
37+
38+
- .gitignore file listed git-core.spec but what we generate is
39+
git.spec, and nobody noticed for a long time.
40+
41+
- "git-merge-recursive" does not try to run file level merge
42+
on binary files.
43+
44+
- "git-branch --track" did not create tracking configuration
45+
correctly when the branch name had slash in it.
46+
47+
- The email address of the user specified with user.email
48+
configuration was overriden by EMAIL environment variable.
49+
50+
- The tree parser did not warn about tree entries with
51+
nonsense file modes, and assumed they must be blobs.
52+
53+
- "git log -z" without any other request to generate diff still
54+
invoked the diff machinery, wasting cycles.
55+
56+
* Documentation
57+
58+
- Many updates to fix stale or missing documentation.
59+
60+
- Although our documentation was primarily meant to be formatted
61+
with AsciiDoc7, formatting with AsciiDoc8 is supported better.

‎Documentation/asciidoc.conf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
# the command.
99

1010
[attributes]
11-
caret=^
11+
plus=+
12+
caret=^
1213
startsb=[
1314
endsb=]
1415
tilde=~

‎Documentation/git-cvsexportcommit.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ $ git-cvsexportcommit -v <commit-sha1>
7676
$ cvs commit -F .mgs <files>
7777
------------
7878

79-
Merge pending patches into CVS automatically -- only if you really know what you are doing ::
79+
Merge pending patches into CVS automatically -- only if you really know what you are doing::
8080
+
8181
------------
8282
$ export GIT_DIR=~/project/.git

‎Documentation/user-manual.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2757,8 +2757,8 @@ As a result, the general consistency of an object can always be tested
27572757
independently of the contents or the type of the object: all objects can
27582758
be validated by verifying that (a) their hashes match the content of the
27592759
file and (b) the object successfully inflates to a stream of bytes that
2760-
forms a sequence of <ascii type without space> + <space> + <ascii decimal
2761-
size> + <byte\0> + <binary object data>.
2760+
forms a sequence of <ascii type without space> {plus} <space> {plus} <ascii decimal
2761+
size> {plus} <byte\0> {plus} <binary object data>.
27622762

27632763
The structured objects can further have their structure and
27642764
connectivity to other objects verified. This is generally done with

‎Makefile‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ all::
107107
# Define USE_STDEV below if you want git to care about the underlying device
108108
# change being considered an inode change from the update-cache perspective.
109109
#
110+
# Define ASCIIDOC8 if you want to format documentation with AsciiDoc 8
111+
#
110112
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
111113
# MakeMaker (e.g. using ActiveState under Cygwin).
112114
#
@@ -410,6 +412,7 @@ ifeq ($(uname_S),SunOS)
410412
NEEDS_NSL = YesPlease
411413
SHELL_PATH = /bin/bash
412414
NO_STRCASESTR = YesPlease
415+
NO_HSTRERROR = YesPlease
413416
ifeq ($(uname_R),5.8)
414417
NEEDS_LIBICONV = YesPlease
415418
NO_UNSETENV = YesPlease
@@ -654,6 +657,10 @@ endif
654657
ifdef NO_PERL_MAKEMAKER
655658
export NO_PERL_MAKEMAKER
656659
endif
660+
ifdef NO_HSTRERROR
661+
COMPAT_CFLAGS += -DNO_HSTRERROR
662+
COMPAT_OBJS += compat/hstrerror.o
663+
endif
657664

658665
ifeq ($(TCLTK_PATH),)
659666
NO_TCLTK=NoThanks
@@ -684,6 +691,10 @@ ifndef V
684691
endif
685692
endif
686693

694+
ifdef ASCIIDOC8
695+
export ASCIIDOC8
696+
endif
697+
687698
# Shell quote (do not use $(call) to accommodate ancient setups);
688699

689700
SHA1_HEADER_SQ = $(subst ','\'',$(SHA1_HEADER))

‎compat/hstrerror.c‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
#include <string.h>
2+
#include <stdio.h>
3+
#include <netdb.h>
4+
5+
const char *githstrerror(int err)
6+
{
7+
static char buffer[48];
8+
switch (err)
9+
{
10+
case HOST_NOT_FOUND:
11+
return "Authoritative answer: host not found";
12+
case NO_DATA:
13+
return "Valid name, no data record of requested type";
14+
case NO_RECOVERY:
15+
return "Non recoverable errors, FORMERR, REFUSED, NOTIMP";
16+
case TRY_AGAIN:
17+
return "Non-authoritative \"host not found\", or SERVERFAIL";
18+
}
19+
sprintf(buffer, "Name resolution error %d", err);
20+
return buffer;
21+
}

‎git-compat-util.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,11 @@ extern size_t gitstrlcpy(char *, const char *, size_t);
167167
extern uintmax_t gitstrtoumax(const char *, char **, int);
168168
#endif
169169

170+
#ifdef NO_HSTRERROR
171+
#define hstrerror githstrerror
172+
extern const char *githstrerror(int herror);
173+
#endif
174+
170175
extern void release_pack_memory(size_t, int);
171176

172177
static inline char* xstrdup(const char *str)

‎revision.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1180,7 +1180,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
11801180

11811181
opts = diff_opt_parse(&revs->diffopt, argv+i, argc-i);
11821182
if (opts > 0) {
1183-
revs->diff = 1;
1183+
if (strcmp(argv[i], "-z"))
1184+
revs->diff = 1;
11841185
i += opts - 1;
11851186
continue;
11861187
}

0 commit comments

Comments
 (0)