Re: [PATCH 00/20] [CONTINUE] Add gettext support to Git

From: Junio C Hamano <gitster@pobox.com>
Date: Sep 8, 2010, 16:43 UTC
Message-ID: <7vd3sonq2n.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1283877955-19105-1-git-send-email-avarab@gmail.com>

I've done

    git fetch git://github.com/avar/git +ab/i18n-all-continue:ab/i18n

and rebuilt 'pu' with it (I am not quite ready to push the results out, though).

Please squash in the following to appropriate patches in the series. Thanks.

-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Sep 2010 09:33:18 -0700
Subject: [PATCH] Style fixups: explicitly disambiguate nested if/if/else correspondence

Write {} to let the compiler know that we know what we are doing, like this, when writing a nested if/if/else:

    if (...) {
        if (...)
	    ...
	else
	    ...
    }

The programmer who writes the code like the above without the outermost {} may know that "else" corresponds to the innermost "if", but it will keep things easier and safer while reviewing patches that build on top of code like this.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/clean.c |    3 ++-
 builtin/clone.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/builtin/clean.c b/builtin/clean.c
index 642d767..e1694c0 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -77,13 +77,14 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	if (ignored && ignored_only)
 		die(_("-x and -X cannot be used together"));
 
-	if (!show_only && !force)
+	if (!show_only && !force) {
 		if (config_set)
 			die(_("clean.requireForce set to true and neither -n nor -f given; "
 				  "refusing to clean"));
 		else
 			die(_("clean.requireForce defaults to true and neither -n nor -f given; "
 				  "refusing to clean"));
+	}
 
 	if (force > 1)
 		rm_flags = 0;
diff --git a/builtin/clone.c b/builtin/clone.c
index 7b0d104..1f10f3f 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -465,11 +465,12 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		die(_("could not create leading directories of '%s'"), git_dir);
 	set_git_dir(make_absolute_path(git_dir));
 
-	if (0 <= option_verbosity)
+	if (0 <= option_verbosity) {
 		if (option_bare)
 			printf(_("Cloning into bare repository %s"), dir);
 		else
 			printf(_("Cloning into %s"), dir);
+	}
 	init_db(option_template, INIT_DB_QUIET);
 
 	/*

-- 
1.7.3.rc0.183.gb0497