summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xDocumentation/build-docdep.perl6
-rw-r--r--Documentation/git-add.txt2
-rw-r--r--Documentation/git-quiltimport.txt8
-rw-r--r--Documentation/git-send-email.txt12
-rw-r--r--Makefile2
-rw-r--r--http-push.c10
6 files changed, 20 insertions, 20 deletions
diff --git a/Documentation/build-docdep.perl b/Documentation/build-docdep.perl
index 489389c32a..ba4205e030 100755
--- a/Documentation/build-docdep.perl
+++ b/Documentation/build-docdep.perl
@@ -41,10 +41,6 @@ while ($changed) {
while (my ($text, $included) = each %include) {
if (! exists $included{$text} &&
(my $base = $text) =~ s/\.txt$//) {
- my ($suffix) = '1';
- if ($base eq 'git') {
- $suffix = '7'; # yuck...
- }
- print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
+ print "$base.html $base.xml : ", join(" ", keys %$included), "\n";
}
}
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index b73a99d61f..755d7186f5 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -52,7 +52,7 @@ OPTIONS
-f::
Allow adding otherwise ignored files.
-\i, \--interactive::
+-i, \--interactive::
Add modified contents in the working tree interactively to
the index.
diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt
index 6e9a8c369a..296937a416 100644
--- a/Documentation/git-quiltimport.txt
+++ b/Documentation/git-quiltimport.txt
@@ -42,10 +42,10 @@ OPTIONS
--patches <dir>::
The directory to find the quilt patches and the
quilt series file.
-
- The default for the patch directory is patches
- or the value of the $QUILT_PATCHES environment
- variable.
++
+The default for the patch directory is patches
+or the value of the $QUILT_PATCHES environment
+variable.
Author
------
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 4c8d907bd5..35b0104e4a 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -26,13 +26,13 @@ The options available are:
--bcc::
Specify a "Bcc:" value for each email.
-
- The --bcc option must be repeated for each user you want on the bcc list.
++
+The --bcc option must be repeated for each user you want on the bcc list.
--cc::
Specify a starting "Cc:" value for each email.
-
- The --cc option must be repeated for each user you want on the cc list.
++
+The --cc option must be repeated for each user you want on the cc list.
--chain-reply-to, --no-chain-reply-to::
If this is set, each email will be sent as a reply to the previous
@@ -87,8 +87,8 @@ The options available are:
Specify the primary recipient of the emails generated.
Generally, this will be the upstream maintainer of the
project involved.
-
- The --to option must be repeated for each user you want on the to list.
++
+The --to option must be repeated for each user you want on the to list.
Author
diff --git a/Makefile b/Makefile
index 23ab7d6f9f..9a37b15439 100644
--- a/Makefile
+++ b/Makefile
@@ -780,7 +780,7 @@ git-http-push$X: revision.o http.o http-push.o $(GITLIBS)
$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
$(LIBS) $(CURL_LIBCURL) $(EXPAT_LIBEXPAT)
-$(LIB_OBJS) $(BUILTIN_OBJS): $(LIB_H)
+$(LIB_OBJS) $(BUILTIN_OBJS) fetch.o: $(LIB_H)
$(patsubst git-%$X,%.o,$(PROGRAMS)): $(LIB_H) $(wildcard */*.h)
$(DIFF_OBJS): diffcore.h
diff --git a/http-push.c b/http-push.c
index 68b78b538a..cbb02d3bc1 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1271,7 +1271,9 @@ xml_cdata(void *userData, const XML_Char *s, int len)
struct xml_ctx *ctx = (struct xml_ctx *)userData;
free(ctx->cdata);
ctx->cdata = xmalloc(len + 1);
- strlcpy(ctx->cdata, s, len + 1);
+ /* NB: 's' is not null-terminated, can not use strlcpy here */
+ memcpy(ctx->cdata, s, len);
+ ctx->cdata[len] = '\0';
}
static struct remote_lock *lock_remote(const char *path, long timeout)
@@ -1473,7 +1475,8 @@ static void process_ls_object(struct remote_ls_ctx *ls)
return;
path += 8;
obj_hex = xmalloc(strlen(path));
- strlcpy(obj_hex, path, 3);
+ /* NB: path is not null-terminated, can not use strlcpy here */
+ memcpy(obj_hex, path, 2);
strcpy(obj_hex + 2, path + 3);
one_remote_object(obj_hex);
free(obj_hex);
@@ -2170,7 +2173,8 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1)
/* If it's a symref, set the refname; otherwise try for a sha1 */
if (!prefixcmp((char *)buffer.buffer, "ref: ")) {
*symref = xmalloc(buffer.posn - 5);
- strlcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 5);
+ memcpy(*symref, (char *)buffer.buffer + 5, buffer.posn - 6);
+ (*symref)[buffer.posn - 6] = '\0';
} else {
get_sha1_hex(buffer.buffer, sha1);
}