Re: [PATCH v3] builtin/log: honor log.decorate

[Alex Henrie]

2017-05-14 20:35 GMT-06:00 Junio C Hamano :
> "brian m. carlson"  writes:
>
>> The recent change that introduced autodecorating of refs accidentally
>> broke the ability of users to set log.decorate = false to override it.
>> When the git_log_config was traversed a second time with an option other
>> than log.decorate, the decoration style would be set to the automatic
>> style, even if the user had already overridden it.  Instead of setting
>> the option in config parsing, set it in init_log_defaults instead.
>>
>> Add a test for this case.  The actual additional config option doesn't
>> matter, but it needs to be something not already set in the
>> configuration file.
>>
>> Signed-off-by: brian m. carlson 
>> ---
>> Changes from v2:
>> * Add a test.  I tested that the config parsing both works with
>>   additional options and also can be overridden from the command line.
>
> Thanks, all.
>
> Will queue with Acked-by by Alex and Reviewed-by by Jonathan.

That sounds great, thank you.

-Alex

Re: [PATCH v2] builtin/log: honor log.decorate

[Alex Henrie]

2017-05-12 17:48 GMT-06:00 Jonathan Nieder :
> Hi,
>
> brian m. carlson wrote:
>
>> Does anyone else have views on whether this is good thing to test for?
>
> I know you don't mean to be rude, but this comes across as a bit of
> a dismissive question.

The question sounded neutral to me.

>> On Fri, May 12, 2017 at 04:32:14PM -0700, Jonathan Nieder wrote:
>>> brian m. carlson wrote:
>
 The recent change that introduced autodecorating of refs accidentally
 broke the ability of users to set log.decorate = false to override it.
>>>
>>> Yikes.  It sounds to me like we need a test to ensure we don't regress
>>> it again later.
>>
>> I can add one, but it's going to be a bit odd.  The issue is that as far
>> as I can tell, the option is honored only if it's the last one read, so
>> it necessarily has to be in the per-repository configuration.
>>
>> I'm not sure it makes that much sense to add a test for this case.  Do
>> we generally want to write such tests for all config options?  I don't
>> suppose it's that common a mistake to make.
>
> In my humble opinion, the bug being subtle makes it especially useful
> to have a test that describes that bug.  That way, if someone is
> refactoring this code later then they know what to watch out for not
> reintroducing.
>
> I'm happy to hear other opinions, especially if they come with data or
> a principle attached that I can use when writing future patches of my
> own.

When I saw Brian's email today, my first thought was "What was I
thinking?" My mistake was pretty obvious. Then I remembered that when
I wrote the original patch, I wasn't sure where to set the default
value, because there were no clear examples in this file. Now that
we've established a clear precedent for setting the log.decorate
default (and other defaults like it) in init_log_defaults, I don't
expect any more problems with log.decorate. And since it's not
practical to add tests for similar bugs for every command and
configuration option in Git, we'll just have to be a little more
vigilant about code review.

Again, I apologize for the trouble.

-Alex

Re: [PATCH v2] builtin/log: honor log.decorate

[Alex Henrie]

2017-05-12 16:12 GMT-06:00 brian m. carlson <sand...@crustytoothpaste.net>:
> The recent change that introduced autodecorating of refs accidentally
> broke the ability of users to set log.decorate = false to override it.
> When the git_log_config was traversed a second time with an option other
> than log.decorate, the decoration style would be set to the automatic
> style, even if the user had already overridden it.  Instead of setting
> the option in config parsing, set it in init_log_defaults instead.
>
> Signed-off-by: brian m. carlson <sand...@crustytoothpaste.net>
> ---
>  builtin/log.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index b3b10cc1e..ec3258368 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -110,6 +110,8 @@ static void init_log_defaults(void)
>  {
> init_grep_defaults();
> init_diff_ui_defaults();
> +
> +   decoration_style = auto_decoration_style();
>  }
>
>  static void cmd_log_init_defaults(struct rev_info *rev)
> @@ -410,8 +412,6 @@ static int git_log_config(const char *var, const char 
> *value, void *cb)
> if (decoration_style < 0)
> decoration_style = 0; /* maybe warn? */
> return 0;
> -   } else {
> -   decoration_style = auto_decoration_style();
> }
> if (!strcmp(var, "log.showroot")) {
> default_show_root = git_config_bool(var, value);

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>

Re: [PATCH] builtin/log: honor log.decorate

[Alex Henrie]

2017-05-12 15:34 GMT-06:00 brian m. carlson :
> The recent change that introduced autodecorating of refs accidentally
> broke the ability of users to set log.decorate = false to override it.
> When the git_log_config was traversed a second time with an option other
> than log.decorate, the decoration style would be set to the automatic
> style, even if the user had already overridden it.  Only set the option
> to its default value if we haven't set it already.
>
> Signed-off-by: brian m. carlson 
> ---
>  builtin/log.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index b3b10cc1e..304923836 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -34,7 +34,7 @@ static int default_abbrev_commit;
>  static int default_show_root = 1;
>  static int default_follow;
>  static int default_show_signature;
> -static int decoration_style;
> +static int decoration_style = -1;
>  static int decoration_given;
>  static int use_mailmap_config;
>  static const char *fmt_patch_subject_prefix = "PATCH";
> @@ -410,7 +410,7 @@ static int git_log_config(const char *var, const char 
> *value, void *cb)
> if (decoration_style < 0)
> decoration_style = 0; /* maybe warn? */
> return 0;
> -   } else {
> +   } else if (decoration_style == -1) {
> decoration_style = auto_decoration_style();
> }
> if (!strcmp(var, "log.showroot")) {

Sorry for the mistake. On second thought, I think we should set
decoration_style = auto_decoration_style() in init_log_defaults.

-Alex

[PATCH v2] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/log.c  |  9 -
 t/t4202-log.sh | 10 +-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index 281af8c1e..d755a5960 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -52,6 +52,11 @@ struct line_opt_callback_data {
struct string_list args;
 };
 
+static int auto_decoration_style(void)
+{
+   return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+}
+
 static int parse_decoration_style(const char *var, const char *value)
 {
switch (git_config_maybe_bool(var, value)) {
@@ -67,7 +72,7 @@ static int parse_decoration_style(const char *var, const char 
*value)
else if (!strcmp(value, "short"))
return DECORATE_SHORT_REFS;
else if (!strcmp(value, "auto"))
-   return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+   return auto_decoration_style();
return -1;
 }
 
@@ -405,6 +410,8 @@ static int git_log_config(const char *var, const char 
*value, void *cb)
if (decoration_style < 0)
decoration_style = 0; /* maybe warn? */
return 0;
+   } else {
+   decoration_style = auto_decoration_style();
}
if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value);
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48b55bfd2..f57799071 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -4,6 +4,7 @@ test_description='git log'
 
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
+. "$TEST_DIRECTORY/lib-terminal.sh"
 
 test_expect_success setup '
 
@@ -520,7 +521,7 @@ test_expect_success 'log --graph with merge' '
 '
 
 test_expect_success 'log.decorate configuration' '
-   git log --oneline >expect.none &&
+   git log --oneline --no-decorate >expect.none &&
git log --oneline --decorate >expect.short &&
git log --oneline --decorate=full >expect.full &&
 
@@ -576,6 +577,13 @@ test_expect_success 'log.decorate configuration' '
 
 '
 
+test_expect_success TTY 'log output on a TTY' '
+   git log --oneline --decorate >expect.short &&
+
+   test_terminal git log --oneline >actual &&
+   test_cmp expect.short actual
+'
+
 test_expect_success 'reflog is expected format' '
git log -g --abbrev-commit --pretty=oneline >expect &&
git reflog >actual &&
-- 
2.12.0

Re: [PATCH] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

2017-03-23 12:03 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>
>> Yes, that makes sense. I assume that when you talk about 'next', you
>> mean 'master'?
>
> No, I do mean 'next'.  See "A note from the maintainer" post that
> are sent to the list every once in a while (i.e. after a new release
> is tagged) for the project structure.
>
> https://public-inbox.org/git/xmqqy3vztypi@gitster.mtv.corp.google.com/

That document was very helpful, thanks.

>> If we want to use `git -p log` in a test, we'll have to change the
>> behavior of pager_in_use(). Alternatively, we could use
>> `GIT_PAGER_IN_USE=1 git log` instead.
>
> Testing "git -p" is not the goal; testing that decorate defaults to
> auto during an interactive session is.  We could run tests under pty
> like t7006 does using lib-terminal.sh if we really want to emulate
> an interactive session.
>
> Exporting GIT_PAGER_IN_USE may be sufficient for the purpose of
> convincing the command to be in an interactive session for this
> test, even though it feels a bit too brittle to depend on the
> internal implementation detail.

Okay, I've now written a lib-terminal test for git log. I'll send the
revised patch momentarily.

-Alex

Re: [PATCH] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

2017-03-23 9:54 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>
>> 2017-03-22 10:54 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
>>> Alex Henrie <alexhenri...@gmail.com> writes:
>>>> No problem. Do I need to submit a second version of the patch with a
>>>> test for `git -p log`?
>>>
>>> You do want to protect this "without an option, we default to
>>> 'auto'" feature from future breakage, no?
>>
>> Yes, but I need to know whether you want a v2 of this patch with all
>> of the changes including the new test, or a second patch that depends
>> on the first patch and only adds the new test.
>
> Sorry, I misunderstood the question.
>
> In general, we prefer to have tests that protects the updated
> behaviour in the same patch that makes code changes that brings in
> the new behaviour, i.e. a single v2 patch with new test would be
> more appropriate in this case.
>
> When people work on a large bugfix, especially one that needs
> multiple steps, we sometimes see a patch that adds new tests that
> describe the desired behaviour as failing tests first, and then
> subsequent patches to the code to update the behaviour flip
> "test_expect_failure" to "test_expect_success" as they fix the
> behaviour.  But for a small change like this one, that approach is
> inappropriate.
>
> When a patch that was reviewed, deemed good enough and has been
> already merged to the 'next' branch later turns out that it needs
> further work (like "we do need some tests"), we do such necessary
> updates as separate follow-up patches, simply because we promise
> that 'next' won't be rewound and are not allowed to replace patches.
> But this one is not yet in 'next', so we can freely take a
> replacement patch.
>
> Hope this message makes it clear enough?

Yes, that makes sense. I assume that when you talk about 'next', you
mean 'master'?

Unfortunately, I think I found a bug. Even when using `git -p`, the
function pager_in_use() always returns false if the output is not a
TTY. So, `isatty(1) || pager_in_use()` and `color_stdout_is_tty ||
(pager_in_use() && pager_use_color)` are redundant.

If we want to use `git -p log` in a test, we'll have to change the
behavior of pager_in_use(). Alternatively, we could use
`GIT_PAGER_IN_USE=1 git log` instead.

-Alex

Re: [PATCH] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

2017-03-22 10:54 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>> No problem. Do I need to submit a second version of the patch with a
>> test for `git -p log`?
>
> You do want to protect this "without an option, we default to
> 'auto'" feature from future breakage, no?

Yes, but I need to know whether you want a v2 of this patch with all
of the changes including the new test, or a second patch that depends
on the first patch and only adds the new test.

-Alex

Re: [PATCH] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

2017-03-21 16:28 GMT-06:00 Junio C Hamano :
> Junio C Hamano  writes:
>
>>>  test_expect_success 'log.decorate configuration' '
>>> -git log --oneline >expect.none &&
>>> +git log --oneline --no-decorate >expect.none &&
>>>  git log --oneline --decorate >expect.short &&
>>>  git log --oneline --decorate=full >expect.full &&
>>
>> This ensures that an explicit --no-decorate from the command line
>> does give "none" output, which we failed to do so far, and is a good
>> change.  Don't we also need a _new_ test to ensure that "auto" kicks
>> in without any explicit request?  Knowing the implementation that
>> pager-in-use triggers the "auto" behaviour, perhaps testing the
>> output from "git -p log" would be sufficient?
>
> BTW,
>
>>
>> +static int auto_decoration_style()
>> +{
>> + return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
>> +}
>
> FYI, I fixed this to
>
> static int auto_decoration_style(void)
>
> while queuing to make it compile.

No problem. Do I need to submit a second version of the patch with a
test for `git -p log`?

-Alex

[PATCH] log: if --decorate is not given, default to --decorate=auto

[Alex Henrie]

Git's branching and merging system can be confusing, especially to new
users. When teaching people Git, I tell them to set log.decorate=auto.
This preference greatly improves the user's awareness of the local and
remote branches. So for the sake of user friendliness, I'd like to
change the default from log.decorate=no to log.decorate=auto.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/log.c  | 9 -
 t/t4202-log.sh | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/builtin/log.c b/builtin/log.c
index 281af8c1e..ddb4515dc 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -52,6 +52,11 @@ struct line_opt_callback_data {
struct string_list args;
 };
 
+static int auto_decoration_style()
+{
+   return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+}
+
 static int parse_decoration_style(const char *var, const char *value)
 {
switch (git_config_maybe_bool(var, value)) {
@@ -67,7 +72,7 @@ static int parse_decoration_style(const char *var, const char 
*value)
else if (!strcmp(value, "short"))
return DECORATE_SHORT_REFS;
else if (!strcmp(value, "auto"))
-   return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
+   return auto_decoration_style();
return -1;
 }
 
@@ -405,6 +410,8 @@ static int git_log_config(const char *var, const char 
*value, void *cb)
if (decoration_style < 0)
decoration_style = 0; /* maybe warn? */
return 0;
+   } else {
+   decoration_style = auto_decoration_style();
}
if (!strcmp(var, "log.showroot")) {
default_show_root = git_config_bool(var, value);
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 48b55bfd2..3aa8daba3 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -520,7 +520,7 @@ test_expect_success 'log --graph with merge' '
 '
 
 test_expect_success 'log.decorate configuration' '
-   git log --oneline >expect.none &&
+   git log --oneline --no-decorate >expect.none &&
git log --oneline --decorate >expect.short &&
git log --oneline --decorate=full >expect.full &&
 
-- 
2.12.0

[PATCH] clone,fetch: explain the shallow-clone option a little more clearly

[Alex Henrie]

"deepen by excluding" does not make sense because excluding a revision
does not deepen a repository; it makes the repository more shallow.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/clone.c | 2 +-
 builtin/fetch.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/clone.c b/builtin/clone.c
index 6c76a6e..e3cb808 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -99,7 +99,7 @@ static struct option builtin_clone_options[] = {
OPT_STRING(0, "shallow-since", _since, N_("time"),
N_("create a shallow clone since a specific time")),
OPT_STRING_LIST(0, "shallow-exclude", _not, N_("revision"),
-   N_("deepen history of shallow clone by excluding rev")),
+   N_("deepen history of shallow clone, excluding rev")),
OPT_BOOL(0, "single-branch", _single_branch,
N_("clone only one branch, HEAD or --branch")),
OPT_BOOL(0, "shallow-submodules", _shallow_submodules,
diff --git a/builtin/fetch.c b/builtin/fetch.c
index b6a5597..fc74c84 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -122,7 +122,7 @@ static struct option builtin_fetch_options[] = {
OPT_STRING(0, "shallow-since", _since, N_("time"),
   N_("deepen history of shallow repository based on time")),
OPT_STRING_LIST(0, "shallow-exclude", _not, N_("revision"),
-   N_("deepen history of shallow clone by excluding rev")),
+   N_("deepen history of shallow clone, excluding rev")),
OPT_INTEGER(0, "deepen", _relative,
N_("deepen history of shallow clone")),
{ OPTION_SET_INT, 0, "unshallow", , NULL,
-- 
2.10.2

[PATCH] receive-pack: improve English grammar of denyCurrentBranch message

[Alex Henrie]

The article "the" is required here.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/receive-pack.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index e6b3879..6b97cbd 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -795,8 +795,8 @@ static char *refuse_unconfigured_deny_msg =
   "with what you pushed, and will require 'git reset --hard' to 
match\n"
   "the work tree to HEAD.\n"
   "\n"
-  "You can set 'receive.denyCurrentBranch' configuration variable to\n"
-  "'ignore' or 'warn' in the remote repository to allow pushing into\n"
+  "You can set the 'receive.denyCurrentBranch' configuration 
variable\n"
+  "to 'ignore' or 'warn' in the remote repository to allow pushing 
into\n"
   "its current branch; however, this is not recommended unless you\n"
   "arranged to update its work tree to match what you pushed in some\n"
   "other way.\n"
-- 
2.10.2

[PATCH] bisect: improve English grammar of not-ancestors message

[Alex Henrie]

Multiple revisions cannot be a single ancestor.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 bisect.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bisect.c b/bisect.c
index 21bc6da..8e63c40 100644
--- a/bisect.c
+++ b/bisect.c
@@ -747,7 +747,7 @@ static void handle_bad_merge_base(void)
exit(3);
}
 
-   fprintf(stderr, _("Some %s revs are not ancestor of the %s rev.\n"
+   fprintf(stderr, _("Some %s revs are not ancestors of the %s rev.\n"
"git bisect cannot work properly in this case.\n"
"Maybe you mistook %s and %s revs?\n"),
term_good, term_bad, term_good, term_bad);
-- 
2.10.2

[PATCH 3/5] git-rebase--interactive: fix English grammar

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 git-rebase--interactive.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 7e558b0..6fd6d4e 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -1082,7 +1082,7 @@ If they are meant to go into a new commit, run:
 
   git commit \$gpg_sign_opt_quoted
 
-In both case, once you're done, continue with:
+In both cases, once you're done, continue with:
 
   git rebase --continue
 ")"
-- 
2.9.3

[PATCH 5/5] unpack-trees: do not capitalize "working"

[Alex Henrie]

In English, only proper nouns are capitalized.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 unpack-trees.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index 11c37fb..c87a90a 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -123,9 +123,9 @@ void setup_unpack_trees_porcelain(struct 
unpack_trees_options *opts,
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
_("Cannot update sparse checkout: the following entries are not 
up-to-date:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
-   _("The following Working tree files would be overwritten by 
sparse checkout update:\n%s");
+   _("The following working tree files would be overwritten by 
sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
-   _("The following Working tree files would be removed by sparse 
checkout update:\n%s");
+   _("The following working tree files would be removed by sparse 
checkout update:\n%s");
 
opts->show_all_errors = 1;
/* rejected paths may not have a static buffer */
-- 
2.9.3

[PATCH 4/5] git-merge-octopus: do not capitalize "octopus"

[Alex Henrie]

In English, only proper nouns are capitalized.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 git-merge-octopus.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 308eafd..bcf0d92 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -30,7 +30,7 @@ do
esac
 done
 
-# Reject if this is not an Octopus -- resolve should be used instead.
+# Reject if this is not an octopus -- resolve should be used instead.
 case "$remotes" in
 ?*' '?*)
;;
@@ -59,7 +59,7 @@ do
# conflicts.  Last round failed and we still had
# a head to merge.
gettextln "Automated merge did not work."
-   gettextln "Should not be doing an Octopus."
+   gettextln "Should not be doing an octopus."
exit 2
esac
 
-- 
2.9.3

[PATCH 2/5] cat-file: put spaces around pipes in usage string

[Alex Henrie]

This makes the style a little more consistent with other usage strings,
and will resolve a warning at
https://www.softcatala.org/recursos/quality/git.html

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/cat-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 2dfe626..560f6c2 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -440,7 +440,7 @@ static int batch_objects(struct batch_options *opt)
 }
 
 static const char * const cat_file_usage[] = {
-   N_("git cat-file (-t [--allow-unknown-type]|-s 
[--allow-unknown-type]|-e|-p||--textconv) "),
+   N_("git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] 
| -e | -p |  | --textconv) "),
N_("git cat-file (--batch | --batch-check) [--follow-symlinks]"),
NULL
 };
-- 
2.9.3

[PATCH 1/5] am: put spaces around pipe in usage string

[Alex Henrie]

This makes the style a little more consistent with other usage strings,
and will resolve a warning at
https://www.softcatala.org/recursos/quality/git.html

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/am.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/am.c b/builtin/am.c
index 739b34d..9e2ae5c 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -,7 +,7 @@ int cmd_am(int argc, const char **argv, const char 
*prefix)
int in_progress;
 
const char * const usage[] = {
-   N_("git am [] [(|)...]"),
+   N_("git am [] [( | )...]"),
N_("git am [] (--continue | --skip | --abort)"),
NULL
};
-- 
2.9.3

Re: [L10N] Kickoff of translation for Git 2.10.0 round 1

[Alex Henrie]

2016-08-20 10:01 GMT-06:00 Jean-Noël AVILA :
> 2.  in sequencer.c, there is a mistake in the original string to translate
> "Cannot revert during a another revert"

There's also "In both case" in git-rebase--interactive.sh.

-Alex
--
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 v2] unpack-trees: fix English grammar in do-this-before-that messages

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 t/t1011-read-tree-sparse-checkout.sh |  2 +-
 t/t7607-merge-overwrite.sh   |  2 +-
 t/t7609-merge-co-error-msgs.sh   | 10 +-
 unpack-trees.c   | 18 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/t/t1011-read-tree-sparse-checkout.sh 
b/t/t1011-read-tree-sparse-checkout.sh
index 0c74bee..1d8d751 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -244,7 +244,7 @@ test_expect_success 'print errors when failed to update 
worktree' '
 error: The following untracked working tree files would be overwritten by 
checkout:
sub/added
sub/addedtoo
-Please move or remove them before you can switch branches.
+Please move or remove them before you switch branches.
 Aborting
 EOF
test_cmp expected actual
diff --git a/t/t7607-merge-overwrite.sh b/t/t7607-merge-overwrite.sh
index 758a623..1c59349 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t7607-merge-overwrite.sh
@@ -115,7 +115,7 @@ cat >expect <<\EOF
 error: The following untracked working tree files would be overwritten by 
merge:
sub
sub2
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t7609-merge-co-error-msgs.sh
index 6729cb3..f80bdb8 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t7609-merge-co-error-msgs.sh
@@ -31,7 +31,7 @@ error: The following untracked working tree files would be 
overwritten by merge:
four
three
two
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
@@ -53,10 +53,10 @@ error: Your local changes to the following files would be 
overwritten by merge:
four
three
two
-Please commit your changes or stash them before you can merge.
+Please commit your changes or stash them before you merge.
 error: The following untracked working tree files would be overwritten by 
merge:
five
-Please move or remove them before you can merge.
+Please move or remove them before you merge.
 Aborting
 EOF
 
@@ -72,7 +72,7 @@ cat >expect <<\EOF
 error: Your local changes to the following files would be overwritten by 
checkout:
rep/one
rep/two
-Please commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you switch branches.
 Aborting
 EOF
 
@@ -94,7 +94,7 @@ cat >expect <<\EOF
 error: Your local changes to the following files would be overwritten by 
checkout:
rep/one
rep/two
-Please commit your changes or stash them before you can switch branches.
+Please commit your changes or stash them before you switch branches.
 Aborting
 EOF
 
diff --git a/unpack-trees.c b/unpack-trees.c
index 6bc9512..11c37fb 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct 
unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by checkout:\n%%s"
- "Please commit your changes or stash them before you 
can switch branches.")
+ "Please commit your changes or stash them before you 
switch branches.")
  : _("Your local changes to the following files would be 
overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by merge:\n%%s"
- "Please commit your changes or stash them before you 
can merge.")
+ "Please commit your changes or stash them before you 
merge.")
  : _("Your local changes to the following files would be 
overwritten by merge:\n%%s");
else
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by %s:\n%%s"
- "Please commit your changes or stash them before you 
can %s.")
+ "Please commit your changes or stash them before you 
%s.")
  : _("Your local changes to the following files would be 
overwritten by %s:\n%%s");
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct 
unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
 

[PATCH] unpack-trees: fix English grammar in do-this-before-that messages

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 unpack-trees.c | 18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index 6bc9512..11c37fb 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -62,17 +62,17 @@ void setup_unpack_trees_porcelain(struct 
unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by checkout:\n%%s"
- "Please commit your changes or stash them before you 
can switch branches.")
+ "Please commit your changes or stash them before you 
switch branches.")
  : _("Your local changes to the following files would be 
overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by merge:\n%%s"
- "Please commit your changes or stash them before you 
can merge.")
+ "Please commit your changes or stash them before you 
merge.")
  : _("Your local changes to the following files would be 
overwritten by merge:\n%%s");
else
msg = advice_commit_before_merge
  ? _("Your local changes to the following files would be 
overwritten by %s:\n%%s"
- "Please commit your changes or stash them before you 
can %s.")
+ "Please commit your changes or stash them before you 
%s.")
  : _("Your local changes to the following files would be 
overwritten by %s:\n%%s");
msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
xstrfmt(msg, cmd, cmd);
@@ -83,34 +83,34 @@ void setup_unpack_trees_porcelain(struct 
unpack_trees_options *opts,
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
removed by checkout:\n%%s"
- "Please move or remove them before you can switch 
branches.")
+ "Please move or remove them before you switch 
branches.")
  : _("The following untracked working tree files would be 
removed by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
removed by merge:\n%%s"
- "Please move or remove them before you can merge.")
+ "Please move or remove them before you merge.")
  : _("The following untracked working tree files would be 
removed by merge:\n%%s");
else
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
removed by %s:\n%%s"
- "Please move or remove them before you can %s.")
+ "Please move or remove them before you %s.")
  : _("The following untracked working tree files would be 
removed by %s:\n%%s");
msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] = xstrfmt(msg, cmd, cmd);
 
if (!strcmp(cmd, "checkout"))
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
overwritten by checkout:\n%%s"
- "Please move or remove them before you can switch 
branches.")
+ "Please move or remove them before you switch 
branches.")
  : _("The following untracked working tree files would be 
overwritten by checkout:\n%%s");
else if (!strcmp(cmd, "merge"))
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
overwritten by merge:\n%%s"
- "Please move or remove them before you can merge.")
+ "Please move or remove them before you merge.")
  : _("The following untracked working tree files would be 
overwritten by merge:\n%%s");
else
msg = advice_commit_before_merge
  ? _("The following untracked working tree files would be 
overwritten by %s:\n%%s"
- "Please move or remove them before you can

Re: [PATCH] stripspace: Call U+0020 a "space" instead of a "blank"

[Alex Henrie]

2016-02-09 16:00 GMT-07:00 Junio C Hamano <gits...@pobox.com>:
> Stefan Beller <sbel...@google.com> writes:
>
>> On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano <gits...@pobox.com> wrote:
>>> Alex Henrie <alexhenri...@gmail.com> writes:
>>>
>>>> I couldn't find any other examples of people referring to this character
>>>> as a "blank".
>>>>
>>>> Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
>>>> ---
>>>
>>> Any comments on this from anybody other than the author that I
>>> missed to support this change?
>>
>> I remember "blank" being used in my early days of computing.
>>
>> The blank was somehow more accurate as it described the exact
>> thing (i.e. char U+0020 as commonly produced via the space bar
>> on the key board)
>>
>> A space however could refer to any kind of indentation.
>>  * tabs would qualify for that
>>  * other tricks of your (wordprocessor-) editor would qualify for that
>>(indent by 2 inches in footer section or other weeirdness)
>>  * any other character not using any ink in a printer[1]
>>
>> [1] https://www.cs.tut.fi/~jkorpela/chars/spaces.html
>>
>> Looking at that table in there, U+0020 is officially called "space",
>> so I guess the patch is technically correct.
>
> So the "blank" is correct because we just want a gap between the
> comment char and the text, and use of " " is merely an
> implementation detail.  The "space" is correct because that happens
> to be the byte used as the implementation detail of leaving that gap
> between the comment char and the text.
>
> ;-)

"blank" does not sound like good English to me, but there are a lot of
dialects of English, so I can understand if it sounds natural to
someone else.

-Alex
--
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] blame: display a more helpful error message if the file was deleted

[Alex Henrie]

Sorry, wrong patch...this issue has already been fixed

-Alex
--
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] blame: display a more helpful error message if the file was deleted

[Alex Henrie]

`git blame 22414770 generate-cmdlist.perl` currently results in:
fatal: cannot stat path '22414770': No such file or directory

This patch changes the error message to:
fatal: ambiguous argument 'generate-cmdlist.perl': unknown revision
or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git  [...] -- [...]'"

That way, the user knows to rewrite the command as
`git blame 22414770 -- generate-cmdlist.perl`.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/blame.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builtin/blame.c b/builtin/blame.c
index 55bf5fa..9461a73 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2704,8 +2704,6 @@ parse_done:
argv[argc - 1] = "--";
 
setup_work_tree();
-   if (!file_exists(path))
-   die_errno("cannot stat path '%s'", path);
}
 
revs.disable_stdin = 1;
-- 
2.7.0

--
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] stripspace: Call U+0020 a "space" instead of a "blank"

[Alex Henrie]

I couldn't find any other examples of people referring to this character
as a "blank".

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/stripspace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/stripspace.c b/builtin/stripspace.c
index 7ff8434..15e716e 100644
--- a/builtin/stripspace.c
+++ b/builtin/stripspace.c
@@ -35,7 +35,7 @@ int cmd_stripspace(int argc, const char **argv, const char 
*prefix)
N_("skip and remove all lines starting with comment 
character"),
STRIP_COMMENTS),
OPT_CMDMODE('c', "comment-lines", ,
-   N_("prepend comment character and blank to each 
line"),
+   N_("prepend comment character and space to each 
line"),
COMMENT_LINES),
OPT_END()
};
-- 
2.7.0

--
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] blame: display a more helpful error message if the file was deleted

[Alex Henrie]

`git blame 22414770 generate-cmdlist.perl` currently results in:
fatal: cannot stat path '22414770': No such file or directory

This patch changes the error message to:
fatal: ambiguous argument 'generate-cmdlist.perl': unknown revision
or path not in the working tree.
Use '--' to separate paths from revisions, like this:
'git  [...] -- [...]'"

That way, the user knows to rewrite the command as
`git blame 22414770 -- generate-cmdlist.perl`.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/blame.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/builtin/blame.c b/builtin/blame.c
index 1df13cf..f070272 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2683,8 +2683,6 @@ parse_done:
argv[argc - 1] = "--";
 
setup_work_tree();
-   if (!file_exists(path))
-   die_errno("cannot stat path '%s'", path);
}
 
revs.disable_stdin = 1;
-- 
2.6.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] pull: add angle brackets to usage string

[Alex Henrie]

2015-10-19 23:17 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>
>> 2015-10-16 11:42 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
>>>
>>> Yes, but that fixes historical "mistake", no?
>>>
>>> With this, you are breaking historical practice by changing only one
>>> instance to deviate from the then-current practice of saying
>>> 'options' without brackets.  It is based on the point of view that
>>> considers anything inside  and a fixed string 'options' are
>>> meant to be replaced by intelligent readers, which is as valid as
>>> the more recent practice to consider only things inside 
>>> are placeholders.
>>
>> OK, I see. You're saying that it's OK to fix typos and grammatical
>> errors in contrib/examples, but it's not okay to modernize the
>> scripts' designs.
>
> Please read it again, look at contrib/examples and realize that that
> is not what I said at all.
>
> This is not about modern vs old-school.  The reason why the part of
> the patch to contrib/ under discussion is wrong is because of
> (in)consistency.
>
> Look at the output from "git grep option contrib/examples/" and
> notice that in the old days, these scripted Porcelains consistently
> said "[options]" without "".
>
> It would have been a different matter if the patch _were_ to update
> all "[options]" to "[]" in contrib/examples/ consistently,
> and such a patch might have even been an improvement, especially if
> the modern style were clearly superiour than the old-school style
> (which is not, by they way [*1*]).
>
> But that is not what the patch did.  It turned only one of them into
> "[]", making the single instance inconsistent from all the
> others around it.  That is why it was wrong.

I understand now, thanks. I really appreciate your commitment to being
consistent.

> [Footnote]
>
> *1* The "modern" style is not necessarily an improvement, by the
> way.  The way we specify that a "thing" in the help text is a
> placeholder and that there may be more instances of the same
> "thing" is to say "[...]", but in your "modernized" form,
> unlike all the other usual "things", possibly multiple options
> are spelled "[]" without having ellipses at the end,
> which is an oddball.  If we are to treat options specially like
> that anyway, intelligent readers can read an "old-school"
> description "[options]" and understand that that token stands
> for possibly multiple options just fine, and all we have gained
> by going to the "modernized" form is to waste two characters for
> .
>
> I am not saying that we should not apply the other half of the
> patch that makes builtin/pull.c say "[]".  These days,
> many other commands nearby (i.e. the "modern" ones) do use that
> form consistently, so it is an improvement.

I pushed to change [options] to [] because even if the angle
brackets don't help new users or translators in this particular case,
the angle brackets encourage Git authors to use angle brackets when
writing commands that are not so easy to understand. If you think that
[...] is better because it is even more consistent, I would be
happy to send a patch to make that change.

Anyway, thanks again for your attention to detail.

-Alex
--
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] pull: add angle brackets to usage string

[Alex Henrie]

2015-10-16 11:42 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>
>> 2015-10-16 10:36 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
>>> Makes sense, as all the other  in the usage string are
>>> bracketted.
>>>
>>> Does it make sense to do this for contrib/examples, which is the
>>> historical record, though?
>>
>> I didn't know that contrib/examples was a historical record. The last
>> patch I submitted, b7447679e84ed973430ab19fce87f56857b83068, also
>> modified contrib/examples.
>
> Yes, but that fixes historical "mistake", no?
>
> With this, you are breaking historical practice by changing only one
> instance to deviate from the then-current practice of saying
> 'options' without brackets.  It is based on the point of view that
> considers anything inside  and a fixed string 'options' are
> meant to be replaced by intelligent readers, which is as valid as
> the more recent practice to consider only things inside 
> are placeholders.

OK, I see. You're saying that it's OK to fix typos and grammatical
errors in contrib/examples, but it's not okay to modernize the
scripts' designs. That's fine; standardizing placeholder syntax is
primarily for the benefit of translators, and contrib/ is not
translated, so it's not causing a problem.

-Alex
--
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] pull: add angle brackets to usage string

[Alex Henrie]

2015-10-16 10:36 GMT-06:00 Junio C Hamano :
> Makes sense, as all the other  in the usage string are
> bracketted.
>
> Does it make sense to do this for contrib/examples, which is the
> historical record, though?

I didn't know that contrib/examples was a historical record. The last
patch I submitted, b7447679e84ed973430ab19fce87f56857b83068, also
modified contrib/examples.

-Alex
--
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] pull: add angle brackets to usage string

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 builtin/pull.c   | 2 +-
 contrib/examples/git-pull.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/pull.c b/builtin/pull.c
index a39bb0a..bf3fd3f 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -66,7 +66,7 @@ static int parse_opt_rebase(const struct option *opt, const 
char *arg, int unset
 }
 
 static const char * const pull_usage[] = {
-   N_("git pull [options] [ [...]]"),
+   N_("git pull [] [ [...]]"),
NULL
 };
 
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index 6b3a03f..bcf362e 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -8,7 +8,7 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_KEEPDASHDASH=
 OPTIONS_STUCKLONG=Yes
 OPTIONS_SPEC="\
-git pull [options] [ [...]]
+git pull [] [ [...]]
 
 Fetch one or more remote refs and integrate it/them with the current HEAD.
 --
-- 
2.6.1

--
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] gitk: l10n: Update Catalan translation

[Alex Henrie]

I figured out how to reproduce the problem: Running gitk with any
parameter causes it to crash. For example:

$ gitk e334ca2b9d9a48a1636f73fc12606b6eaa58b7d9
Error in startup script: bad menu entry index "Edita la vista..."
while executing
".bar.view entryconf [mca "Edit view..."] -state normal"
invoked from within
"if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
# create a view for the files/dirs specified on the command line
se..."
(file "/usr/bin/gitk" line 12442)

Running gitk without parameters is still OK. My guess is that it is
the same bug that

describes.

-Alex
--
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] gitk: l10n: Update Catalan translation

[Alex Henrie]

2015-10-05 23:38 GMT-06:00 Junio C Hamano <gits...@pobox.com>:
> Alex Henrie <alexhenri...@gmail.com> writes:
>
>> The gitk included in git 2.6.0 crashes if run from a Catalan locale.
>> I'm hoping that a translation update will fix this.
>
> I seriously hope that l10n files would not "crash" applications.
>
> I wonder if you are hitting $gmane/278863 perhaps?

I really don't know. Gmane bug 278863, "In Low Screen Heights (768 px)
Konsole always opens as full-height (even after resized)", appears to
be unrelated. But the crashing stopped today, either from rebooting or
from a package upgrade, so I guess it's not a real bug.

At any rate, the translation update is still worth committing.

-Alex
--
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] gitk: l10n: Update Catalan translation

[Alex Henrie]

The gitk included in git 2.6.0 crashes if run from a Catalan locale.
I'm hoping that a translation update will fix this.

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 po/ca.po | 53 +
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index 976037a..1106a30 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: gitk\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-05-17 14:32+1000\n"
-"PO-Revision-Date: 2015-02-01 22:49-0700\n"
+"PO-Revision-Date: 2015-10-05 22:23-0600\n"
 "Last-Translator: Alex Henrie <alexhenri...@gmail.com>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.7.3\n"
+"X-Generator: Poedit 1.8.5\n"
 
 #: gitk:140
 msgid "Couldn't get list of unmerged files:"
@@ -136,7 +136,7 @@ msgstr "Edita la vista..."
 
 #: gitk:2086
 msgid "Delete view"
-msgstr "Suprimeix vista"
+msgstr "Suprimeix la vista"
 
 #: gitk:2088 gitk:4043
 msgid "All files"
@@ -330,7 +330,7 @@ msgstr "Elimina aquesta branca"
 
 #: gitk:2649
 msgid "Copy branch name"
-msgstr ""
+msgstr "Copia el nom de branca"
 
 #: gitk:2656
 msgid "Highlight this too"
@@ -350,7 +350,7 @@ msgstr "Culpabilitat de la comissió mare"
 
 #: gitk:2660
 msgid "Copy path"
-msgstr ""
+msgstr "Copia el camí"
 
 #: gitk:2667
 msgid "Show origin of this line"
@@ -408,11 +408,11 @@ msgstr "\t\tVés a l'última comissió"
 
 #: gitk:3052
 msgid ", p, k\tMove up one commit"
-msgstr ", p, k\tMou-te una comissió amunt"
+msgstr ", p, k\tMou-te cap amunt per una comissió"
 
 #: gitk:3053
 msgid ", n, j\tMove down one commit"
-msgstr ", n, j\tMou-te una comissió avall"
+msgstr ", n, j\tMou-te cap avall per una comissió"
 
 #: gitk:3054
 msgid ", z, h\tGo back in history list"
@@ -430,11 +430,11 @@ msgstr ""
 
 #: gitk:3057
 msgid "\tMove up one page in commit list"
-msgstr "<RePàg>\tBaixa una pàgina en la llista de comissions"
+msgstr "<RePàg>\tMou-te cap amunt per una pàgina en la llista de comissions"
 
 #: gitk:3058
 msgid "\tMove down one page in commit list"
-msgstr "<AvPàg>\tBaixa per una pàgina en la llista de comissions"
+msgstr "<AvPàg>\tMou-te cap avall per una pàgina en la llista de comissions"
 
 #: gitk:3059
 #, tcl-format
@@ -449,50 +449,50 @@ msgstr "<%s-Fi>\tDesplaça't a la part inferior de la 
llista de comissions"
 #: gitk:3061
 #, tcl-format
 msgid "<%s-Up>\tScroll commit list up one line"
-msgstr "<%s-Amunt>\tDesplaça la llista de comissions una línia cap amunt"
+msgstr "<%s-Amunt>\tDesplaça la llista de comissions cap amunt per una línia"
 
 #: gitk:3062
 #, tcl-format
 msgid "<%s-Down>\tScroll commit list down one line"
-msgstr "<%s-Avall>\tDesplaça la llista de comissions una línia cap avall"
+msgstr "<%s-Avall>\tDesplaça la llista de comissions cap avall per una línia"
 
 #: gitk:3063
 #, tcl-format
 msgid "<%s-PageUp>\tScroll commit list up one page"
-msgstr "<%s-RePàg>\tDesplaça la llista de comissions amunt per una pàgina"
+msgstr "<%s-RePàg>\tDesplaça la llista de comissions cap amunt per una pàgina"
 
 #: gitk:3064
 #, tcl-format
 msgid "<%s-PageDown>\tScroll commit list down one page"
-msgstr "<%s-AvPàg>\tDesplaça la llista de comissions una pàgina cap avall"
+msgstr "<%s-AvPàg>\tDesplaça la llista de comissions cap avall per una pàgina"
 
 #: gitk:3065
 msgid "\tFind backwards (upwards, later commits)"
-msgstr "\tCerca cap enrere (amunt, les comissions més noves)"
+msgstr "\tCerca cap enrere (cap amunt, les comissions més noves)"
 
 #: gitk:3066
 msgid "\tFind forwards (downwards, earlier commits)"
-msgstr "\tCerca cap endavant (avall, les comissions més velles)"
+msgstr "\tCerca cap endavant (cap avall, les comissions més velles)"
 
 #: gitk:3067
 msgid ", b\tScroll diff view up one page"
-msgstr ", b\tDesplaça la vista de diferència una pàgina cap amunt"
+msgstr ", b\tDesplaça la vista de diferència cap amunt per una pàgina"
 
 #: gitk:3068
 msgid "\tScroll diff view up one page"
-msgstr "<Retrocés>\tDesplaça la vista 

[PATCH] merge: Fix English grammar in please-commit-before-merge message.

[Alex Henrie]

Signed-off-by: Alex Henrie <alexhenri...@gmail.com>
---
 advice.c | 2 +-
 contrib/examples/git-pull.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/advice.c b/advice.c
index 4965686..4dc5cf1 100644
--- a/advice.c
+++ b/advice.c
@@ -100,7 +100,7 @@ void NORETURN die_conclude_merge(void)
 {
error(_("You have not concluded your merge (MERGE_HEAD exists)."));
if (advice_resolve_conflict)
-   advise(_("Please, commit your changes before you can merge."));
+   advise(_("Please, commit your changes before merging."));
die(_("Exiting because of unfinished merge."));
 }
 
diff --git a/contrib/examples/git-pull.sh b/contrib/examples/git-pull.sh
index e8dc2e0..6b3a03f 100755
--- a/contrib/examples/git-pull.sh
+++ b/contrib/examples/git-pull.sh
@@ -69,7 +69,7 @@ as appropriate to mark resolution and make a commit.")"
 die_merge () {
 if [ $(git config --bool --get advice.resolveConflict || echo true) = 
"true" ]; then
die "$(gettext "You have not concluded your merge (MERGE_HEAD exists).
-Please, commit your changes before you can merge.")"
+Please, commit your changes before merging.")"
 else
die "$(gettext "You have not concluded your merge (MERGE_HEAD 
exists).")"
 fi
-- 
2.6.0

--
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] show-ref: place angle brackets around variables in usage string

[Alex Henrie]

2015-08-29 4:21 GMT-06:00 Philip Oakley philipoak...@iee.org:
 Should the '' stdin redirection be shown?

 It looks (at first glance) as if this gained a double ' ' at the beginning
 of 'ref-list', rather than being a clean indication of the redirection.
 Perhaps change 'ref-list' to 'ref-list-file' for a slight improvement in
 clarity - this it's only occurance, and the redirection would best match a
 file.

This syntax occurs in three other places in Git:

git cat-file (--batch | --batch-check) [--follow-symlinks]  list-of-objects

git check-attr --stdin [-z] [-a | --all | attr...]  list-of-paths

git hash-object  --stdin-paths  list-of-paths

So if we need to say ref-list-file for clarity, we should also say
object-list-file and path-list-file for these other commands.

I think the most sane thing to do is to commit this patch as-is, and
then someone can submit a separate patch to reword all four usage
strings for increased clarity.

-Alex
--
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] show-ref: place angle brackets around variables in usage string

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/show-ref.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index dfbc314..131ef28 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -8,7 +8,7 @@
 
 static const char * const show_ref_usage[] = {
N_(git show-ref [-q | --quiet] [--verify] [--head] [-d | 
--dereference] [-s | --hash[=n]] [--abbrev[=n]] [--tags] [--heads] [--] 
[pattern...]),
-   N_(git show-ref --exclude-existing[=pattern]  ref-list),
+   N_(git show-ref --exclude-existing[=pattern]  ref-list),
NULL
 };
 
-- 
2.5.0

--
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] show-ref: place angle brackets around variable in usage string

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/show-ref.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index dfbc314..d9c1633 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -8,7 +8,7 @@
 
 static const char * const show_ref_usage[] = {
N_(git show-ref [-q | --quiet] [--verify] [--head] [-d | 
--dereference] [-s | --hash[=n]] [--abbrev[=n]] [--tags] [--heads] [--] 
[pattern...]),
-   N_(git show-ref --exclude-existing[=pattern]  ref-list),
+   N_(git show-ref --exclude-existing[=pattern]  ref-list),
NULL
 };
 
-- 
2.5.0

--
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] git-submodule: remove extraneous space from error message

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 git-submodule.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index 36797c3..25b1ddf 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -904,7 +904,7 @@ Maybe you want to use 'update --init'?)
;;
!*)
command=${update_module#!}
-   die_msg=$(eval_gettext Execution of 
'\$command \$sha1' failed in submodule  path '\$prefix\$sm_path')
+   die_msg=$(eval_gettext Execution of 
'\$command \$sha1' failed in submodule path '\$prefix\$sm_path')
say_msg=$(eval_gettext Submodule path 
'\$prefix\$sm_path': '\$command \$sha1')
must_die_on_failure=yes
;;
-- 
2.5.0

--
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] pack-objects: place angle brackets around variables in usage strings

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/pack-objects.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 62cc16d..1c63f8f 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -25,8 +25,8 @@
 #include argv-array.h
 
 static const char *pack_usage[] = {
-   N_(git pack-objects --stdout [options...] [ ref-list |  
object-list]),
-   N_(git pack-objects [options...] base-name [ ref-list |  
object-list]),
+   N_(git pack-objects --stdout [options...] [ ref-list |  
object-list]),
+   N_(git pack-objects [options...] base-name [ ref-list |  
object-list]),
NULL
 };
 
-- 
2.5.0

--
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] reflog: add missing single quote to error message

[Alex Henrie]

The error message can be seen by running
`git config gc.reflogexpire foo` and then `git reflog expire`.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/reflog.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/reflog.c b/builtin/reflog.c
index 7ed0e85..f96ca2a 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -429,7 +429,7 @@ static int parse_expire_cfg_value(const char *var, const 
char *value, unsigned l
if (!value)
return config_error_nonbool(var);
if (parse_expiry_date(value, expire))
-   return error(_(%s' for '%s' is not a valid timestamp),
+   return error(_('%s' for '%s' is not a valid timestamp),
 value, var);
return 0;
 }
-- 
2.5.0

--
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 v2] gitk: Remove mc parameter from proc show_error

[Alex Henrie]

This is a better fix for 8d849957d81fc0480a52570d66cc3c2a688ecb1b.

All that was required to fix the original issue was to remove the extra
mc call, i.e. change [mc Sorry, gitk cannot run...] to simply
Sorry, gitk cannot run... Changing the signature of proc show_error
was unnecessary and introduced two new bugs: It made OK untranslatable
and mc translatable when the opposite should be true.

This new fix makes the string OK translatable and the string mc not
translatable, while leaving the string Sorry, gitk cannot run... not
translatable. It will take effect the next time `make update-po` is run.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 gitk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gitk b/gitk
index 30fcd30..096389f 100755
--- a/gitk
+++ b/gitk
@@ -1894,13 +1894,13 @@ proc make_transient {window origin} {
 }
 }
 
-proc show_error {w top msg {mc mc}} {
+proc show_error {w top msg} {
 global NS
 if {![info exists NS]} {set NS }
 if {[wm state $top] eq withdrawn} { wm deiconify $top }
 message $w.m -text $msg -justify center -aspect 400
 pack $w.m -side top -fill x -padx 20 -pady 20
-${NS}::button $w.ok -default active -text [$mc OK] -command destroy $top
+${NS}::button $w.ok -default active -text [mc OK] -command destroy $top
 pack $w.ok -side bottom -fill x
 bind $top Visibility grab $top; focus $top
 bind $top Key-Return destroy $top
@@ -12011,7 +12011,7 @@ proc get_path_encoding {path} {
 # First check that Tcl/Tk is recent enough
 if {[catch {package require Tk 8.4} err]} {
 show_error {} . Sorry, gitk cannot run with this version of Tcl/Tk.\n\
-Gitk requires at least Tcl/Tk 8.4. list
+Gitk requires at least Tcl/Tk 8.4.
 exit 1
 }
 
-- 
2.3.5

--
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: gitk drawing bug

[Alex Henrie]

2015-02-18 12:27 GMT-07:00 Martin d'Anjou martin.danjo...@gmail.com:
 It appears I have uncovered inconsistent behaviour in gitk. Looks like
 a bug. I have a picture here:
 https://docs.google.com/document/d/19TTzGD94B9EEIrVU5mRMjfJFvF5Ar3MlPblRJfP5OdQ/edit?usp=sharing

 Essentially, when I hit shift-F5, it sometimes draw the history
 differently (still valid, but drawn differently). There is no change
 in the repository between the shift-F5 keystrokes.

Did you ever contact the gitk maintainer, Paul Mackerras
pau...@samba.org, about this bug?

-Alex
--
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] standardize usage strings that were missed the first time

[Alex Henrie]

2015-04-02 15:56 GMT-06:00 Junio C Hamano gits...@pobox.com:
 Thanks, but please no more _(string) changes for the rest of the
 cycle, as that would impact i18n folks who will be starting from
 tagged -rc releases.

 Please hold them off, and resend them after 2.4.0 final.

I thought that during a code freeze, you held onto patches or
committed them to a staging branch. But it's OK, I will resend after
2.4 final is released. Thanks for the clarification.

-Alex
--
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] gitk: Remove mc parameter from proc show_error

[Alex Henrie]

This partially reverts commit 8d849957d81fc0480a52570d66cc3c2a688ecb1b.

This change makes the string OK translatable and the string mc not
translatable. It will take effect the next time `make update-po` is run.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 gitk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gitk b/gitk
index 30fcd30..7193f6f 100755
--- a/gitk
+++ b/gitk
@@ -1894,13 +1894,13 @@ proc make_transient {window origin} {
 }
 }
 
-proc show_error {w top msg {mc mc}} {
+proc show_error {w top msg} {
 global NS
 if {![info exists NS]} {set NS }
 if {[wm state $top] eq withdrawn} { wm deiconify $top }
 message $w.m -text $msg -justify center -aspect 400
 pack $w.m -side top -fill x -padx 20 -pady 20
-${NS}::button $w.ok -default active -text [$mc OK] -command destroy $top
+${NS}::button $w.ok -default active -text [mc OK] -command destroy $top
 pack $w.ok -side bottom -fill x
 bind $top Visibility grab $top; focus $top
 bind $top Key-Return destroy $top
-- 
2.3.5

--
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] gitk: Fix bad English grammar Matches none Commit Info

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index 9a2daf3..30fcd30 100755
--- a/gitk
+++ b/gitk
@@ -4066,7 +4066,7 @@ set known_view_options {
 {committer t15  .  --committer=*  {mc Committer:}}
 {loginfo   t15  .. --grep=*   {mc Commit Message:}}
 {allmatch  b.. --all-match{mc Matches all Commit Info 
criteria}}
-{igrep b.. --invert-grep  {mc Matches none Commit Info 
criteria}}
+{igrep b.. --invert-grep  {mc Matches no Commit Info criteria}}
 {changes_l l+  {}   {mc Changes to Files:}}
 {pickaxe_s r0   .  {}   {mc Fixed String}}
 {pickaxe_t r1   .  --pickaxe-regex  {mc Regular Expression}}
-- 
2.3.5

--
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] standardize usage strings that were missed the first time

[Alex Henrie]

This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/blame.c | 2 +-
 builtin/log.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/blame.c b/builtin/blame.c
index 06484c2..0b2f4ed 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,7 +27,7 @@
 #include line-range.h
 #include line-log.h
 
-static char blame_usage[] = N_(git blame [options] [rev-opts] [rev] 
[--] file);
+static char blame_usage[] = N_(git blame [options] [rev-opts] [rev] 
[--] file);
 
 static const char *blame_opt_usage[] = {
blame_usage,
diff --git a/builtin/log.c b/builtin/log.c
index dd8f3fc..4c4e6be 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -38,7 +38,7 @@ static const char *fmt_patch_subject_prefix = PATCH;
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
-   N_(git log [options] [revision range] [[--] path...]),
+   N_(git log [options] [revision-range] [[--] path...]),
N_(git show [options] object...),
NULL
 };
-- 
2.3.5

--
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] branch: fix funny-sounding error message

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/branch.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/branch.c b/builtin/branch.c
index 1d15037..c0b4bae 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -972,7 +972,7 @@ int cmd_branch(int argc, const char **argv, const char 
*prefix)
 
if (!branch) {
if (!argc || !strcmp(argv[0], HEAD))
-   die(_(could not set upstream of HEAD to %s 
when 
+   die(_(could not set upstream of HEAD to %s 
because 
  it does not point to any branch.),
new_upstream);
die(_(no such branch '%s'), argv[0]);
-- 
2.3.5

--
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] gitk: Remove tcl-format flag from a message that shouldn't have it

[Alex Henrie]

2015-02-23 15:30 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
 2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
 2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com:

 Alex Henrie alexhenri...@gmail.com writes:

  This is just a friendly reminder that this patch has been sitting in
  the mailing list archives for a couple of weeks, and it has not yet
  been accepted or commented on.

 I think that is because the message was not sent to the right
 people, and also because the patch was made against a wrong project
 ;-).

 I'll forward it to the gitk maintainer after digging it out of the
 archive and tweaking it.  Thanks.

 Paul, comments?

 Another week and still no comments on either this patch or the gitk
 Catalan translation patch. Is Paul Mackerras still actively involved
 in the project?

 -Alex

 Another week and still no response. If Paul is no longer maintaining
 gitk, another maintainer should be appointed.

 -Alex

I am unsubscribing from the Git mailing list. As far as I can tell,
the gitk project does not accept patches, not even translations into
new languages. If this policy ever changes, please email me directly.

-Alex
--
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] gitk: Remove tcl-format flag from a message that shouldn't have it

[Alex Henrie]

2015-02-16 16:27 GMT-07:00 Alex Henrie alexhenri...@gmail.com:
 2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com:

 Alex Henrie alexhenri...@gmail.com writes:

  This is just a friendly reminder that this patch has been sitting in
  the mailing list archives for a couple of weeks, and it has not yet
  been accepted or commented on.

 I think that is because the message was not sent to the right
 people, and also because the patch was made against a wrong project
 ;-).

 I'll forward it to the gitk maintainer after digging it out of the
 archive and tweaking it.  Thanks.

 Paul, comments?

 Another week and still no comments on either this patch or the gitk
 Catalan translation patch. Is Paul Mackerras still actively involved
 in the project?

 -Alex

Another week and still no response. If Paul is no longer maintaining
gitk, another maintainer should be appointed.

-Alex
--
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] gitk: Remove tcl-format flag from a message that shouldn't have it

[Alex Henrie]

2015-02-09 14:55 GMT-07:00 Junio C Hamano gits...@pobox.com:

 Alex Henrie alexhenri...@gmail.com writes:

  This is just a friendly reminder that this patch has been sitting in
  the mailing list archives for a couple of weeks, and it has not yet
  been accepted or commented on.

 I think that is because the message was not sent to the right
 people, and also because the patch was made against a wrong project
 ;-).

 I'll forward it to the gitk maintainer after digging it out of the
 archive and tweaking it.  Thanks.

 Paul, comments?

Another week and still no comments on either this patch or the gitk
Catalan translation patch. Is Paul Mackerras still actively involved
in the project?

-Alex
--
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] gitk: Remove tcl-format flag from a message that shouldn't have it

[Alex Henrie]

Hi,

This is just a friendly reminder that this patch has been sitting in
the mailing list archives for a couple of weeks, and it has not yet
been accepted or commented on.

-Alex
--
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 v2] l10n: gitk/ca.po: add Catalan translation

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
The only difference between version 1 and version 2 of this patch is
the correction of trailing whitespace in a single message. Please
let me know whether this patch is going to be included in Git 2.3.0.

 gitk-git/po/ca.po | 1349 +
 1 file changed, 1349 insertions(+)
 create mode 100644 gitk-git/po/ca.po

diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po
new file mode 100644
index 000..a20dd6d
--- /dev/null
+++ b/gitk-git/po/ca.po
@@ -0,0 +1,1349 @@
+# Translation of gitk
+# Copyright (C) 2005-2014 Paul Mackerras
+# This file is distributed under the same license as the gitk package.
+# Alex Henrie alexhenri...@gmail.com, 2015.
+#
+#
+msgid 
+msgstr 
+Project-Id-Version: gitk\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2015-01-22 00:45-0700\n
+PO-Revision-Date: 2015-02-01 22:49-0700\n
+Last-Translator: Alex Henrie alexhenri...@gmail.com\n
+Language-Team: Catalan\n
+Language: ca\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+X-Generator: Poedit 1.7.3\n
+
+#: gitk:140
+msgid Couldn't get list of unmerged files:
+msgstr No s'ha pogut obtenir la llista de fitxers no fusionats:
+
+#: gitk:212 gitk:2381
+msgid Color words
+msgstr Colora les paraules
+
+#: gitk:217 gitk:2381 gitk:8108 gitk:8141
+msgid Markup words
+msgstr Marca les paraules
+
+#: gitk:324
+msgid Error parsing revisions:
+msgstr Error en analitzar les revisions:
+
+#: gitk:380
+msgid Error executing --argscmd command:
+msgstr Error en executar l'ordre --argscmd:
+
+#: gitk:393
+msgid No files selected: --merge specified but no files are unmerged.
+msgstr 
+No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està 
+sense fusionar.
+
+#: gitk:396
+msgid 
+No files selected: --merge specified but no unmerged files are within file 
+limit.
+msgstr 
+No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer 
+sense fusionar està dins del límit de fitxers.
+
+#: gitk:418 gitk:566
+msgid Error executing git log:
+msgstr Error en executar git log:
+
+#: gitk:436 gitk:582
+msgid Reading
+msgstr Llegint
+
+#: gitk:496 gitk:4415
+msgid Reading commits...
+msgstr Llegint les revisions...
+
+#: gitk:499 gitk:1637 gitk:4418
+msgid No commits selected
+msgstr Cap comissió seleccionada
+
+#: gitk:1511
+msgid Can't parse git log output:
+msgstr No es pot analitzar la sortida del git log:
+
+#: gitk:1740
+msgid No commit information available
+msgstr Cap informació de comissió disponible
+
+#: gitk:1897
+msgid mc
+msgstr mc
+
+#: gitk:1932 gitk:4208 gitk:9557 gitk:11127 gitk:11406
+msgid OK
+msgstr D'acord
+
+#: gitk:1934 gitk:4210 gitk:9084 gitk:9163 gitk:9279 gitk:9328 gitk:9559
+#: gitk:11128 gitk:11407
+msgid Cancel
+msgstr Cancel·la
+
+#: gitk:2069
+msgid Update
+msgstr Actualitza
+
+#: gitk:2070
+msgid Reload
+msgstr Recarrega
+
+#: gitk:2071
+msgid Reread references
+msgstr Rellegeix les referències
+
+#: gitk:2072
+msgid List references
+msgstr Llista les referències
+
+#: gitk:2074
+msgid Start git gui
+msgstr Inicia el git gui
+
+#: gitk:2076
+msgid Quit
+msgstr Surt
+
+#: gitk:2068
+msgid File
+msgstr Fitxer
+
+#: gitk:2080
+msgid Preferences
+msgstr Preferències
+
+#: gitk:2079
+msgid Edit
+msgstr Edita
+
+#: gitk:2084
+msgid New view...
+msgstr Vista nova...
+
+#: gitk:2085
+msgid Edit view...
+msgstr Edita la vista...
+
+#: gitk:2086
+msgid Delete view
+msgstr Suprimeix vista
+
+#: gitk:2088
+msgid All files
+msgstr Tots els fitxers
+
+#: gitk:2083 gitk:3961
+msgid View
+msgstr Vista
+
+#: gitk:2093 gitk:2103 gitk:2920
+msgid About gitk
+msgstr Quant al gitk
+
+#: gitk:2094 gitk:2108
+msgid Key bindings
+msgstr Associacions de tecles
+
+#: gitk:2092 gitk:2107
+msgid Help
+msgstr Ajuda
+
+#: gitk:2185 gitk:8540
+msgid SHA1 ID:
+msgstr ID SHA1:
+
+#: gitk:2229
+msgid Row
+msgstr Fila
+
+#: gitk:2267
+msgid Find
+msgstr Cerca
+
+#: gitk:2295
+msgid commit
+msgstr comissió
+
+#: gitk:2299 gitk:2301 gitk:4576 gitk:4599 gitk:4623 gitk:6643 gitk:6715
+#: gitk:6800
+msgid containing:
+msgstr que contingui:
+
+#: gitk:2302 gitk:3433 gitk:3438 gitk:4652
+msgid touching paths:
+msgstr que toqui els camins:
+
+#: gitk:2303 gitk:4666
+msgid adding/removing string:
+msgstr que afegeixi/elimini la cadena:
+
+#: gitk:2304 gitk:4668
+msgid changing lines matching:
+msgstr que tingui línies canviades coincidents amb:
+
+#: gitk:2313 gitk:2315 gitk:4655
+msgid Exact
+msgstr Exacte
+
+#: gitk:2315 gitk:4743 gitk:6611
+msgid IgnCase
+msgstr Ignora majúscula i minúscula
+
+#: gitk:2315 gitk:4625 gitk:4741 gitk:6607
+msgid Regexp
+msgstr Regexp
+
+#: gitk:2317 gitk:2318 gitk:4763 gitk:4793 gitk:4800 gitk:6736 gitk:6804
+msgid All fields
+msgstr Tots els camps
+
+#: gitk:2318 gitk:4760 gitk:4793 gitk:6674
+msgid Headline
+msgstr Titular
+
+#: gitk:2319 gitk:4760 gitk:6674 gitk:6804 gitk:7277
+msgid Comments
+msgstr Comentaris

[PATCH] l10n: gitk/ca.po: add Catalan translation

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 gitk-git/po/ca.po | 1349 +
 1 file changed, 1349 insertions(+)
 create mode 100644 gitk-git/po/ca.po

diff --git a/gitk-git/po/ca.po b/gitk-git/po/ca.po
new file mode 100644
index 000..1ac23e9
--- /dev/null
+++ b/gitk-git/po/ca.po
@@ -0,0 +1,1349 @@
+# Translation of gitk
+# Copyright (C) 2005-2014 Paul Mackerras
+# This file is distributed under the same license as the gitk package.
+# Alex Henrie alexhenri...@gmail.com, 2015.
+#
+#
+msgid 
+msgstr 
+Project-Id-Version: gitk\n
+Report-Msgid-Bugs-To: \n
+POT-Creation-Date: 2015-01-22 00:45-0700\n
+PO-Revision-Date: 2015-01-27 00:24-0700\n
+Last-Translator: Alex Henrie alexhenri...@gmail.com\n
+Language-Team: Catalan\n
+Language: ca\n
+MIME-Version: 1.0\n
+Content-Type: text/plain; charset=UTF-8\n
+Content-Transfer-Encoding: 8bit\n
+Plural-Forms: nplurals=2; plural=(n != 1);\n
+X-Generator: Poedit 1.7.3\n
+
+#: gitk:140
+msgid Couldn't get list of unmerged files:
+msgstr No s'ha pogut obtenir la llista de fitxers no fusionats:
+
+#: gitk:212 gitk:2381
+msgid Color words
+msgstr Colora les paraules
+
+#: gitk:217 gitk:2381 gitk:8108 gitk:8141
+msgid Markup words
+msgstr Marca les paraules
+
+#: gitk:324
+msgid Error parsing revisions:
+msgstr Error en analitzar les revisions:
+
+#: gitk:380
+msgid Error executing --argscmd command:
+msgstr Error en executar l'ordre --argscmd:
+
+#: gitk:393
+msgid No files selected: --merge specified but no files are unmerged.
+msgstr 
+No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està 
+sense fusionar.
+
+#: gitk:396
+msgid 
+No files selected: --merge specified but no unmerged files are within file 
+limit.
+msgstr 
+No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer 
+sense fusionar està dins del límit de fitxers.
+
+#: gitk:418 gitk:566
+msgid Error executing git log:
+msgstr Error en executar git log:
+
+#: gitk:436 gitk:582
+msgid Reading
+msgstr Llegint
+
+#: gitk:496 gitk:4415
+msgid Reading commits...
+msgstr Llegint les revisions...
+
+#: gitk:499 gitk:1637 gitk:4418
+msgid No commits selected
+msgstr Cap comissió seleccionada
+
+#: gitk:1511
+msgid Can't parse git log output:
+msgstr No es pot analitzar la sortida del git log:
+
+#: gitk:1740
+msgid No commit information available
+msgstr Cap informació de comissió disponible
+
+#: gitk:1897
+msgid mc
+msgstr mc
+
+#: gitk:1932 gitk:4208 gitk:9557 gitk:11127 gitk:11406
+msgid OK
+msgstr D'acord
+
+#: gitk:1934 gitk:4210 gitk:9084 gitk:9163 gitk:9279 gitk:9328 gitk:9559
+#: gitk:11128 gitk:11407
+msgid Cancel
+msgstr Cancel·la
+
+#: gitk:2069
+msgid Update
+msgstr Actualitza
+
+#: gitk:2070
+msgid Reload
+msgstr Recarrega
+
+#: gitk:2071
+msgid Reread references
+msgstr Rellegeix les referències
+
+#: gitk:2072
+msgid List references
+msgstr Llista les referències
+
+#: gitk:2074
+msgid Start git gui
+msgstr Inicia el git gui
+
+#: gitk:2076
+msgid Quit
+msgstr Surt
+
+#: gitk:2068
+msgid File
+msgstr Fitxer
+
+#: gitk:2080
+msgid Preferences
+msgstr Preferències
+
+#: gitk:2079
+msgid Edit
+msgstr Edita
+
+#: gitk:2084
+msgid New view...
+msgstr Vista nova...
+
+#: gitk:2085
+msgid Edit view...
+msgstr Edita la vista...
+
+#: gitk:2086
+msgid Delete view
+msgstr Suprimeix vista
+
+#: gitk:2088
+msgid All files
+msgstr Tots els fitxers
+
+#: gitk:2083 gitk:3961
+msgid View
+msgstr Vista
+
+#: gitk:2093 gitk:2103 gitk:2920
+msgid About gitk
+msgstr Quant al gitk
+
+#: gitk:2094 gitk:2108
+msgid Key bindings
+msgstr Associacions de tecles
+
+#: gitk:2092 gitk:2107
+msgid Help
+msgstr Ajuda
+
+#: gitk:2185 gitk:8540
+msgid SHA1 ID:
+msgstr ID SHA1:
+
+#: gitk:2229
+msgid Row
+msgstr Fila
+
+#: gitk:2267
+msgid Find
+msgstr Cerca
+
+#: gitk:2295
+msgid commit
+msgstr comissió
+
+#: gitk:2299 gitk:2301 gitk:4576 gitk:4599 gitk:4623 gitk:6643 gitk:6715
+#: gitk:6800
+msgid containing:
+msgstr que contingui:
+
+#: gitk:2302 gitk:3433 gitk:3438 gitk:4652
+msgid touching paths:
+msgstr que toqui els camins:
+
+#: gitk:2303 gitk:4666
+msgid adding/removing string:
+msgstr que afegeixi/elimini la cadena:
+
+#: gitk:2304 gitk:4668
+msgid changing lines matching:
+msgstr que tingui línies canviades coincidents amb:
+
+#: gitk:2313 gitk:2315 gitk:4655
+msgid Exact
+msgstr Exacte
+
+#: gitk:2315 gitk:4743 gitk:6611
+msgid IgnCase
+msgstr Ignora majúscula i minúscula
+
+#: gitk:2315 gitk:4625 gitk:4741 gitk:6607
+msgid Regexp
+msgstr Regexp
+
+#: gitk:2317 gitk:2318 gitk:4763 gitk:4793 gitk:4800 gitk:6736 gitk:6804
+msgid All fields
+msgstr Tots els camps
+
+#: gitk:2318 gitk:4760 gitk:4793 gitk:6674
+msgid Headline
+msgstr Titular
+
+#: gitk:2319 gitk:4760 gitk:6674 gitk:6804 gitk:7277
+msgid Comments
+msgstr Comentaris
+
+#: gitk:2319 gitk:4760 gitk:4765 gitk:4800 gitk:6674 gitk:7212 gitk:8718
+#: gitk:8733
+msgid Author
+msgstr Autor
+
+#: gitk:2319 gitk:4760 gitk:6674 gitk:7214
+msgid Committer
+msgstr Comitent

[PATCH] gitk: Remove tcl-format flag from a message that shouldn't have it

[Alex Henrie]

xgettext sees % o and interprets it as a placeholder for an octal
number preceded by a space. However, in this case it's not actually a
placeholder, and most translations will replace the % o sequence with
something else. Removing the tcl-format flag from this string prevents
tools like Poedit from freaking out when % o doesn't appear in the
translated string.

The corrected flag will appear in each translation's po file the next time
the translation is updated with `make update-po`.

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 gitk-git/gitk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gitk-git/gitk b/gitk-git/gitk
index 78358a7..dfd458d 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11237,6 +11237,7 @@ proc prefspage_general {notebook} {
 ${NS}::label $page.maxwidthl -text [mc Maximum graph width (lines)]
 spinbox $page.maxwidth -from 0 -to 100 -width 4 -textvariable maxwidth
 grid $page.spacer $page.maxwidthl $page.maxwidth -sticky w
+ #xgettext:no-tcl-format
 ${NS}::label $page.maxpctl -text [mc Maximum graph width (% of pane)]
 spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
 grid x $page.maxpctl $page.maxpct -sticky w
-- 
2.2.2

--
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] Documentation/init-db.txt: minor style and synopsys fixes

[Alex Henrie]

2015-01-14 13:47 GMT-07:00 Eric Sunshine sunsh...@sunshineco.com:
 On Wed, Jan 14, 2015 at 12:33 PM, Alexander Kuleshov
 kuleshovm...@gmail.com wrote:
 -'git init-db' [-q | --quiet] [--bare] [--template=template_directory] 
 [--separate-git-dir git dir] [--shared[=permissions]]
 -
 +'git init-db' [-q | --quiet] [--bare] [--template=template_directory]
 + [--separate-git-dir git dir]
 + [--shared[=permissions]] [directory]

 I realize that you copied/pasted the text from git-init.txt, but this
 should really be [directory].

We're also transitioning to using hyphens to separate words in
template placeholders, so here you would have template-directory and
git-dir.

-Alex
--
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 v2] standardize usage info string format

[Alex Henrie]

2015-01-12 22:29 GMT-07:00 Scott Schmit i.g...@comcast.net:

 On Wed, Jan 07, 2015 at 11:28:21PM -0700, Alex Henrie wrote:
 
  diff --git a/builtin/diff-files.c b/builtin/diff-files.c
  index 9200069..1abeba6 100644
  --- a/builtin/diff-files.c
  +++ b/builtin/diff-files.c
  @@ -11,7 +11,7 @@
   #include submodule.h
 
   static const char diff_files_usage[] =
  -git diff-files [-q] [-0/-1/2/3 |-c|--cc] [common diff options] 
  [path...]
  +git diff-files [-q] [-0/-1/2/3 | -c | --cc] [common-diff-options] 
  [path...]
  ^
 This deserves cleanup too (the man page shows it as [-0|-1|-2|-3|-c|--cc]).

 ...which makes me think the man pages need to be modified to match.

Patch v2 cleans up this usage string, but I think the man pages'
inconsistencies should be addressed separately. The man pages don't
appear to be translated, so their inconsistencies are unlikely to
cause translators any headaches.

 Also, it looks like items 1  4 are already codified in
 CodingGuidelines, but items 2  3 are new.  If we care to make the
 changes in 2  3, we should document the new conventions there.

Patch v2 modifies the documentation to match. By the way,
CodingGuidelines was inconsistent before. It had this example without
spaces:

   [(rev|range)...]

And this example with spaces:

   git remote set-head name (-a | -d | branch)

 Bike-shedding, I'm sure: I find [-0|-1|-2|-3|-c|--cc] more
 readable/logical than [-0 | -1 | -2 | -3 | -c | --cc] (which I admit
 seems counter-intuitive), but I wouldn't be surprised if opinions on
 that are about as split as the existing usage lines are :-).

I counted 29 usage strings that used spaces in this case, and 16 that
did not. Since spaces seem to be the more prevalent choice, I'd like
to use them consistently.

Thanks for the feedback!

-Alex
--
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 v2] standardize usage info string format

[Alex Henrie]

This patch puts the usage info strings that were not already in docopt-
like format into docopt-like format, which will be a litle easier for
end users and a lot easier for translators. Changes include:

- Placing angle brackets around fill-in-the-blank parameters
- Putting dashes in multiword parameter names
- Adding spaces to [-f|--foobar] to make [-f | --foobar]
- Replacing foobar* with [foobar...]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 Documentation/CodingGuidelines |  8 ++--
 advice.c   |  2 +-
 archive.c  |  4 ++--
 builtin/add.c  |  2 +-
 builtin/apply.c|  2 +-
 builtin/blame.c|  4 ++--
 builtin/branch.c   |  8 
 builtin/cat-file.c |  4 ++--
 builtin/check-attr.c   |  4 ++--
 builtin/check-ignore.c |  4 ++--
 builtin/check-mailmap.c|  2 +-
 builtin/check-ref-format.c |  2 +-
 builtin/checkout-index.c   |  2 +-
 builtin/checkout.c |  8 
 builtin/clone.c|  2 +-
 builtin/column.c   |  2 +-
 builtin/commit.c   |  4 ++--
 builtin/config.c   |  2 +-
 builtin/describe.c |  4 ++--
 builtin/diff-files.c   |  2 +-
 builtin/diff-index.c   |  2 +-
 builtin/diff-tree.c|  2 +-
 builtin/fetch-pack.c   |  2 +-
 builtin/fmt-merge-msg.c|  2 +-
 builtin/for-each-ref.c |  2 +-
 builtin/fsck.c |  2 +-
 builtin/gc.c   |  2 +-
 builtin/grep.c |  2 +-
 builtin/hash-object.c  |  2 +-
 builtin/help.c |  2 +-
 builtin/init-db.c  |  2 +-
 builtin/log.c  |  6 +++---
 builtin/ls-files.c |  2 +-
 builtin/ls-remote.c|  2 +-
 builtin/mailinfo.c |  2 +-
 builtin/merge-base.c   |  4 ++--
 builtin/merge-file.c   |  4 ++--
 builtin/merge-index.c  |  2 +-
 builtin/merge.c|  4 ++--
 builtin/mv.c   |  2 +-
 builtin/name-rev.c |  6 +++---
 builtin/notes.c| 24 
 builtin/pack-redundant.c   |  2 +-
 builtin/pack-refs.c|  2 +-
 builtin/prune-packed.c |  2 +-
 builtin/remote.c   |  4 ++--
 builtin/repack.c   |  2 +-
 builtin/rerere.c   |  2 +-
 builtin/rev-parse.c|  6 +++---
 builtin/revert.c   |  4 ++--
 builtin/rm.c   |  2 +-
 builtin/shortlog.c |  2 +-
 builtin/show-branch.c  |  4 ++--
 builtin/show-ref.c |  2 +-
 builtin/symbolic-ref.c |  4 ++--
 builtin/tag.c  |  4 ++--
 builtin/update-index.c |  2 +-
 builtin/update-ref.c   |  6 +++---
 builtin/verify-commit.c|  2 +-
 builtin/verify-pack.c  |  2 +-
 builtin/verify-tag.c   |  2 +-
 credential-store.c |  2 +-
 git-bisect.sh  |  2 +-
 git.c  |  2 +-
 64 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index 894546d..ad3b2ad 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -441,6 +441,10 @@ Writing Documentation:
--sort=key
--abbrev[=n]
 
+ If a placeholder has multiple words, they are separated by dashes:
+   new-branch-name
+   --template=template-directory
+
  Possibility of multiple occurrences is indicated by three dots:
file...
(One or more of file.)
@@ -457,12 +461,12 @@ Writing Documentation:
(Zero or more of patch.  Note that the dots are inside, not
outside the brackets.)
 
- Multiple alternatives are indicated with vertical bar:
+ Multiple alternatives are indicated with vertical bars:
[-q | --quiet]
[--utf8 | --no-utf8]
 
  Parentheses are used for grouping:
-   [(rev|range)...]
+   [(rev | range)...]
(Any number of either rev or range.  Parens are needed to make
it clear that ... pertains to both rev and range.)
 
diff --git a/advice.c b/advice.c
index 3b8bf3c..575bec2 100644
--- a/advice.c
+++ b/advice.c
@@ -105,7 +105,7 @@ void detach_advice(const char *new_name)
state without impacting any branches by performing another 
checkout.\n\n
If you want to create a new branch to retain commits you create, you 
may\n
do so (now or later) by using -b with the checkout command again. 
Example:\n\n
- git checkout -b new_branch_name\n\n;
+ git checkout -b new-branch-name\n\n;
 
fprintf(stderr, fmt, new_name);
 }
diff --git a/archive.c b/archive.c
index 9e30246..96057ed 100644
--- a/archive.c
+++ b/archive.c
@@ -8,9 +8,9 @@
 #include dir.h
 
 static char const * const archive_usage[] = {
-   N_(git archive [options] tree-ish [path...]),
+   N_(git archive [options] tree-ish [path...]),
N_

[PATCH] standardize usage info string format

[Alex Henrie]

This patch puts the usage info strings that were not already in docopt-
like format into docopt-like format, which will be a litle easier for
end users and a lot easier for translators. Changes include:

- Placing angle brackets around fill-in-the-blank parameters
- Putting dashes in multiword parameter names
- Adding spaces to [-f|--foobar] to make [-f | --foobar]
- Replacing foobar* with [foobar...]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 advice.c   |  2 +-
 archive.c  |  4 ++--
 builtin/add.c  |  2 +-
 builtin/apply.c|  2 +-
 builtin/blame.c|  4 ++--
 builtin/branch.c   |  8 
 builtin/cat-file.c |  4 ++--
 builtin/check-attr.c   |  4 ++--
 builtin/check-ignore.c |  4 ++--
 builtin/check-mailmap.c|  2 +-
 builtin/check-ref-format.c |  2 +-
 builtin/checkout-index.c   |  2 +-
 builtin/checkout.c |  8 
 builtin/clone.c|  2 +-
 builtin/column.c   |  2 +-
 builtin/commit.c   |  4 ++--
 builtin/config.c   |  2 +-
 builtin/describe.c |  4 ++--
 builtin/diff-files.c   |  2 +-
 builtin/diff-index.c   |  2 +-
 builtin/diff-tree.c|  2 +-
 builtin/fetch-pack.c   |  2 +-
 builtin/fmt-merge-msg.c|  2 +-
 builtin/for-each-ref.c |  2 +-
 builtin/fsck.c |  2 +-
 builtin/gc.c   |  2 +-
 builtin/grep.c |  2 +-
 builtin/hash-object.c  |  2 +-
 builtin/help.c |  2 +-
 builtin/init-db.c  |  2 +-
 builtin/log.c  |  6 +++---
 builtin/ls-files.c |  2 +-
 builtin/ls-remote.c|  2 +-
 builtin/mailinfo.c |  2 +-
 builtin/merge-base.c   |  4 ++--
 builtin/merge-file.c   |  4 ++--
 builtin/merge-index.c  |  2 +-
 builtin/merge.c|  4 ++--
 builtin/mv.c   |  2 +-
 builtin/name-rev.c |  6 +++---
 builtin/notes.c| 24 
 builtin/pack-redundant.c   |  2 +-
 builtin/pack-refs.c|  2 +-
 builtin/prune-packed.c |  2 +-
 builtin/remote.c   |  4 ++--
 builtin/repack.c   |  2 +-
 builtin/rerere.c   |  2 +-
 builtin/rev-parse.c|  6 +++---
 builtin/revert.c   |  4 ++--
 builtin/rm.c   |  2 +-
 builtin/shortlog.c |  2 +-
 builtin/show-branch.c  |  4 ++--
 builtin/show-ref.c |  2 +-
 builtin/symbolic-ref.c |  4 ++--
 builtin/tag.c  |  4 ++--
 builtin/update-index.c |  2 +-
 builtin/update-ref.c   |  6 +++---
 builtin/verify-commit.c|  2 +-
 builtin/verify-pack.c  |  2 +-
 builtin/verify-tag.c   |  2 +-
 credential-store.c |  2 +-
 git-bisect.sh  |  2 +-
 git.c  |  2 +-
 63 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/advice.c b/advice.c
index 3b8bf3c..575bec2 100644
--- a/advice.c
+++ b/advice.c
@@ -105,7 +105,7 @@ void detach_advice(const char *new_name)
state without impacting any branches by performing another 
checkout.\n\n
If you want to create a new branch to retain commits you create, you 
may\n
do so (now or later) by using -b with the checkout command again. 
Example:\n\n
- git checkout -b new_branch_name\n\n;
+ git checkout -b new-branch-name\n\n;
 
fprintf(stderr, fmt, new_name);
 }
diff --git a/archive.c b/archive.c
index 9e30246..96057ed 100644
--- a/archive.c
+++ b/archive.c
@@ -8,9 +8,9 @@
 #include dir.h
 
 static char const * const archive_usage[] = {
-   N_(git archive [options] tree-ish [path...]),
+   N_(git archive [options] tree-ish [path...]),
N_(git archive --list),
-   N_(git archive --remote repo [--exec cmd] [options] tree-ish 
[path...]),
+   N_(git archive --remote repo [--exec cmd] [options] tree-ish 
[path...]),
N_(git archive --remote repo [--exec cmd] --list),
NULL
 };
diff --git a/builtin/add.c b/builtin/add.c
index 1074e32..3390933 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -19,7 +19,7 @@
 #include argv-array.h
 
 static const char * const builtin_add_usage[] = {
-   N_(git add [options] [--] pathspec...),
+   N_(git add [options] [--] pathspec...),
NULL
 };
 static int patch_interactive, add_interactive, edit_interactive;
diff --git a/builtin/apply.c b/builtin/apply.c
index 0aad912..7cd9a3b 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -55,7 +55,7 @@ static const char *fake_ancestor;
 static int line_termination = '\n';
 static unsigned int p_context = UINT_MAX;
 static const char * const apply_usage[] = {
-   N_(git apply [options] [patch...]),
+   N_(git apply [options] [patch...]),
NULL
 };
 
diff --git a/builtin/blame.c b/builtin/blame.c
index 303e217..f0fac65 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,12 +27,12 @@
 #include line-range.h
 #include line-log.h
 
-static char blame_usage[] = N_(git blame [options

Re: Fix wrong catalan translation

[Alex Henrie]

2014-12-19 3:38 GMT-07:00 Albert Astals Cid aa...@kde.org:
 Hi, i'm attaching a fix for the Catalan translation were it seems some
 Spanish sneaked in.

Hi Albert, thanks for your interest, and sorry for the error. I'm
currently working with Joan Perals on a batch of corrections to the
Catalan translation, including the one you mentioned:
https://github.com/alexhenrie/git-po/pull/1

Hopefully it will be done soon.

-Alex
--
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] builtin/remote.c: add missing space to user-facing message

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/remote.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/builtin/remote.c b/builtin/remote.c
index 7f28f92..c55c7ce 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -13,7 +13,7 @@ static const char * const builtin_remote_usage[] = {
N_(git remote add [-t branch] [-m master] [-f] [--tags|--no-tags] 
[--mirror=fetch|push] name url),
N_(git remote rename old new),
N_(git remote remove name),
-   N_(git remote set-head name (-a | --auto | -d | --delete 
|branch)),
+   N_(git remote set-head name (-a | --auto | -d | --delete | 
branch)),
N_(git remote [-v | --verbose] show [-n] name),
N_(git remote prune [-n | --dry-run] name),
N_(git remote [-v | --verbose] update [-p | --prune] [(group | 
remote)...]),
-- 
2.1.3
--
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] Improve English grammar

[Alex Henrie]

I see it's been accepted now. Thank you!

-Alex
--
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] Improve English grammar

[Alex Henrie]

Signed-off-by: Alex Henrie alexhenri...@gmail.com
---
 builtin/commit.c   | 2 +-
 builtin/ls-files.c | 2 +-
 builtin/merge.c| 4 ++--
 builtin/notes.c| 2 +-
 builtin/rm.c   | 2 +-
 git-bisect.sh  | 4 ++--
 git-stash.sh   | 2 +-
 git.c  | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/builtin/commit.c b/builtin/commit.c
index 5ed6036..59c91ea 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1778,7 +1778,7 @@ int cmd_commit(int argc, const char **argv, const char 
*prefix)
 
if (commit_index_files())
die (_(Repository has been updated, but unable to write\n
-new_index file. Check that disk is not full or quota is\n
+new_index file. Check that disk is not full and quota 
is\n
 not exceeded, and then \git reset HEAD\ to recover.));
 
rerere(0);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index 47c3880..99cee20 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -474,7 +474,7 @@ int cmd_ls_files(int argc, const char **argv, const char 
*cmd_prefix)
OPT_BOOL('k', killed, show_killed,
N_(show files on the filesystem that need to be 
removed)),
OPT_BIT(0, directory, dir.flags,
-   N_(show 'other' directories' name only),
+   N_(show 'other' directories' names only),
DIR_SHOW_OTHER_DIRECTORIES),
OPT_NEGBIT(0, empty-directory, dir.flags,
N_(don't show empty directories),
diff --git a/builtin/merge.c b/builtin/merge.c
index ce82eb2..db47200 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1144,14 +1144,14 @@ int cmd_merge(int argc, const char **argv, const char 
*prefix)
 */
if (advice_resolve_conflict)
die(_(You have not concluded your merge (MERGE_HEAD 
exists).\n
- Please, commit your changes before you can 
merge.));
+ Please, commit your changes before you 
merge.));
else
die(_(You have not concluded your merge (MERGE_HEAD 
exists).));
}
if (file_exists(git_path(CHERRY_PICK_HEAD))) {
if (advice_resolve_conflict)
die(_(You have not concluded your cherry-pick 
(CHERRY_PICK_HEAD exists).\n
-   Please, commit your changes before you can 
merge.));
+   Please, commit your changes before you merge.));
else
die(_(You have not concluded your cherry-pick 
(CHERRY_PICK_HEAD exists).));
}
diff --git a/builtin/notes.c b/builtin/notes.c
index 820c341..0606964 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -211,7 +211,7 @@ static void create_note(const unsigned char *object, struct 
msg_arg *msg,
if (write_sha1_file(msg-buf.buf, msg-buf.len, blob_type, 
result)) {
error(_(unable to write note object));
if (path)
-   error(_(The note contents has been left in 
%s),
+   error(_(The note contents have been left in 
%s),
  path);
exit(128);
}
diff --git a/builtin/rm.c b/builtin/rm.c
index bc6490b..2b61d3b 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -65,7 +65,7 @@ static void error_removing_concrete_submodules(struct 
string_list *files, int *e
  Q_(the following submodule (or one of its nested 
 submodules)\n
 uses a .git directory:,
-the following submodules (or one of its nested 
+the following submodules (or one of their nested 
 submodules)\n
 use a .git directory:, files-nr),
  _(\n(use 'rm -rf' if you really want to remove 
diff --git a/git-bisect.sh b/git-bisect.sh
index 1e0d602..6cda2b5 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -286,11 +286,11 @@ bisect_next_check() {
 
if test -s $GIT_DIR/BISECT_START
then
-   gettextln You need to give me at least one good and 
one bad revisions.
+   gettextln You need to give me at least one good and 
one bad revision.
 (You can use \git bisect bad\ and \git bisect good\ for that.) 2
else
gettextln You need to start by \git bisect start\.
-You then need to give me at least one good and one bad revisions.
+You then need to give me at least one good and one bad revision.
 (You can use \git bisect bad\ and \git bisect good\ for that.) 2
fi
exit 1 ;;
diff --git a/git-stash.sh b/git