kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge with master.kernel.org:/pub/scm/git/git.git

maint
H. Peter Anvin 2005-09-30 10:44:21 -07:00
parent 09dea56568 894a8a8b1b
commit 300b4801b7
5 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -119,7 +119,7 @@ PROGRAMS = \
git-upload-pack$(X) git-verify-pack$(X) git-write-tree$(X) \ git-upload-pack$(X) git-verify-pack$(X) git-write-tree$(X) \
git-update-ref$(X) $(SIMPLE_PROGRAMS) 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) PROGRAMS += git-ssh-pull$(X) git-ssh-push$(X)


PYMODULES = \ PYMODULES = \
@ -354,6 +354,7 @@ install: $(PROGRAMS) $(SCRIPTS)
$(INSTALL) -d -m755 $(DESTDIR)$(bindir) $(INSTALL) -d -m755 $(DESTDIR)$(bindir)
$(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir) $(INSTALL) $(PROGRAMS) $(SCRIPTS) $(DESTDIR)$(bindir)
$(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick $(INSTALL) git-revert $(DESTDIR)$(bindir)/git-cherry-pick
sh ./cmd-rename.sh $(DESTDIR)$(bindir)
$(MAKE) -C templates install $(MAKE) -C templates install
$(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR) $(INSTALL) -d -m755 $(DESTDIR)$(GIT_PYTHON_DIR)
$(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR) $(INSTALL) $(PYMODULES) $(DESTDIR)$(GIT_PYTHON_DIR)

14
cmd-rename.sh
View File

@ -1,15 +1,13 @@
#!/bin/sh #!/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" d="$1"
test -d "$d" || exit test -d "$d" || exit
while read old new while read old new
do do
rm -f "$d/$old" rm -f "$d/$old"
if test -f "$d/$new"
then
ln -s "$new" "$d/$old" || exit
fi
done <<\EOF done <<\EOF
git-add-script git-add git-add-script git-add
git-archimport-script git-archimport git-archimport-script git-archimport
@ -54,7 +52,3 @@ git-update-cache git-update-index
git-convert-cache git-convert-objects git-convert-cache git-convert-objects
git-fsck-cache git-fsck-objects git-fsck-cache git-fsck-objects
EOF EOF

# These two are a bit more than symlinks now.
# git-ssh-push git-ssh-upload
# git-ssh-pull git-ssh-fetch

4
daemon.c
View File

@ -59,7 +59,7 @@ static void logreport(int priority, const char *err, va_list params)
write(2, buf, buflen); write(2, buf, buflen);
} }


void logerror(const char *err, ...) static void logerror(const char *err, ...)
{ {
va_list params; va_list params;
va_start(params, err); va_start(params, err);
@ -67,7 +67,7 @@ void logerror(const char *err, ...)
va_end(params); va_end(params);
} }


void loginfo(const char *err, ...) static void loginfo(const char *err, ...)
{ {
va_list params; va_list params;
if (!verbose) if (!verbose)

2
http-fetch.c
View File

@ -529,9 +529,11 @@ int main(int argc, char **argv)
if ((ssl_cert = getenv("GIT_SSL_CERT")) != NULL) { if ((ssl_cert = getenv("GIT_SSL_CERT")) != NULL) {
curl_easy_setopt(curl, CURLOPT_SSLCERT, ssl_cert); curl_easy_setopt(curl, CURLOPT_SSLCERT, ssl_cert);
} }
#if LIBCURL_VERSION_NUM >= 0x070902
if ((ssl_key = getenv("GIT_SSL_KEY")) != NULL) { if ((ssl_key = getenv("GIT_SSL_KEY")) != NULL) {
curl_easy_setopt(curl, CURLOPT_SSLKEY, ssl_key); curl_easy_setopt(curl, CURLOPT_SSLKEY, ssl_key);
} }
#endif
#if LIBCURL_VERSION_NUM >= 0x070908 #if LIBCURL_VERSION_NUM >= 0x070908
if ((ssl_capath = getenv("GIT_SSL_CAPATH")) != NULL) { if ((ssl_capath = getenv("GIT_SSL_CAPATH")) != NULL) {
curl_easy_setopt(curl, CURLOPT_CAPATH, ssl_capath); curl_easy_setopt(curl, CURLOPT_CAPATH, ssl_capath);

8
sha1_file.c
View File

@ -871,7 +871,8 @@ void packed_object_info_detail(struct pack_entry *e,
strcpy(type, "tag"); strcpy(type, "tag");
break; break;
default: default:
die("corrupted pack file"); die("corrupted pack file %s containing object of kind %d",
p->pack_name, kind);
} }
*store_size = 0; /* notyet */ *store_size = 0; /* notyet */
} }
@ -910,7 +911,8 @@ static int packed_object_info(struct pack_entry *entry,
strcpy(type, "tag"); strcpy(type, "tag");
break; break;
default: default:
die("corrupted pack file"); die("corrupted pack file %s containing object of kind %d",
p->pack_name, kind);
} }
if (sizep) if (sizep)
*sizep = size; *sizep = size;
@ -1010,7 +1012,7 @@ static void *unpack_entry(struct pack_entry *entry,
retval = unpack_entry_gently(entry, type, sizep); retval = unpack_entry_gently(entry, type, sizep);
unuse_packed_git(p); unuse_packed_git(p);
if (!retval) if (!retval)
die("corrupted pack file"); die("corrupted pack file %s", p->pack_name);
return retval; return retval;
} }