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

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 <redacted>
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 <redacted>
---
 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

On Wed, Sep 8, 2010 at 16:43, Junio C Hamano [off-list ref] wrote:

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.

Thanks, those fixes were actually already part of the series, but I
hadn't squashed those yet.

I've gone ahead and done so:

    pick 8e9b49d gettextize: git-clone "Cloning into" message
    fixup 73f08a1 gettextize: git-clone "Cloning into" message braces

and:

    pick 8e9b49d gettextize: git-clone "Cloning into" message
    fixup 73f08a1 gettextize: git-clone "Cloning into" message braces

I've also fixed up the whole mess with the "me" messages. I.e. dropped
the revert commits and just fixed the originals so they make sense in
the first place.

On Wed, Sep 8, 2010 at 23:32, Ævar Arnfjörð Bjarmason [off-list ref] wrote:

On Wed, Sep 8, 2010 at 16:43, Junio C Hamano [off-list ref] wrote:

quoted

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.

Thanks, those fixes were actually already part of the series, but I
hadn't squashed those yet.

I've gone ahead and done so:

   pick 8e9b49d gettextize: git-clone "Cloning into" message
   fixup 73f08a1 gettextize: git-clone "Cloning into" message braces

and:

   pick 8e9b49d gettextize: git-clone "Cloning into" message
   fixup 73f08a1 gettextize: git-clone "Cloning into" message braces

I've also fixed up the whole mess with the "me" messages. I.e. dropped
the revert commits and just fixed the originals so they make sense in
the first place.

Hi, since you didn't pick this up in the last push I fixed it up a bit
more.

I rebased ab/i18n-all-continue on the new master:

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

But you probably want this instead:

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

I took the liberty of adding Ramkumar Ramachandra's hi.po patch to the
series.

It also doesn't have your "Style fixups: explicitly disambiguate
nested if/if/else correspondence" commit since I fixed that in my
copy, and fixes the "me" issues by rewriting some old commits.