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

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

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

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

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 >

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

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

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

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 mai

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

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 p

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

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

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

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

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/b

[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 <alexhenri...@gmail.com> --- builtin/clone.c | 2 +- builtin/fetch.c | 2 +- 2 files changed, 2 insertions

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

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/builti

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

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 @@ stati

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

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-

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

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

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

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

[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 <alexhenri...@gmail.com> --- builtin/cat-file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

[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 <alexhenri...@gmail.com> --- builtin/am.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff

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

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

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 inse

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

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 @

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

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

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

'--' 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(-)

[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 <alexhenri...@gmail.com> --- builtin/stripspace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/stripspace.c b/builtin/stripspace

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

'--' 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(-)

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

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", n

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

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

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

[PATCH] pull: add angle brackets to usage string

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/

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

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

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 h

[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 <alexhenri...@gmail.com> --- po/ca.po | 53 + 1 file changed, 25 insertions(+), 28 del

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

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 @

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

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

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

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

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

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

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

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

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

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

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

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

` 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

Re: gitk drawing bug

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

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

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

[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 alexhenri...@gmail.com --- gitk | 4 ++-- 1 file changed

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

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

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

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

[PATCH] branch: fix funny-sounding error message

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

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

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

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

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

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

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

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

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

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

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'

Re: [PATCH v2] standardize usage info string format

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

[PATCH v2] standardize usage info string format

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

[PATCH] standardize usage info string format

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

Re: Fix wrong catalan translation

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

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

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

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

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