From 5ee5f5a65d5a60cd327f1a4b92ee0f48508f2362 Mon Sep 17 00:00:00 2001 From: Ramsay Jones Date: Tue, 11 Jan 2011 18:17:21 +0000 Subject: [PATCH 1/3] svndump.c: Fix a printf format compiler warning In particular, on systems that define uint32_t as an unsigned long, gcc complains as follows: CC vcs-svn/svndump.o vcs-svn/svndump.c: In function `svndump_read': vcs-svn/svndump.c:215: warning: int format, uint32_t arg (arg 2) In order to suppress the warning we use the C99 format specifier macro PRIu32 from . Signed-off-by: Ramsay Jones Acked-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- vcs-svn/svndump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c index fa580e62de..2ad2c307dd 100644 --- a/vcs-svn/svndump.c +++ b/vcs-svn/svndump.c @@ -211,7 +211,7 @@ void svndump_read(const char *url) if (key == keys.svn_fs_dump_format_version) { dump_ctx.version = atoi(val); if (dump_ctx.version > 2) - die("expected svn dump format version <= 2, found %d", + die("expected svn dump format version <= 2, found %"PRIu32, dump_ctx.version); } else if (key == keys.uuid) { dump_ctx.uuid = pool_intern(val); From e5959106d613fe5897ce3e02f573dda266f7c700 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sat, 15 Jan 2011 20:22:35 -0600 Subject: [PATCH 2/3] Documentation/fast-import: put explanation of M 040000 "" in context Omit needless words ("Additionally ... may also" is redundant). While at it, place the explanation of this special case after the general rules for paths to provide the reader with some context. Signed-off-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- Documentation/git-fast-import.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index fed48bd722..4415e63635 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -534,9 +534,6 @@ start with double quote (`"`). If an `LF` or double quote must be encoded into `` shell-style quoting should be used, e.g. `"path/with\n and \" in it"`. -Additionally, in `040000` mode, `` may also be an empty string -(`""`) to specify the root of the tree. - The value of `` must be in canonical form. That is it must not: * contain an empty directory component (e.g. `foo//bar` is invalid), @@ -545,6 +542,8 @@ The value of `` must be in canonical form. That is it must not: * contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` are invalid). +The root of the tree can be represented by an empty string as ``. + It is recommended that `` always be encoded using UTF-8. `filedelete` From b312b4123b053898a583aa6e8da1b26ea828105a Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 10 Jan 2011 23:00:49 +0100 Subject: [PATCH 3/3] exec_cmd: remove unused extern This definition was added by commit 77cb17e9, but it's left unused since commit 511707d. Remove the left-over definition. Signed-off-by: Erik Faye-Lund Signed-off-by: Junio C Hamano --- exec_cmd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/exec_cmd.c b/exec_cmd.c index bf225706ee..38545e8bfd 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -3,7 +3,6 @@ #include "quote.h" #define MAX_ARGS 32 -extern char **environ; static const char *argv_exec_path; static const char *argv0_path;