[PATCH 5/5] builtin/commit.c: reduce scope of variables

2014-01-30 Thread Elia Pinto 
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
This a reroll of a previous patch. Corrected the declaration
after statement issue.


 builtin/commit.c |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 3767478..a684296 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -307,7 +307,6 @@ static char *prepare_index(int argc, const char **argv, 
const char *prefix,
int fd;
struct string_list partial;
struct pathspec pathspec;
-   char *old_index_env = NULL;
int refresh_flags = REFRESH_QUIET;
 
if (is_status)
@@ -320,6 +319,7 @@ static char *prepare_index(int argc, const char **argv, 
const char *prefix,
die(_(index file corrupt));
 
if (interactive) {
+   char *old_index_env = NULL;
fd = hold_locked_index(index_lock, 1);
 
refresh_cache_or_die(refresh_flags);
@@ -600,12 +600,10 @@ static int prepare_to_commit(const char *index_file, 
const char *prefix,
 {
struct stat statbuf;
struct strbuf committer_ident = STRBUF_INIT;
-   int commitable, saved_color_setting;
+   int commitable;
struct strbuf sb = STRBUF_INIT;
-   char *buffer;
const char *hook_arg1 = NULL;
const char *hook_arg2 = NULL;
-   int ident_shown = 0;
int clean_message_contents = (cleanup_mode != CLEANUP_NONE);
int old_display_comment_prefix;
 
@@ -649,6 +647,7 @@ static int prepare_to_commit(const char *index_file, const 
char *prefix,
  logfile);
hook_arg1 = message;
} else if (use_message) {
+   char *buffer;
buffer = strstr(use_message_buffer, \n\n);
if (!use_editor  (!buffer || buffer[2] == '\0'))
die(_(commit has empty message));
@@ -753,6 +752,8 @@ static int prepare_to_commit(const char *index_file, const 
char *prefix,
/* This checks if committer ident is explicitly given */
strbuf_addstr(committer_ident, git_committer_info(IDENT_STRICT));
if (use_editor  include_status) {
+   int ident_shown = 0;
+   int saved_color_setting;
char *ai_tmp, *ci_tmp;
if (whence != FROM_COMMIT)
status_printf_ln(s, GIT_COLOR_NORMAL,
@@ -1510,7 +1511,6 @@ int cmd_commit(int argc, const char **argv, const char 
*prefix)
struct ref_lock *ref_lock;
struct commit_list *parents = NULL, **pptr = parents;
struct stat statbuf;
-   int allow_fast_forward = 1;
struct commit *current_head = NULL;
struct commit_extra_header *extra = NULL;
 
@@ -1558,6 +1558,7 @@ int cmd_commit(int argc, const char **argv, const char 
*prefix)
} else if (whence == FROM_MERGE) {
struct strbuf m = STRBUF_INIT;
FILE *fp;
+   int allow_fast_forward = 1;
 
if (!reflog_msg)
reflog_msg = commit (merge);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH 5/5] builtin/commit.c: reduce scope of variables

2014-01-29 Thread Elia Pinto 
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
 builtin/commit.c |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 3767478..eea4421 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -307,7 +307,6 @@ static char *prepare_index(int argc, const char **argv, 
const char *prefix,
int fd;
struct string_list partial;
struct pathspec pathspec;
-   char *old_index_env = NULL;
int refresh_flags = REFRESH_QUIET;
 
if (is_status)
@@ -320,6 +319,7 @@ static char *prepare_index(int argc, const char **argv, 
const char *prefix,
die(_(index file corrupt));
 
if (interactive) {
+   char *old_index_env = NULL;
fd = hold_locked_index(index_lock, 1);
 
refresh_cache_or_die(refresh_flags);
@@ -600,12 +600,10 @@ static int prepare_to_commit(const char *index_file, 
const char *prefix,
 {
struct stat statbuf;
struct strbuf committer_ident = STRBUF_INIT;
-   int commitable, saved_color_setting;
+   int commitable;
struct strbuf sb = STRBUF_INIT;
-   char *buffer;
const char *hook_arg1 = NULL;
const char *hook_arg2 = NULL;
-   int ident_shown = 0;
int clean_message_contents = (cleanup_mode != CLEANUP_NONE);
int old_display_comment_prefix;
 
@@ -649,6 +647,7 @@ static int prepare_to_commit(const char *index_file, const 
char *prefix,
  logfile);
hook_arg1 = message;
} else if (use_message) {
+   char *buffer;
buffer = strstr(use_message_buffer, \n\n);
if (!use_editor  (!buffer || buffer[2] == '\0'))
die(_(commit has empty message));
@@ -753,6 +752,8 @@ static int prepare_to_commit(const char *index_file, const 
char *prefix,
/* This checks if committer ident is explicitly given */
strbuf_addstr(committer_ident, git_committer_info(IDENT_STRICT));
if (use_editor  include_status) {
+   int ident_shown = 0;
+   int saved_color_setting;
char *ai_tmp, *ci_tmp;
if (whence != FROM_COMMIT)
status_printf_ln(s, GIT_COLOR_NORMAL,
@@ -1510,7 +1511,6 @@ int cmd_commit(int argc, const char **argv, const char 
*prefix)
struct ref_lock *ref_lock;
struct commit_list *parents = NULL, **pptr = parents;
struct stat statbuf;
-   int allow_fast_forward = 1;
struct commit *current_head = NULL;
struct commit_extra_header *extra = NULL;
 
@@ -1576,6 +1576,7 @@ int cmd_commit(int argc, const char **argv, const char 
*prefix)
}
fclose(fp);
strbuf_release(m);
+   int allow_fast_forward = 1;
if (!stat(git_path(MERGE_MODE), statbuf)) {
if (strbuf_read_file(sb, git_path(MERGE_MODE), 0)  
0)
die_errno(_(could not read MERGE_MODE));
-- 
1.7.10.4

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH 5/5] builtin/commit.c: reduce scope of variables

2014-01-29 Thread Eric Sunshine 
On Wed, Jan 29, 2014 at 8:48 AM, Elia Pinto gitter.spi...@gmail.com wrote:
 diff --git a/builtin/commit.c b/builtin/commit.c
 index 3767478..eea4421 100644
 --- a/builtin/commit.c
 +++ b/builtin/commit.c
 @@ -1510,7 +1511,6 @@ int cmd_commit(int argc, const char **argv, const char 
 *prefix)
 struct ref_lock *ref_lock;
 struct commit_list *parents = NULL, **pptr = parents;
 struct stat statbuf;
 -   int allow_fast_forward = 1;
 struct commit *current_head = NULL;
 struct commit_extra_header *extra = NULL;

 @@ -1576,6 +1576,7 @@ int cmd_commit(int argc, const char **argv, const char 
 *prefix)
 }
 fclose(fp);
 strbuf_release(m);
 +   int allow_fast_forward = 1;

This introduces a declaration-after-statement, which is frowned upon
in this project.

 if (!stat(git_path(MERGE_MODE), statbuf)) {
 if (strbuf_read_file(sb, git_path(MERGE_MODE), 0) 
  0)
 die_errno(_(could not read MERGE_MODE));
 --
 1.7.10.4
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html