diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | cmd-rename.sh | 14 | ||||
| -rw-r--r-- | daemon.c | 4 | ||||
| -rw-r--r-- | http-fetch.c | 2 | ||||
| -rw-r--r-- | sha1_file.c | 8 |
5 files changed, 15 insertions, 16 deletions
@@ -119,7 +119,7 @@ PROGRAMS = \ git-upload-pack$(X) git-verify-pack$(X) git-write-tree$(X) \ git-update-ref$(X) $(SIMPLE_PROGRAMS) -# Backward compatibility -- to be removed in 0.99.8 +# Backward compatibility -- to be removed after 1.0 PROGRAMS += git-ssh-pull$(X) git-ssh-push$(X) PYMODULES = \ @@ -354,6 +354,7 @@ install: $(PROGRAMS) $(SCRIPTS) $(INSTALL) -d -m755 $(DESTDIR)$(bindir) $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir) $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick + sh ./cmd-rename.sh $(DESTDIR)$(bindir) $(MAKE) -C templates install $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR) $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR) diff --git a/cmd-rename.sh b/cmd-rename.sh index f90b6ba..34e7f49 100755 --- a/cmd-rename.sh +++ b/cmd-rename.sh @@ -1,15 +1,13 @@ #!/bin/sh -# -# This is for people who installed previous GIT by hand and would want -# to remove the backward compatible links: -# -# ./cmd-rename.sh $bindir -# d="$1" test -d "$d" || exit while read old new do rm -f "$d/$old" + if test -f "$d/$new" + then + ln -s "$new" "$d/$old" || exit + fi done <<\EOF git-add-script git-add git-archimport-script git-archimport @@ -54,7 +52,3 @@ git-update-cache git-update-index git-convert-cache git-convert-objects git-fsck-cache git-fsck-objects EOF - -# These two are a bit more than symlinks now. -# git-ssh-push git-ssh-upload -# git-ssh-pull git-ssh-fetch @@ -59,7 +59,7 @@ static void logreport(int priority, const char *err, va_list params) write(2, buf, buflen); } -void logerror(const char *err, ...) +static void logerror(const char *err, ...) { va_list params; va_start(params, err); @@ -67,7 +67,7 @@ void logerror(const char *err, ...) va_end(params); } -void loginfo(const char *err, ...) +static void loginfo(const char *err, ...) { va_list params; if (!verbose) diff --git a/http-fetch.c b/http-fetch.c index 33f3949..0566a91 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -529,9 +529,11 @@ int main(int argc, char **argv) if ((ssl_cert = getenv("GIT_SSL_CERT")) != NULL) { curl_easy_setopt(curl, CURLOPT_SSLCERT, ssl_cert); } +#if LIBCURL_VERSION_NUM >= 0x070902 if ((ssl_key = getenv("GIT_SSL_KEY")) != NULL) { curl_easy_setopt(curl, CURLOPT_SSLKEY, ssl_key); } +#endif #if LIBCURL_VERSION_NUM >= 0x070908 if ((ssl_capath = getenv("GIT_SSL_CAPATH")) != NULL) { curl_easy_setopt(curl, CURLOPT_CAPATH, ssl_capath); diff --git a/sha1_file.c b/sha1_file.c index fe374c6..1e847a8 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -871,7 +871,8 @@ void packed_object_info_detail(struct pack_entry *e, strcpy(type, "tag"); break; default: - die("corrupted pack file"); + die("corrupted pack file %s containing object of kind %d", + p->pack_name, kind); } *store_size = 0; /* notyet */ } @@ -910,7 +911,8 @@ static int packed_object_info(struct pack_entry *entry, strcpy(type, "tag"); break; default: - die("corrupted pack file"); + die("corrupted pack file %s containing object of kind %d", + p->pack_name, kind); } if (sizep) *sizep = size; @@ -1010,7 +1012,7 @@ static void *unpack_entry(struct pack_entry *entry, retval = unpack_entry_gently(entry, type, sizep); unuse_packed_git(p); if (!retval) - die("corrupted pack file"); + die("corrupted pack file %s", p->pack_name); return retval; } |