summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-10-29 19:53:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-10-29 19:53:54 (GMT)
commite2b7eaf0ca3897940961d23392d4ff718867ea9f (patch)
treebf24e41872b28f8dc50db5f24e0222117da71da6
parent8371d8fd094548c1d02b8583fdbff8204a725ffc (diff)
parente720c4382f6c9317a3b495e80c7dfc609a0db5e6 (diff)
downloadgit-e2b7eaf0ca3897940961d23392d4ff718867ea9f.zip
git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.gz
git-e2b7eaf0ca3897940961d23392d4ff718867ea9f.tar.bz2
Merge branch 'maint'
* maint: RelNotes-1.5.3.5: describe recent fixes merge-recursive.c: mrtree in merge() is not used before set sha1_file.c: avoid gcc signed overflow warnings Fix a small memory leak in builtin-add honor the http.sslVerify option in shell scripts
-rw-r--r--Documentation/RelNotes-1.5.3.5.txt21
-rw-r--r--builtin-add.c2
-rwxr-xr-xgit-clone.sh3
-rwxr-xr-xgit-ls-remote.sh7
-rw-r--r--merge-recursive.c2
-rw-r--r--sha1_file.c16
6 files changed, 39 insertions, 12 deletions
diff --git a/Documentation/RelNotes-1.5.3.5.txt b/Documentation/RelNotes-1.5.3.5.txt
index 9581e03..e28d92f 100644
--- a/Documentation/RelNotes-1.5.3.5.txt
+++ b/Documentation/RelNotes-1.5.3.5.txt
@@ -71,3 +71,24 @@ Fixes since v1.5.3.4
* "make clean" no longer deletes the configure script that ships
with the git tarball, making multiple architecture builds easier.
+
+ * "git-remote show origin" spewed a warning message from Perl
+ when no remote is defined for the current branch via
+ branch.<name>.remote configuration settings.
+
+ * Building with NO_PERL_MAKEMAKER excessively rebuilt contents
+ of perl/ subdirectory by rewriting perl.mak.
+
+ * http.sslVerify configuration settings were not used in scripted
+ Porcelains.
+
+ * "git-add" leaked a bit of memory while scanning for files to add.
+
+ * A few workarounds to squelch false warnings from recent gcc have
+ been added.
+
+--
+exec >/var/tmp/1
+O=v1.5.3.4-55-gf120ae2
+echo O=`git describe refs/heads/maint`
+git shortlog --no-merges $O..refs/heads/maint
diff --git a/builtin-add.c b/builtin-add.c
index f9a6580..b8e6094 100644
--- a/builtin-add.c
+++ b/builtin-add.c
@@ -44,6 +44,7 @@ static void prune_directory(struct dir_struct *dir, const char **pathspec, int p
die("pathspec '%s' did not match any files",
pathspec[i]);
}
+ free(seen);
}
static void fill_directory(struct dir_struct *dir, const char **pathspec,
@@ -135,6 +136,7 @@ static void refresh(int verbose, const char **pathspec)
if (!seen[i])
die("pathspec '%s' did not match any files", pathspec[i]);
}
+ free(seen);
}
static int git_add_config(const char *var, const char *value)
diff --git a/git-clone.sh b/git-clone.sh
index 5e582fe..0ea3c24 100755
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -28,7 +28,8 @@ get_repo_base() {
) 2>/dev/null
}
-if [ -n "$GIT_SSL_NO_VERIFY" ]; then
+if [ -n "$GIT_SSL_NO_VERIFY" -o \
+ "`git config --bool http.sslVerify`" = false ]; then
curl_extra_args="-k"
fi
diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index d56cf92..fec70bb 100755
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -54,9 +54,10 @@ tmpdir=$tmp-d
case "$peek_repo" in
http://* | https://* | ftp://* )
- if [ -n "$GIT_SSL_NO_VERIFY" ]; then
- curl_extra_args="-k"
- fi
+ if [ -n "$GIT_SSL_NO_VERIFY" -o \
+ "`git config --bool http.sslVerify`" = false ]; then
+ curl_extra_args="-k"
+ fi
if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
"`git config --bool http.noEPSV`" = true ]; then
curl_extra_args="${curl_extra_args} --disable-epsv"
diff --git a/merge-recursive.c b/merge-recursive.c
index 4a5c77c..6c6f595 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -1572,7 +1572,7 @@ static int merge(struct commit *h1,
{
struct commit_list *iter;
struct commit *merged_common_ancestors;
- struct tree *mrtree;
+ struct tree *mrtree = mrtree;
int clean;
if (show(4)) {
diff --git a/sha1_file.c b/sha1_file.c
index 83a06a7..f007874 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -521,13 +521,15 @@ static int check_packed_git_idx(const char *path, struct packed_git *p)
munmap(idx_map, idx_size);
return error("wrong index v2 file size in %s", path);
}
- if (idx_size != min_size) {
- /* make sure we can deal with large pack offsets */
- off_t x = 0x7fffffffUL, y = 0xffffffffUL;
- if (x > (x + 1) || y > (y + 1)) {
- munmap(idx_map, idx_size);
- return error("pack too large for current definition of off_t in %s", path);
- }
+ if (idx_size != min_size &&
+ /*
+ * make sure we can deal with large pack offsets.
+ * 31-bit signed offset won't be enough, neither
+ * 32-bit unsigned one will be.
+ */
+ (sizeof(off_t) <= 4)) {
+ munmap(idx_map, idx_size);
+ return error("pack too large for current definition of off_t in %s", path);
}
}