development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
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-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)

14
cmd-rename.sh
View file

@ -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

4
daemon.c
View file

@ -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)

2
http-fetch.c
View file

@ -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);

8
sha1_file.c
View file

@ -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;
}