freshlybakedca.ke
Git fork
Merge branch 'maint'
* maint:
GIT 1.5.6.2
Fix executable bits in t/ scripts
Work around gcc warnings from curl headers
+19
-10
Documentation/RelNotes-1.5.6.2.txt
+19
-10
Documentation/RelNotes-1.5.6.2.txt
···
11
11
Fixes since v1.5.6.1
12
12
--------------------
13
13
14
-
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
15
-
serious memory and temporary file leak, which made it unusable for
16
-
moderately large import.
14
+
* "git clone" from a remote that is named with url.insteadOf setting in
15
+
$HOME/.gitconfig did not work well.
17
16
18
-
* "git-svn" mangled remote nickname used in the configuration file
19
-
unnecessarily.
17
+
* "git describe --long --tags" segfaulted when the described revision was
18
+
tagged with a lightweight tag.
20
19
21
20
* "git diff --check" did not report the result via its exit status
22
21
reliably.
23
22
23
+
* When remote side used to have branch 'foo' and git-fetch finds that now
24
+
it has branch 'foo/bar', it refuses to lose the existing remote tracking
25
+
branch and its reflog. The error message has been improved to suggest
26
+
pruning the remote if the user wants to proceed and get the latest set
27
+
of branches from the remote, including such 'foo/bar'.
28
+
29
+
* "git reset file" should mean the same thing as "git reset HEAD file",
30
+
but we required disambiguating -- even when "file" is not ambiguous.
31
+
24
32
* "git show" segfaulted when an annotated tag that points at another
25
33
annotated tag was given to it.
26
34
27
-
--
28
-
exec >/var/tmp/1
29
-
echo O=$(git describe maint)
30
-
O=v1.5.6.1-13-g4f3dcc2
31
-
git shortlog --no-merges $O..maint
35
+
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
36
+
serious memory and temporary file leak, which made it unusable for
37
+
moderately large import.
38
+
39
+
* "git-svn" mangled remote nickname used in the configuration file
40
+
unnecessarily.
+2
-1
Documentation/git.txt
+2
-1
Documentation/git.txt
···
43
43
branch of the `git.git` repository.
44
44
Documentation for older releases are available here:
45
45
46
-
* link:v1.5.6.1/git.html[documentation for release 1.5.6.1]
46
+
* link:v1.5.6.2/git.html[documentation for release 1.5.6.2]
47
47
48
48
* release notes for
49
+
link:RelNotes-1.5.6.2.txt[1.5.6.2].
49
50
link:RelNotes-1.5.6.1.txt[1.5.6.1].
50
51
link:RelNotes-1.5.6.txt[1.5.6].
51
52
+7
-6
http.c
+7
-6
http.c
···
30
30
31
31
static struct active_request_slot *active_queue_head = NULL;
32
32
33
-
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
34
-
struct buffer *buffer)
33
+
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
35
34
{
36
35
size_t size = eltsize * nmemb;
36
+
struct buffer *buffer = buffer_;
37
+
37
38
if (size > buffer->buf.len - buffer->posn)
38
39
size = buffer->buf.len - buffer->posn;
39
40
memcpy(ptr, buffer->buf.buf + buffer->posn, size);
···
42
43
return size;
43
44
}
44
45
45
-
size_t fwrite_buffer(const void *ptr, size_t eltsize,
46
-
size_t nmemb, struct strbuf *buffer)
46
+
size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
47
47
{
48
48
size_t size = eltsize * nmemb;
49
+
struct strbuf *buffer = buffer_;
50
+
49
51
strbuf_add(buffer, ptr, size);
50
52
data_received++;
51
53
return size;
52
54
}
53
55
54
-
size_t fwrite_null(const void *ptr, size_t eltsize,
55
-
size_t nmemb, struct strbuf *buffer)
56
+
size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf)
56
57
{
57
58
data_received++;
58
59
return eltsize * nmemb;
+3
-6
http.h
+3
-6
http.h
···
64
64
};
65
65
66
66
/* Curl request read/write callbacks */
67
-
extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
68
-
struct buffer *buffer);
69
-
extern size_t fwrite_buffer(const void *ptr, size_t eltsize,
70
-
size_t nmemb, struct strbuf *buffer);
71
-
extern size_t fwrite_null(const void *ptr, size_t eltsize,
72
-
size_t nmemb, struct strbuf *buffer);
67
+
extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
68
+
extern size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
69
+
extern size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
73
70
74
71
/* Slot lifecycle functions */
75
72
extern struct active_request_slot *get_active_slot(void);
t/t5304-prune.sh
t/t5304-prune.sh
t/t7610-mergetool.sh
t/t7610-mergetool.sh