Merge branch 'maint'
* maint: GIT 1.5.6.2 Fix executable bits in t/ scripts Work around gcc warnings from curl headers
This commit is contained in:
commit
7dde4bb367
@ -11,21 +11,30 @@ Futureproof
|
||||
Fixes since v1.5.6.1
|
||||
--------------------
|
||||
|
||||
* "git clone" from a remote that is named with url.insteadOf setting in
|
||||
$HOME/.gitconfig did not work well.
|
||||
|
||||
* "git describe --long --tags" segfaulted when the described revision was
|
||||
tagged with a lightweight tag.
|
||||
|
||||
* "git diff --check" did not report the result via its exit status
|
||||
reliably.
|
||||
|
||||
* When remote side used to have branch 'foo' and git-fetch finds that now
|
||||
it has branch 'foo/bar', it refuses to lose the existing remote tracking
|
||||
branch and its reflog. The error message has been improved to suggest
|
||||
pruning the remote if the user wants to proceed and get the latest set
|
||||
of branches from the remote, including such 'foo/bar'.
|
||||
|
||||
* "git reset file" should mean the same thing as "git reset HEAD file",
|
||||
but we required disambiguating -- even when "file" is not ambiguous.
|
||||
|
||||
* "git show" segfaulted when an annotated tag that points at another
|
||||
annotated tag was given to it.
|
||||
|
||||
* Optimization for a large import via "git-svn" introduced in v1.5.6 had a
|
||||
serious memory and temporary file leak, which made it unusable for
|
||||
moderately large import.
|
||||
|
||||
* "git-svn" mangled remote nickname used in the configuration file
|
||||
unnecessarily.
|
||||
|
||||
* "git diff --check" did not report the result via its exit status
|
||||
reliably.
|
||||
|
||||
* "git show" segfaulted when an annotated tag that points at another
|
||||
annotated tag was given to it.
|
||||
|
||||
--
|
||||
exec >/var/tmp/1
|
||||
echo O=$(git describe maint)
|
||||
O=v1.5.6.1-13-g4f3dcc2
|
||||
git shortlog --no-merges $O..maint
|
||||
|
@ -43,9 +43,10 @@ unreleased) version of git, that is available from 'master'
|
||||
branch of the `git.git` repository.
|
||||
Documentation for older releases are available here:
|
||||
|
||||
* link:v1.5.6.1/git.html[documentation for release 1.5.6.1]
|
||||
* link:v1.5.6.2/git.html[documentation for release 1.5.6.2]
|
||||
|
||||
* release notes for
|
||||
link:RelNotes-1.5.6.2.txt[1.5.6.2].
|
||||
link:RelNotes-1.5.6.1.txt[1.5.6.1].
|
||||
link:RelNotes-1.5.6.txt[1.5.6].
|
||||
|
||||
|
13
http.c
13
http.c
@ -30,10 +30,11 @@ static struct curl_slist *pragma_header;
|
||||
|
||||
static struct active_request_slot *active_queue_head = NULL;
|
||||
|
||||
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
|
||||
struct buffer *buffer)
|
||||
size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
|
||||
{
|
||||
size_t size = eltsize * nmemb;
|
||||
struct buffer *buffer = buffer_;
|
||||
|
||||
if (size > buffer->buf.len - buffer->posn)
|
||||
size = buffer->buf.len - buffer->posn;
|
||||
memcpy(ptr, buffer->buf.buf + buffer->posn, size);
|
||||
@ -42,17 +43,17 @@ size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
|
||||
return size;
|
||||
}
|
||||
|
||||
size_t fwrite_buffer(const void *ptr, size_t eltsize,
|
||||
size_t nmemb, struct strbuf *buffer)
|
||||
size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *buffer_)
|
||||
{
|
||||
size_t size = eltsize * nmemb;
|
||||
struct strbuf *buffer = buffer_;
|
||||
|
||||
strbuf_add(buffer, ptr, size);
|
||||
data_received++;
|
||||
return size;
|
||||
}
|
||||
|
||||
size_t fwrite_null(const void *ptr, size_t eltsize,
|
||||
size_t nmemb, struct strbuf *buffer)
|
||||
size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf)
|
||||
{
|
||||
data_received++;
|
||||
return eltsize * nmemb;
|
||||
|
9
http.h
9
http.h
@ -64,12 +64,9 @@ struct buffer
|
||||
};
|
||||
|
||||
/* Curl request read/write callbacks */
|
||||
extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb,
|
||||
struct buffer *buffer);
|
||||
extern size_t fwrite_buffer(const void *ptr, size_t eltsize,
|
||||
size_t nmemb, struct strbuf *buffer);
|
||||
extern size_t fwrite_null(const void *ptr, size_t eltsize,
|
||||
size_t nmemb, struct strbuf *buffer);
|
||||
extern size_t fread_buffer(void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
||||
extern size_t fwrite_buffer(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
||||
extern size_t fwrite_null(const void *ptr, size_t eltsize, size_t nmemb, void *strbuf);
|
||||
|
||||
/* Slot lifecycle functions */
|
||||
extern struct active_request_slot *get_active_slot(void);
|
||||
|
0
t/t5304-prune.sh
Normal file → Executable file
0
t/t5304-prune.sh
Normal file → Executable file
0
t/t7610-mergetool.sh
Normal file → Executable file
0
t/t7610-mergetool.sh
Normal file → Executable file
Loading…
Reference in New Issue
Block a user