From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 7 Sep 2012 18:10:02 +0000 (-0700)
Subject: Merge branch 'nd/branch-v-alignment'
X-Git-Tag: v1.8.0-rc0~90
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8023a422107ca5075eb285f7a9358778db66c616;p=git.git

Merge branch 'nd/branch-v-alignment'

Output from "git branch -v" contains "(no branch)" that could be
localized, but the code to align it along with the names of branches
were counting in bytes, not in display columns.

* nd/branch-v-alignment:
  branch -v: align even when branch names are in UTF-8
---

8023a422107ca5075eb285f7a9358778db66c616
diff --cc builtin/branch.c
index 3f341014a,4ec556fe1..297be4ec4
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@@ -17,12 -17,13 +17,13 @@@
  #include "revision.h"
  #include "string-list.h"
  #include "column.h"
+ #include "utf8.h"
  
  static const char * const builtin_branch_usage[] = {
 -	"git branch [options] [-r | -a] [--merged | --no-merged]",
 -	"git branch [options] [-l] [-f] <branchname> [<start-point>]",
 -	"git branch [options] [-r] (-d | -D) <branchname>...",
 -	"git branch [options] (-m | -M) [<oldbranch>] <newbranch>",
 +	N_("git branch [options] [-r | -a] [--merged | --no-merged]"),
 +	N_("git branch [options] [-l] [-f] <branchname> [<start-point>]"),
 +	N_("git branch [options] [-r] (-d | -D) <branchname>..."),
 +	N_("git branch [options] (-m | -M) [<oldbranch>] <newbranch>"),
  	NULL
  };