Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH] archive.c: reduce scope of variables

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:59:46

Elia Pinto [off-list ref] writes:
Signed-off-by: Elia Pinto <redacted>
---
Either the patch is whitespace damaged during the mail transport, or
you are incorrectly indenting the lines with all spaces.
quoted hunk
 archive.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/archive.c b/archive.c
index 346f3b2..49b79f8 100644
--- a/archive.c
+++ b/archive.c
@@ -112,7 +112,6 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
 	write_archive_entry_fn_t write_entry = c->write_entry;
 	struct git_attr_check check[2];
 	const char *path_without_prefix;
-	int err;
 
 	args->convert = 0;
 	strbuf_reset(&path);
@@ -132,6 +131,7 @@ static int write_archive_entry(const unsigned char *sha1, const char *base,
 	}
 
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
+                int err;
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
 		err = write_entry(args, sha1, path.buf, path.len, mode);
@@ -319,7 +319,6 @@ static int parse_archive_args(int argc, const char **argv,
 	const char *output = NULL;
 	int compression_level = -1;
 	int verbose = 0;
-	int i;
 	int list = 0;
 	int worktree_attributes = 0;
 	struct option opts[] = {
@@ -366,6 +365,7 @@ static int parse_archive_args(int argc, const char **argv,
 		base = "";
 
 	if (list) {
+                int i;
 		for (i = 0; i < nr_archivers; i++)
 			if (!is_remote || archivers[i]->flags & ARCHIVER_REMOTE)
 				printf("%s\n", archivers[i]->name);
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help