[PATCH v5] wrapper: use a loop instead of repetitive statements

be replaced with a named constant. Reviewed-by: Derrick Stolee Reviewed-by: Johannes Schindelin Reviewed-by: Jeff King Signed-off-by: Alex Henrie --- wrapper.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wrapper.c b/wrapper.c index c55d7722d7..c23ac6adcd

[PATCH v5] diffcore-break: use a goto instead of a redundant if statement

The condition "if (q->nr <= j)" checks whether the loop exited normally or via a break statement. Avoid this check by replacing the jump out of the inner loop with a jump to the end of the outer loop, which makes it obvious that diff_q is not executed when the peer survives. Sig

[PATCH v5] commit-graph: remove a duplicate assignment

unction for the same reason. Reviewed-by: Derrick Stolee Signed-off-by: Alex Henrie --- commit-graph.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..4028508e9c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1522,8 +

Re: [PATCH v4] diffcore-break: use a goto instead of a redundant if statement

On Mon, Sep 30, 2019 at 3:48 AM Junio C Hamano wrote: > > Alex Henrie writes: > > > Well, I admit that code clarity is somewhat subjective. To me it's not > > obvious that "if (q->nr <= j)" means "if the loop exited normally", > > I a

Re: [PATCH v4] diffcore-break: use a goto instead of a redundant if statement

On Sun, Sep 29, 2019 at 7:36 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > The condition "if (q->nr <= j)" checks whether the loop exited normally > > or via a break statement. This check can be avoided by replacing the > > jump out of the inn

Re: [PATCH v3] commit-graph: remove a duplicate assignment

On Sun, Sep 29, 2019 at 7:22 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > The variable g was being set to the same value both at the beginning of > > the function and before the loop. The assignment before the loop was > > kept because it helps clarify

[PATCH v4] diffcore-break: use a goto instead of a redundant if statement

replaced with a single diff_q call outside of the outer if statement. Signed-off-by: Alex Henrie --- diffcore-break.c | 14 ++ 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/diffcore-break.c b/diffcore-break.c index 875aefd3fe..ee7519d959 100644 --- a/diffcore-break.

Re: [PATCH v3] diffcore-break: use a goto instead of a redundant if statement

On Sun, Sep 29, 2019 at 3:37 AM CB Bailey wrote: > > Previously, if the condition matched in the inner loop, the function > would null out the entry in the queue that that inner loop had reached > (q->queue[j] = NULL) and then break out of the inner loop. This meant > that the outer loop would ski

[PATCH v3] wrapper: use a loop instead of repetitive statements

be replaced with a named constant. Reviewed-by: Derrick Stolee Reviewed-by: Johannes Schindelin Reviewed-by: Jeff King Signed-off-by: Alex Henrie --- wrapper.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wrapper.c b/wrapper.c index c55d7722d7..c23ac6adcd

[PATCH v3] commit-graph: remove a duplicate assignment

Signed-off-by: Alex Henrie --- commit-graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..d0e1f9e1f2 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1522,7 +1522,7 @@ static int write_commit_graph_file(struct

[PATCH v3] diffcore-break: use a goto instead of a redundant if statement

replaced with a single diff_q call outside of the outer if statement. Reviewed-by: Derrick Stolee Signed-off-by: Alex Henrie --- diffcore-break.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/diffcore-break.c b/diffcore-break.c index 875aefd3fe..f6ab74141b 10064

Re: [PATCH 3/3] wrapper: use a loop instead of repetitive statements

On Thu, Sep 26, 2019 at 8:50 PM Jeff King wrote: > > On Thu, Sep 26, 2019 at 10:14:17PM +0200, Johannes Schindelin wrote: > > > However, I think that this patch should at least be accompanied by a > > commit message that suggests that some thought was put into it, and that > > concerns like mine w

[PATCH v2] commit-graph: remove a duplicate assignment

Signed-off-by: Alex Henrie --- commit-graph.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..d0e1f9e1f2 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1522,7 +1522,7 @@ static int write_commit_graph_file(struct

Re: [PATCH 1/3] commit-graph: remove a duplicate assignment

On Thu, Sep 26, 2019 at 7:02 AM Derrick Stolee wrote: > > Could we instead remove the assignment during the declaration? It is > easier to know the while loop will work if the assignment is closer > to the loop. Sure, that's fine. I'll send a v2 with that change. -Alex

[PATCH 3/3] wrapper: use a loop instead of repetitive statements

Signed-off-by: Alex Henrie --- wrapper.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/wrapper.c b/wrapper.c index c55d7722d7..c23ac6adcd 100644 --- a/wrapper.c +++ b/wrapper.c @@ -469,13 +469,12 @@ int git_mkstemps_mode(char *pattern, int suffix_len, int mode

[PATCH 1/3] commit-graph: remove a duplicate assignment

Signed-off-by: Alex Henrie --- commit-graph.c | 1 - 1 file changed, 1 deletion(-) diff --git a/commit-graph.c b/commit-graph.c index 9b02d2c426..659f4bb4f4 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -1534,7 +1534,6 @@ static void split_graph_merge_strategy(struct

[PATCH 2/3] diffcore-break: use a goto instead of a redundant if statement

Signed-off-by: Alex Henrie --- diffcore-break.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/diffcore-break.c b/diffcore-break.c index 875aefd3fe..f6ab74141b 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -286,18 +286,17 @@ void

[PATCH 0/3] scan-build fixes

These patches fix a few problems identified by scan-build [1]. None of them affect behavior, but they do make the code easier to follow and ensure that the compiler is able to optimize it to the fullest. -Alex [1] https://clang-analyzer.llvm.org/scan-build.html Alex Henrie (3): commit-graph

[PATCH] doc: fix reference to --ignore-submodules

Signed-off-by: Alex Henrie --- Documentation/gitmodules.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index a66e95b70c..b7f5e39d4c 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt

Re: [PATCH v2] Give git-pull a --reset option

On Sat, Apr 20, 2019 at 11:38 PM Junio C Hamano wrote: > > Alex Henrie writes: > > > A common workflow is to make a commit on a local branch, push the branch > > to the remote, check out the remote branch on a second computer, amend > > the commit on the second compu

[PATCH v2] Give git-pull a --reset option

push --force`. Signed-off-by: Alex Henrie --- Documentation/git-pull.txt | 8 builtin/pull.c | 23 +++ t/t5520-pull.sh| 24 3 files changed, 55 insertions(+) diff --git a/Documentation/git-pull.txt b/Documentation

[PATCH] Give git-pull a --reset option

push --force`. Signed-off-by: Alex Henrie --- Documentation/git-pull.txt | 8 builtin/pull.c | 28 2 files changed, 36 insertions(+) diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 118d9d86f7..bae8f07161 100644 --- a/

Re: [PATCH] In `git log --graph`, default to --pretty=oneline --abbrev-commit

On Sun, Mar 24, 2019 at 11:27 PM Rafael Ascensão wrote: > > Or just $git log --graph --oneline, since --oneline is a shortcut for the > longer --pretty=oneline --abbrev-commit. Thanks for the tip! I didn't know about the --oneline option, but now that I do, I suppose I don't really need an alias

Re: [PATCH] In `git log --graph`, default to --pretty=oneline --abbrev-commit

On Sun, Mar 24, 2019 at 11:10 PM Alex Henrie wrote: > > I like the idea of a completely separate `git graph` command. This > command would simply be a builtin alias for `git log --abbrev-commit > --pretty=oneline`, like how `git reflog` is a builtin alias for `git > log -g

Re: [PATCH] In `git log --graph`, default to --pretty=oneline --abbrev-commit

On Sun, Mar 24, 2019 at 7:18 PM Rafael Ascensão wrote: > > But If we make the default to 'short' (or anything else), what should be > done if the user has `format.pretty=` defined to something? Is `--graph` > special to be allowed to not follow said configuration? > > It's inconsistent itself, and

Re: [PATCH] In `git log --graph`, default to --pretty=oneline --abbrev-commit

On Sun, Mar 24, 2019 at 7:03 AM Junio C Hamano wrote: > > Alex Henrie writes: > > > Having --pretty=medium as the default almost always makes the graph too > > difficult to follow. > > > > Signed-off-by: Alex Henrie > > --- > > I too thought that

[PATCH] In `git log --graph`, default to --pretty=oneline --abbrev-commit

Having --pretty=medium as the default almost always makes the graph too difficult to follow. Signed-off-by: Alex Henrie --- builtin/log.c | 5 + t/t4052-stat-output.sh | 14 +++--- t/t4202-log.sh | 14 ++ 3 files changed, 26 insertions(+), 7 deletions

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

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

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

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

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

(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

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

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 decorati

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

Signed-off-by: Alex Henrie --- 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

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

2017-03-23 12:03 GMT-06:00 Junio C Hamano : > Alex Henrie 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 tha

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

2017-03-23 9:54 GMT-06:00 Junio C Hamano : > Alex Henrie writes: > >> 2017-03-22 10:54 GMT-06:00 Junio C Hamano : >>> Alex Henrie writes: >>>> No problem. Do I need to submit a second version of the patch with a >>>> test for `git -p log`? >>&

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

2017-03-22 10:54 GMT-06:00 Junio C Hamano : > Alex Henrie 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 f

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

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

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

nge the default from log.decorate=no to log.decorate=auto. Signed-off-by: Alex Henrie --- 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 +++

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

"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 --- builtin/clone.c | 2 +- builtin/fetch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

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

The article "the" is required here. Signed-off-by: Alex Henrie --- 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/built

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

Multiple revisions cannot be a single ancestor. Signed-off-by: Alex Henrie --- 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

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

Signed-off-by: Alex Henrie --- 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

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

In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie --- 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

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

In English, only proper nouns are capitalized. Signed-off-by: Alex Henrie --- 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

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

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 --- builtin/cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/cat-file.c b

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

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 --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c

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

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

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

Signed-off-by: Alex Henrie --- 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

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

Signed-off-by: Alex Henrie --- 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

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

2016-02-09 16:00 GMT-07:00 Junio C Hamano : > Stefan Beller writes: > >> On Tue, Feb 9, 2016 at 2:24 PM, Junio C Hamano wrote: >>> Alex Henrie writes: >>> >>>> I couldn't find any other examples of people referring to this character >>

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

I couldn't find any other examples of people referring to this character as a "blank". Signed-off-by: Alex Henrie --- builtin/stripspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/stripspace.c b/builtin/stripspace.c index 7ff8434..15e716e 10064

Re: [PATCH] blame: display a more helpful error message if the file was deleted

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

ree. 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 --- builtin/blame.c | 2 -- 1 file changed, 2 deletio

[PATCH] blame: display a more helpful error message if the file was deleted

ree. 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 --- builtin/blame.c | 2 -- 1 file changed, 2 deletio

Re: [PATCH] pull: add angle brackets to usage string

2015-10-19 23:17 GMT-06:00 Junio C Hamano : > Alex Henrie writes: > >> 2015-10-16 11:42 GMT-06:00 Junio C Hamano : >>> >>> Yes, but that fixes historical "mistake", no? >>> >>> With this, you are breaking historical practice by chang

Re: [PATCH] pull: add angle brackets to usage string

2015-10-16 11:42 GMT-06:00 Junio C Hamano : > Alex Henrie writes: > >> 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/exam

Re: [PATCH] pull: add angle brackets to usage string

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 submitt

[PATCH] pull: add angle brackets to usage string

Signed-off-by: Alex Henrie --- 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

Re: [PATCH] gitk: l10n: Update Catalan translation

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

Re: [PATCH] gitk: l10n: Update Catalan translation

2015-10-05 23:38 GMT-06:00 Junio C Hamano : > Alex Henrie 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" applic

[PATCH] gitk: l10n: Update Catalan translation

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 --- po/ca.po | 53 + 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/po/ca

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

Signed-off-by: Alex Henrie --- 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

Re: [PATCH] show-ref: place angle brackets around variables in usage string

2015-08-29 4:21 GMT-06:00 Philip Oakley : > 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 slig

[PATCH] show-ref: place angle brackets around variables in usage string

Signed-off-by: Alex Henrie --- 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

[PATCH] read-tree: replace bracket set with parentheses to clarify usage

-u and -i can only be given if -m, --reset, or --prefix is given. Without parentheses, it looks like -u and -i can be used no matter what, and the second pair of brackets is confusing. Signed-off-by: Alex Henrie --- builtin/read-tree.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[PATCH] show-ref: place angle brackets around variable in usage string

Signed-off-by: Alex Henrie --- 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

[PATCH] pack-objects: place angle brackets around variables in usage strings

Signed-off-by: Alex Henrie --- 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 "

[PATCH] git-submodule: remove extraneous space from error message

Signed-off-by: Alex Henrie --- 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 -

[PATCH] reflog: add missing single quote to error message

The error message can be seen by running `git config gc.reflogexpire foo` and then `git reflog expire`. Signed-off-by: Alex Henrie --- 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

[PATCH v2] gitk: Remove mc parameter from proc show_error

annot run..." not translatable. It will take effect the next time `make update-po` is run. Signed-off-by: Alex Henrie --- 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 ma

Re: gitk drawing bug

2015-02-18 12:27 GMT-07:00 Martin d'Anjou : > 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

Re: [PATCH] standardize usage strings that were missed the first time

2015-04-02 15:56 GMT-06:00 Junio C Hamano : > 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 freez

[PATCH] branch: fix funny-sounding error message

Signed-off-by: Alex Henrie --- 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

[PATCH] standardize usage strings that were missed the first time

This is a follow-up to commit 9c9b4f2f8b7f27f3984e80d053106d5d41cbb03b. Signed-off-by: Alex Henrie --- 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

[PATCH] gitk: Remove mc parameter from proc show_error

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 --- gitk | 4 ++-- 1 file c

[PATCH] gitk: Fix bad English grammar "Matches none Commit Info"

Signed-off-by: Alex Henrie --- 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:"}}

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

2015-02-23 15:30 GMT-07:00 Alex Henrie : > 2015-02-16 16:27 GMT-07:00 Alex Henrie : >> 2015-02-09 14:55 GMT-07:00 Junio C Hamano : >>> >>> Alex Henrie writes: >>> >>> > This is just a friendly reminder that this patch has been sitting in >>&g

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

2015-02-16 16:27 GMT-07:00 Alex Henrie : > 2015-02-09 14:55 GMT-07:00 Junio C Hamano : >> >> Alex Henrie 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

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

2015-02-09 14:55 GMT-07:00 Junio C Hamano : > > Alex Henrie 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 th

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

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

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

Signed-off-by: Alex Henrie --- 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

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

Signed-off-by: Alex Henrie --- 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

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

revents 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 --- gitk-git/gitk | 1 +

Re: [PATCH] Documentation/init-db.txt: minor style and synopsys fixes

2015-01-14 13:47 GMT-07:00 Eric Sunshine : > On Wed, Jan 14, 2015 at 12:33 PM, Alexander Kuleshov > wrote: >> -'git init-db' [-q | --quiet] [--bare] [--template=] >> [--separate-git-dir ] [--shared[=]] >> - >> +'git init-db' [-q | --quiet] [--bare] [--template=] >> + [--se

Re: [PATCH v2] standardize usage info string format

2015-01-12 22:29 GMT-07:00 Scott Schmit : > > 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/bui

[PATCH v2] standardize usage info string format

parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing * with [...] Signed-off-by: Alex Henrie --- Documentation/CodingGuidelines | 8 ++-- advice.c | 2 +- archive.c | 4 ++-- builtin/add.c | 2

[PATCH] standardize usage info string format

parameter names - Adding spaces to [-f|--foobar] to make [-f | --foobar] - Replacing * with [...] Signed-off-by: Alex Henrie --- advice.c | 2 +- archive.c | 4 ++-- builtin/add.c | 2 +- builtin/apply.c| 2 +- builtin/blame.c

Re: Fix wrong catalan translation

2014-12-19 3:38 GMT-07:00 Albert Astals Cid : > 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, in

[PATCH] builtin/remote.c: add missing space to user-facing message

Signed-off-by: Alex Henrie --- 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

Re: [PATCH] Improve English grammar

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

Hi, I submitted this patch a week ago and got no reply, so I'm sending it again and CC'ing the original authors this time... Signed-off-by: Alex Henrie --- builtin/commit.c | 2 +- builtin/ls-files.c | 2 +- builtin/merge.c| 4 ++-- builtin/notes.c| 2 +- builtin/rm.c

[PATCH] Improve English grammar

Signed-off-by: Alex Henrie --- 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