{"thread":{"id":"35043","subject":"[PATCH 00/10] trivial style and other fixes","startedAt":"2013-09-28T21:51:36Z","lastAt":"2013-09-28T21:51:46Z","messageCount":11,"participants":["Felipe Contreras"],"isPatch":true,"patchVersion":1,"patchTotal":10},"messages":[{"id":"228366","messageId":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":null,"subject":"[PATCH 00/10] trivial style and other fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:36Z","receivedAt":"2013-09-28T21:51:36Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Felipe Contreras (10):\n transport-helper: trivial style fix\n describe: trivial style fixes\n pretty: trivial style fix\n revision: trivial style fixes\n revision: add missing include\n shortlog: add missing declaration\n diff: trivial style fix\n run-command: trivial style fixes\n revision: trivial style fixes\n setup: trivial style fixes\n\n builtin/describe.c | 7 +++----\n builtin/diff.c | 2 +-\n pretty.c | 2 +-\n revision.c | 14 ++++++--------\n revision.h | 1 +\n run-command.c | 13 +++++--------\n setup.c | 4 ++--\n shortlog.h | 2 ++\n transport-helper.c | 1 +\n 9 files changed, 22 insertions(+), 24 deletions(-)\n\n-- \n1.8.4-fc\n"},{"id":"228368","messageId":"1380405106-29430-2-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 01/10] transport-helper: trivial style fix","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:37Z","receivedAt":"2013-09-28T21:51:37Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n transport-helper.c | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/transport-helper.c b/transport-helper.c\nindex b32e2d6..673b7c2 100644\n--- a/transport-helper.c\n+++ b/transport-helper.c\n@@ -269,6 +269,7 @@ static const char *unsupported_options[] = {\n \tTRANS_OPT_THIN,\n \tTRANS_OPT_KEEP\n \t};\n+\n static const char *boolean_options[] = {\n \tTRANS_OPT_THIN,\n \tTRANS_OPT_KEEP,\n-- \n1.8.4-fc\n"},{"id":"228367","messageId":"1380405106-29430-3-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 02/10] describe: trivial style fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:38Z","receivedAt":"2013-09-28T21:51:38Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n builtin/describe.c | 7 +++----\n 1 file changed, 3 insertions(+), 4 deletions(-)\n\ndiff --git a/builtin/describe.c b/builtin/describe.c\nindex b9d3603..6f62109 100644\n--- a/builtin/describe.c\n+++ b/builtin/describe.c\n@@ -9,7 +9,7 @@\n #include \"hash.h\"\n #include \"argv-array.h\"\n \n-#define SEEN\t\t(1u<<0)\n+#define SEEN\t\t(1u << 0)\n #define MAX_TAGS\t(FLAG_BITS - 1)\n \n static const char * const describe_usage[] = {\n@@ -36,7 +36,6 @@ static const char *diff_index_args[] = {\n \t\"diff-index\", \"--quiet\", \"HEAD\", \"--\", NULL\n };\n \n-\n struct commit_name {\n \tstruct commit_name *next;\n \tunsigned char peeled[20];\n@@ -46,6 +45,7 @@ struct commit_name {\n \tunsigned char sha1[20];\n \tchar *path;\n };\n+\n static const char *prio_names[] = {\n \t\"head\", \"lightweight\", \"annotated\",\n };\n@@ -488,9 +488,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)\n \t} else if (dirty) {\n \t\tdie(_(\"--dirty is incompatible with commit-ishes\"));\n \t} else {\n-\t\twhile (argc-- > 0) {\n+\t\twhile (argc-- > 0)\n \t\t\tdescribe(*argv++, argc == 0);\n-\t\t}\n \t}\n \treturn 0;\n }\n-- \n1.8.4-fc\n"},{"id":"228369","messageId":"1380405106-29430-4-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 03/10] pretty: trivial style fix","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:39Z","receivedAt":"2013-09-28T21:51:39Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n pretty.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/pretty.c b/pretty.c\nindex b4e32b7..962e82b 100644\n--- a/pretty.c\n+++ b/pretty.c\n@@ -497,7 +497,7 @@ void pp_user_info(struct pretty_print_context *pp,\n static int is_empty_line(const char *line, int *len_p)\n {\n \tint len = *len_p;\n-\twhile (len && isspace(line[len-1]))\n+\twhile (len && isspace(line[len - 1]))\n \t\tlen--;\n \t*len_p = len;\n \treturn !len;\n-- \n1.8.4-fc\n"},{"id":"228370","messageId":"1380405106-29430-5-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 04/10] revision: trivial style fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:40Z","receivedAt":"2013-09-28T21:51:40Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n revision.c | 8 +++-----\n 1 file changed, 3 insertions(+), 5 deletions(-)\n\ndiff --git a/revision.c b/revision.c\nindex 0173e01..3ebd558 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -2971,7 +2971,7 @@ static struct commit *get_revision_internal(struct rev_info *revs)\n \tif (revs->max_count) {\n \t\tc = get_revision_1(revs);\n \t\tif (c) {\n-\t\t\twhile (0 < revs->skip_count) {\n+\t\t\twhile (revs->skip_count > 0) {\n \t\t\t\trevs->skip_count--;\n \t\t\t\tc = get_revision_1(revs);\n \t\t\t\tif (!c)\n@@ -2986,9 +2986,8 @@ static struct commit *get_revision_internal(struct rev_info *revs)\n \tif (c)\n \t\tc->object.flags |= SHOWN;\n \n-\tif (!revs->boundary) {\n+\tif (!revs->boundary)\n \t\treturn c;\n-\t}\n \n \tif (!c) {\n \t\t/*\n@@ -3034,9 +3033,8 @@ struct commit *get_revision(struct rev_info *revs)\n \n \tif (revs->reverse) {\n \t\treversed = NULL;\n-\t\twhile ((c = get_revision_internal(revs))) {\n+\t\twhile ((c = get_revision_internal(revs)))\n \t\t\tcommit_list_insert(c, &reversed);\n-\t\t}\n \t\trevs->commits = reversed;\n \t\trevs->reverse = 0;\n \t\trevs->reverse_output_stage = 1;\n-- \n1.8.4-fc\n"},{"id":"228371","messageId":"1380405106-29430-6-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 05/10] revision: add missing include","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:41Z","receivedAt":"2013-09-28T21:51:41Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Otherwise we might not have 'struct diff_options'.\n\nSigned-off-by: Felipe Contreras \n---\n revision.h | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/revision.h b/revision.h\nindex e7f1d21..89132df 100644\n--- a/revision.h\n+++ b/revision.h\n@@ -5,6 +5,7 @@\n #include \"grep.h\"\n #include \"notes.h\"\n #include \"commit.h\"\n+#include \"diff.h\"\n \n #define SEEN\t\t(1u<<0)\n #define UNINTERESTING (1u<<1)\n-- \n1.8.4-fc\n"},{"id":"228373","messageId":"1380405106-29430-7-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 06/10] shortlog: add missing declaration","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:42Z","receivedAt":"2013-09-28T21:51:42Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Otherwise we would have to include commit.h.\n\nSigned-off-by: Felipe Contreras \n---\n shortlog.h | 2 ++\n 1 file changed, 2 insertions(+)\n\ndiff --git a/shortlog.h b/shortlog.h\nindex de4f86f..54bc07c 100644\n--- a/shortlog.h\n+++ b/shortlog.h\n@@ -19,6 +19,8 @@ struct shortlog {\n \tstruct string_list mailmap;\n };\n \n+struct commit;\n+\n void shortlog_init(struct shortlog *log);\n \n void shortlog_add_commit(struct shortlog *log, struct commit *commit);\n-- \n1.8.4-fc\n"},{"id":"228372","messageId":"1380405106-29430-8-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 07/10] diff: trivial style fix","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:43Z","receivedAt":"2013-09-28T21:51:43Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n builtin/diff.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/builtin/diff.c b/builtin/diff.c\nindex 2fb8c5d..adb93a9 100644\n--- a/builtin/diff.c\n+++ b/builtin/diff.c\n@@ -169,7 +169,7 @@ static int builtin_diff_tree(struct rev_info *revs,\n \tif (ent1->item->flags & UNINTERESTING)\n \t\tswap = 1;\n \tsha1[swap] = ent0->item->sha1;\n-\tsha1[1-swap] = ent1->item->sha1;\n+\tsha1[1 - swap] = ent1->item->sha1;\n \tdiff_tree_sha1(sha1[0], sha1[1], \"\", &revs->diffopt);\n \tlog_tree_diff_flush(revs);\n \treturn 0;\n-- \n1.8.4-fc\n"},{"id":"228374","messageId":"1380405106-29430-9-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 08/10] run-command: trivial style fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:44Z","receivedAt":"2013-09-28T21:51:44Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n run-command.c | 13 +++++--------\n 1 file changed, 5 insertions(+), 8 deletions(-)\n\ndiff --git a/run-command.c b/run-command.c\nindex 1b7f88e..3914d9c 100644\n--- a/run-command.c\n+++ b/run-command.c\n@@ -406,13 +406,12 @@ fail_pipe:\n \t\t\t\t\tunsetenv(*cmd->env);\n \t\t\t}\n \t\t}\n-\t\tif (cmd->git_cmd) {\n+\t\tif (cmd->git_cmd)\n \t\t\texecv_git_cmd(cmd->argv);\n-\t\t} else if (cmd->use_shell) {\n+\t\telse if (cmd->use_shell)\n \t\t\texecv_shell_cmd(cmd->argv);\n-\t\t} else {\n+\t\telse\n \t\t\tsane_execvp(cmd->argv[0], (char *const*) cmd->argv);\n-\t\t}\n \t\tif (errno == ENOENT) {\n \t\t\tif (!cmd->silent_exec_failure)\n \t\t\t\terror(\"cannot run %s: %s\", cmd->argv[0],\n@@ -446,7 +445,6 @@ fail_pipe:\n \t\tcmd->pid = -1;\n \t}\n \tclose(notify_pipe[0]);\n-\n }\n #else\n {\n@@ -480,11 +478,10 @@ fail_pipe:\n \tif (cmd->env)\n \t\tenv = make_augmented_environ(cmd->env);\n \n-\tif (cmd->git_cmd) {\n+\tif (cmd->git_cmd)\n \t\tcmd->argv = prepare_git_cmd(cmd->argv);\n-\t} else if (cmd->use_shell) {\n+\telse if (cmd->use_shell)\n \t\tcmd->argv = prepare_shell_cmd(cmd->argv);\n-\t}\n \n \tcmd->pid = mingw_spawnvpe(cmd->argv[0], cmd->argv, env, cmd->dir,\n \t\t\t\t fhin, fhout, fherr);\n-- \n1.8.4-fc\n"},{"id":"228375","messageId":"1380405106-29430-10-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 09/10] revision: trivial style fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:45Z","receivedAt":"2013-09-28T21:51:45Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n revision.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/revision.c b/revision.c\nindex 3ebd558..4049867 100644\n--- a/revision.c\n+++ b/revision.c\n@@ -1503,7 +1503,7 @@ struct cmdline_pathspec {\n static void append_prune_data(struct cmdline_pathspec *prune, const char **av)\n {\n \twhile (*av) {\n-\t\tALLOC_GROW(prune->path, prune->nr+1, prune->alloc);\n+\t\tALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);\n \t\tprune->path[prune->nr++] = *(av++);\n \t}\n }\n@@ -1515,7 +1515,7 @@ static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,\n \t\tint len = sb->len;\n \t\tif (len && sb->buf[len - 1] == '\\n')\n \t\t\tsb->buf[--len] = '\\0';\n-\t\tALLOC_GROW(prune->path, prune->nr+1, prune->alloc);\n+\t\tALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);\n \t\tprune->path[prune->nr++] = xstrdup(sb->buf);\n \t}\n }\n@@ -2118,7 +2118,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s\n \t\t *\tcall init_pathspec() to set revs->prune_data here.\n \t\t * }\n \t\t */\n-\t\tALLOC_GROW(prune_data.path, prune_data.nr+1, prune_data.alloc);\n+\t\tALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);\n \t\tprune_data.path[prune_data.nr++] = NULL;\n \t\tparse_pathspec(&revs->prune_data, 0, 0,\n \t\t\t revs->prefix, prune_data.path);\n-- \n1.8.4-fc\n"},{"id":"228376","messageId":"1380405106-29430-11-git-send-email-felipe.contreras@gmail.com","threadId":"35043","inReplyTo":"1380405106-29430-1-git-send-email-felipe.contreras@gmail.com","subject":"[PATCH 10/10] setup: trivial style fixes","fromName":"Felipe Contreras","fromEmail":"felipe.contreras@gmail.com","sentAt":"2013-09-28T21:51:46Z","receivedAt":"2013-09-28T21:51:46Z","isPatch":true,"sender":{"key":"felipe.contreras@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8358?v=4"},"body":"Signed-off-by: Felipe Contreras \n---\n setup.c | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/setup.c b/setup.c\nindex f08dd64..c717db4 100644\n--- a/setup.c\n+++ b/setup.c\n@@ -566,7 +566,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)\n {\n \tconst char *env_ceiling_dirs = getenv(CEILING_DIRECTORIES_ENVIRONMENT);\n \tstruct string_list ceiling_dirs = STRING_LIST_INIT_DUP;\n-\tstatic char cwd[PATH_MAX+1];\n+\tstatic char cwd[PATH_MAX + 1];\n \tconst char *gitdirenv, *ret;\n \tchar *gitfile;\n \tint len, offset, offset_parent, ceil_offset = -1;\n@@ -581,7 +581,7 @@ static const char *setup_git_directory_gently_1(int *nongit_ok)\n \tif (nongit_ok)\n \t\t*nongit_ok = 0;\n \n-\tif (!getcwd(cwd, sizeof(cwd)-1))\n+\tif (!getcwd(cwd, sizeof(cwd) - 1))\n \t\tdie_errno(\"Unable to read current working directory\");\n \toffset = len = strlen(cwd);\n \n-- \n1.8.4-fc\n"}]}