author | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Jul 2008 08:59:57 +0000 (01:59 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 4 Jul 2008 08:59:57 +0000 (01:59 -0700) |
* maint:
GIT 1.5.6.2
Fix executable bits in t/ scripts
Work around gcc warnings from curl headers
GIT 1.5.6.2
Fix executable bits in t/ scripts
Work around gcc warnings from curl headers
Documentation/RelNotes-1.5.6.2.txt | patch | blob | history | |
Documentation/git.txt | patch | blob | history | |
http.c | patch | blob | history | |
http.h | patch | blob | history | |
t/t5304-prune.sh | [changed mode: 0644->0755] | patch | blob | history |
t/t7610-mergetool.sh | [changed mode: 0644->0755] | patch | blob | history |
index 02d5910d5c89436b3de29fec5df633dd93a6eb4a..5902a85a78610ec38f4cf160ccd3c01267b4f9a1 100644 (file)
Fixes since v1.5.6.1
--------------------
-* 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 clone" from a remote that is named with url.insteadOf setting in
+ $HOME/.gitconfig did not work well.
-* "git-svn" mangled remote nickname used in the configuration file
- unnecessarily.
+* "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.
---
-exec >/var/tmp/1
-echo O=$(git describe maint)
-O=v1.5.6.1-13-g4f3dcc2
-git shortlog --no-merges $O..maint
+* 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.
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 22702c260c6aaed53dd29e2b33bb40ae1b2b5faa..425f1f4aee25078ddc1ee4d6f5289c48994e1b84 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
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].
index 105dc93843ba1f01ea0d40c63dd174e879f1a25a..ad146404129b8522269605076e8391542a3241f5 100644 (file)
--- a/http.c
+++ b/http.c
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);
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;
index a04fc6a9277945a7084e718753c133ed47d13691..905b4629a47789705c13745fd56ce0c91adea41b 100644 (file)
--- a/http.h
+++ b/http.h
};
/* 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);
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
old mode 100644 (file)
new mode 100755 (executable)
new mode 100755 (executable)
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
old mode 100644 (file)
new mode 100755 (executable)
new mode 100755 (executable)