From e1e4389832f32bb6ce029d6a6b110aa9ec768ea8 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 4 Feb 2009 02:50:15 +0100 Subject: [PATCH 1/4] apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- builtin-apply.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin-apply.c b/builtin-apply.c index 50b623e54c0..7a1ff041f15 100644 --- a/builtin-apply.c +++ b/builtin-apply.c @@ -2445,7 +2445,7 @@ static int check_preimage(struct patch *patch, struct cache_entry **ce, struct s return error("%s: %s", old_name, strerror(errno)); } - if (!cached) + if (!cached && !tpatch) st_mode = ce_mode_from_stat(*ce, st->st_mode); if (patch->is_new < 0) From c9a8abcf9a9997d463a6a05668fd9a90a26df1f2 Mon Sep 17 00:00:00 2001 From: Guanqun Lu Date: Thu, 5 Feb 2009 05:00:40 +0800 Subject: [PATCH 2/4] fix typo in Documentation Signed-off-by: Guanqun Lu Signed-off-by: Junio C Hamano --- Documentation/technical/api-strbuf.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt index a9668e5f2d2..4242dc01426 100644 --- a/Documentation/technical/api-strbuf.txt +++ b/Documentation/technical/api-strbuf.txt @@ -21,7 +21,7 @@ allocated memory or not), use `strbuf_detach()` to unwrap a memory buffer from its strbuf shell in a safe way. That is the sole supported way. This will give you a malloced buffer that you can later `free()`. + -However, it it totally safe to modify anything in the string pointed by +However, it is totally safe to modify anything in the string pointed by the `buf` member, between the indices `0` and `len-1` (inclusive). . The `buf` member is a byte array that has at least `len + 1` bytes From 37fc57a213c5dd7a15dfdf571ce4a58de124cb0f Mon Sep 17 00:00:00 2001 From: Guanqun Lu Date: Thu, 5 Feb 2009 05:00:41 +0800 Subject: [PATCH 3/4] add test-dump-cache-tree in Makefile 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: Guanqun Lu Signed-off-by: Junio C Hamano --- Makefile | 2 +- dump-cache-tree.c => test-dump-cache-tree.c | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename dump-cache-tree.c => test-dump-cache-tree.c (100%) diff --git a/Makefile b/Makefile index 186a8efd1b7..5de4247fbd8 100644 --- a/Makefile +++ b/Makefile @@ -1301,7 +1301,7 @@ endif ### Testing rules -TEST_PROGRAMS = test-chmtime$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X +TEST_PROGRAMS = test-chmtime$X test-dump-cache-tree$X test-genrandom$X test-date$X test-delta$X test-sha1$X test-match-trees$X test-parse-options$X test-path-utils$X all:: $(TEST_PROGRAMS) diff --git a/dump-cache-tree.c b/test-dump-cache-tree.c similarity index 100% rename from dump-cache-tree.c rename to test-dump-cache-tree.c From 7a85f6ae88be5937c32a7b61601a40a02c03fb3f Mon Sep 17 00:00:00 2001 From: William Pursell Date: Tue, 3 Feb 2009 22:41:14 +0000 Subject: [PATCH 4/4] User-manual: "git stash " form is long gone These days you must explicitly say "git stash save ". Signed-off-by: William Pursell Signed-off-by: Junio C Hamano --- Documentation/user-manual.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 99cb80878b3..2ae88c575d0 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1497,7 +1497,7 @@ so on a different branch and then coming back), unstash the work-in-progress changes. ------------------------------------------------ -$ git stash "work in progress for foo feature" +$ git stash save "work in progress for foo feature" ------------------------------------------------ This command will save your changes away to the `stash`, and