[PATCH 2/4] fsmonitor: Don't bother pretty-printing JSON from watchman

2017-10-19 Thread Alex Vandiver
This provides small performance savings. Signed-off-by: Alex Vandiver --- t/t7519/fsmonitor-watchman | 2 +- templates/hooks--fsmonitor-watchman.sample | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman

Re: [RFC] Reporting index properties

2017-10-06 Thread Alex Vandiver
ltered. - Alex

Re: [RFC] Reporting index properties

2017-10-05 Thread Alex Vandiver
this information from repositories, with a standard git install. That directory only contains developer tools, which aren't part of the install, no? - Alex

[RFC] Reporting index properties

2017-10-05 Thread Alex Vandiver
. But this also doesn't seem worthy of a new top-level command. Do folks have feelings about surfacing this information, and where such logic should live? - Alex

Re: [PATCH v8 00/12] Fast git status via a file system watcher

2017-10-03 Thread Alex Vandiver
-- >8 -- >From 445d45027bb5b7823338cf111910d2884af6318b Mon Sep 17 00:00:00 2001 From: Alex Vandiver Date: Tue, 3 Oct 2017 23:27:46 -0700 Subject: [PATCH] fsmonitor: Read entirety of watchman output In perl, setting $/ sets the string that is used as the "record separator," which sets the boundary that the

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

2017-05-14 Thread Alex Henrie
ig 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

2017-05-12 Thread Alex Henrie
ore 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

2017-05-12 Thread Alex Henrie
(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 Thread Alex Henrie
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

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

2017-03-29 Thread Alex Hoffman
Any news about this patch? 2017-03-21 22:24 GMT+01:00 Alex Hoffman : > Hi, Brian, > > We definitely prefer the wrapper function oid_to_hex() to > sha1_to_hex(). Thanks for feedback. > Below is the updated patch: > > --- > bisect.c | 6 +++--- > 1 file changed, 3

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

2017-03-23 Thread Alex Henrie
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 Thread Alex Henrie
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 Thread Alex Henrie
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-23 Thread Alex Henrie
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 Thread Alex Henrie
quot;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

Re: [PATCH] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

2017-03-21 Thread Alex Hoffman
Hi, Brian, We definitely prefer the wrapper function oid_to_hex() to sha1_to_hex(). Thanks for feedback. Below is the updated patch: --- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index 30808cadf..7b65acbcd 100644 --- a/bisect.c +++ b/b

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

2017-03-20 Thread Alex Henrie
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] Correct compile errors when DEBUG_BISECT=1 after supporting other hash algorithms

2017-03-19 Thread Alex Hoffman
--- bisect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bisect.c b/bisect.c index 30808cadf..6feed8533 100644 --- a/bisect.c +++ b/bisect.c @@ -131,7 +131,7 @@ static void show_list(const char *debug, int counted, int nr, unsigned flags = commit->obje

Re: Git bisect does not find commit introducing the bug

2017-02-21 Thread Alex Hoffman
> isn't that spelt `--ancestry-path` ? > (--ancestry-path has it's own issues such as needing an --first-parent-show > option, but that's possibly a by the by) Indeed it is spelled `--ancestry-path`. And interestingly enough you may use it multiple times with the wanted effect in our case (e.g whe

Re: Git bisect does not find commit introducing the bug

2017-02-20 Thread Alex Hoffman
> If `git bisect` is/would be affected by `git log` history-related options > then this is what `--strict-ancestor` option gives/would give. Exactly my thoughts. All that needs to be changed in the 2nd problem is the graph where to search. But first we must agree about the usefulness of the 2nd p

Re: Git bisect does not find commit introducing the bug

2017-02-20 Thread Alex Hoffman
I see two different problems each with a different assumption (see the definition of "bisectable" in the email of Junio C Hamano): 1. (Current) Assume the entire history graph is bisectable. DO: Search where in the entire graph the first 'trait'/transition occurs. 2. (New) Assume only the graph be

Re: Git bisect does not find commit introducing the bug

2017-02-19 Thread Alex Hoffman
> Then you must adjust your definition of "good": All commits that do not have > the feature, yet, are "good": since they do not have the feature in the > first place, they cannot have the breakage that you found in the feature. > > That is exactly the situation in your original example! But you co

Re: Git bisect does not find commit introducing the bug

2017-02-19 Thread Alex Hoffman
Below is a correction of the first proposed algorithm: >--o1--o2--o3--G --X1 >\\ > x1--x2--x3--x4--X2--B-- > \ / > y1--y2--y3 > Step 1a. (Unchanged) keep only the commits that: a) are ancestor of the "bad" commit (including the "bad" commit

Re: Git bisect does not find commit introducing the bug

2017-02-19 Thread Alex Hoffman
> At the end of the git-bisect man page (in the SEE ALSO section) there > is a link to > https://github.com/git/git/blob/master/Documentation/git-bisect-lk2009.txt > which has a lot of details about how bisect works. > Thanks for pointing out the SEE ALSO section. I think it makes sense to includ

Re: Git bisect does not find commit introducing the bug

2017-02-18 Thread Alex Hoffman
> But this is not how Git works. Git computes graph differences, i.e., it > subtracts from the commits reachable from v.bad those that are reachable > from v.good. This leaves more than just those on some path from v.good to > v.bad. And it should work this way. Consider this history: > > --o--o--o

Re: Git bisect does not find commit introducing the bug

2017-02-18 Thread Alex Hoffman
ood and v.bad, instead of all paths (in my example graph there are two such paths). I will also underline that git bisect was designed to work with multiple good commits and one bad commit (also multiple paths), but probably NOT with multiple paths between the same pair of good and bad commits. VG

Git bisect does not find commit introducing the bug

2017-02-17 Thread Alex Hoffman
Hi there, According to the documentation "git bisect" is designed "to find the commit that introduced a bug" . I have found a situation in which it does not returns the commit I expected. In order to reproduce the problem: 1. mkdir test; cd test; git clone https://github.com/entbugger/git-bisect-

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

2016-12-04 Thread 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 --- 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

2016-12-04 Thread Alex Henrie
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

2016-12-04 Thread Alex Henrie
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

[BUG] git-stash fails when tracked file is replaced with directory

2016-10-19 Thread Alex C. Reed, IV
t add . git stash ) ( setup stash-test-commit git add . git co -b stash-branch git commit -m "commit to branch instead of stash" ) } 2>&1 | tee stash-test.log = END stash-test.sh Thanks, -Alex Reed

Re: Request: Extra case for %G? format

2016-09-26 Thread Alex
(and return U for untrusted good). > > I wouldn't mind adding E to %G? in the ERRSIG case, even though one has > to look at %GG in any case (N or E) if one wants to have more details. That would be great. As long as %G? can tell between a signed but uncheckable commit and an unsigned commit, then it's good for me. > > Cheers, > Michael Thanks, Alex

Request: Extra case for %G? format

2016-09-24 Thread Alex
Hello all, Could the %G? format differentiate between an unsigned commit and a signed commit that you're missing a public key for? If `git show --format=%GG --no-patch ' produces an output like the following: gpg: Signature made using RSA key ID gpg: Can't check signature: public key not found

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

2016-09-07 Thread Alex Henrie
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"

2016-09-07 Thread Alex Henrie
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"

2016-09-07 Thread Alex Henrie
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

2016-09-07 Thread 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 --- 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

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

Re: on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

2016-08-25 Thread Alex Nauda
On Thu, Aug 25, 2016 at 2:28 AM, Michael Haggerty wrote: > On 08/24/2016 11:39 PM, Jeff King wrote: >> On Wed, Aug 24, 2016 at 04:52:33PM -0400, Alex Nauda wrote: >> >>> Elastic File System (EFS) is Amazon's scalable filesystem product that >>> is exposed

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

2016-08-24 Thread 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:

on Amazon EFS (NFS): "Reference directory conflict: refs/heads/" with status code 128

2016-08-24 Thread Alex Nauda
Elastic File System (EFS) is Amazon's scalable filesystem product that is exposed to the OS as an NFS mount. We're using EFS to host the filesystem used by a Jenkins CI server. Sometimes when Jenkins tries to git fetch, we get this error: $ git -c core.askpass=true fetch --tags --progress g...@gith

[PATCH 2/2] git-gui: ensure the file in the diff pane is in the list of selected files

2016-06-28 Thread Alex Riesen
file in the list to make it selected. Signed-off-by: Alex Riesen --- lib/diff.tcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 0d56986..30bdd69 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -127,6 +127,9 @@ proc show_diff {path w {lno {}} {scroll_pos

[PATCH 1/2] git-gui: support for $FILENAMES in tool definitions

2016-06-28 Thread Alex Riesen
into the separate names. Note that the file marked and diffed immediately after starting the GUI up, is not actually selected. One must click on it once to really select it. Signed-off-by: Alex Riesen --- lib/tools.tcl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/tools.tcl b/lib

Re: [PATCH 1/2] Support for $FILENAMES in tool definitions

2016-06-28 Thread Alex Riesen
Jakub Narębski, Mon, Jun 27, 2016 19:28:07 +0200: > On 2016-06-27, Alex Riesen wrote: > > > This adds a FILENAMES environment variable, which contains the repository > > pathnames of all selected files the list. > > The variable contains the names separated by space

Re: [PATCH 1/2] Support for $FILENAMES in tool definitions

2016-06-28 Thread Alex Riesen
Johannes Schindelin, Mon, Jun 27, 2016 17:49:30 +0200: > On Mon, 27 Jun 2016, Alex Riesen wrote: > > > This adds a FILENAMES environment variable, which contains the repository > > pathnames of all selected files the list. > > The variable contains the names separated by

Re: [PATCH 2/2] Ensure the file in the diff pane is always in the list of selected files

2016-06-28 Thread Alex Riesen
Jakub Narębski, Mon, Jun 27, 2016 19:32:25 +0200: > W dniu 2016-06-27 o 15:23, Alex Riesen pisze: > > It is very confusing that the file, diff of which is displayed and which is > > marked as selected in the file list, is not, in fact, selected. I.e. the > > array > >

[PATCH 2/2] Ensure the file in the diff pane is always in the list of selected files

2016-06-27 Thread Alex Riesen
{}}} { } else { start_show_diff $cont_info } + + global current_diff_path selected_paths + set selected_paths($current_diff_path) 1 } proc show_unmerged_diff {cont_info} { -- 2.9.0.45.g28c608e.dirty To: Cc: Bcc: Subject: Reply-To: Alex Riesen

[PATCH 1/2] Support for $FILENAMES in tool definitions

2016-06-27 Thread Alex Riesen
starting the GUI up, is not actually selected. One must click on it once to really select it. Signed-off-by: Alex Riesen --- One day the FILENAME and FILENAMES will have to be fixed to properly pass the file names with spaces. Sorry, I couldn't find how to do it this time around. lib/tool

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

2016-06-24 Thread Alex Henrie
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

2016-06-23 Thread Alex Henrie
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

Fwd: Stash and Stash Pop Exit Codes

2016-06-17 Thread Alex
I was wondering why git stash exits with a 0 code when it can't stash anything and why git stash pop exits nonzero when it can't stash pop anything. I was trying to script something and wanted to check if anything was stashed before stash popping. -- To unsubscribe from this list: send the line "un

Re: compactionHeuristic=true is not used by interactive staging

2016-06-14 Thread Alex Prengère
I see, it makes sense ;-) Indeed it would seem logical to have all commands showing diffs (diff, add -p, log -p, reset -p, etc..) respect the diff options. Thanks for your quick answer! 2016-06-14 23:45 GMT+02:00 Junio C Hamano : > Jeff King writes: > >> Nobody noticed so far because originally

compactionHeuristic=true is not used by interactive staging

2016-06-14 Thread Alex Prengère
` will format patches differently. Perhaps this is intended and there is a way to force interactive staging to use specific diff options, but I did not find it in the doc. Thanks, Alex -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.

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

2016-02-09 Thread Alex Henrie
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"

2016-01-28 Thread Alex Henrie
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

2016-01-28 Thread 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

2016-01-28 Thread Alex Henrie
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

2015-12-15 Thread Alex Henrie
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: git branch in Bash subshell "$(git branch -a)" including ls output as part of return?

2015-12-07 Thread Alex Jones
rcelain" command such as "git > branch" at all, but instead look at using something like "git > for-each-ref", perhaps with the --format=%(refname) option, grepping out > master and iterating through the rest. -- Alex Jones | Software Engineer 919-238-4404 direct

git branch in Bash subshell "$(git branch -a)" including ls output as part of return?

2015-12-07 Thread Alex Jones
Hello Folks, I am Running OSX 10.10.5 Yosemite along with git 2.6.3 installed via homebrew package manager. I recently stumbled across the following bug in some scripting I was doing. "git branch -a --list" and "git branch -a" seem to include the output of an "ls" command if executed as part of a

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

2015-10-20 Thread Alex Henrie
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-19 Thread Alex Henrie
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 Thread Alex Henrie
rd. 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

2015-10-15 Thread Alex Henrie
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

2015-10-07 Thread Alex Henrie
eters is still OK. My guess is that it is the same bug that <http://article.gmane.org/gmane.comp.version-control.git/278863> 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

2015-10-06 Thread Alex Henrie
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

2015-10-05 Thread 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 --- 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.

2015-10-01 Thread Alex Henrie
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: git commit -a -m is not working

2015-09-28 Thread Alex Radulescu
Hi, Thank you for your quick and precise support. Can you share with me some best practices in deploying a web project? I wave one remote repository, many local repositories (each/developer) and a shared hosting server. What should I do to push quickly all changes to my shared server? Alex

git commit -a -m is not working

2015-09-26 Thread Alex Radulescu
Hi, This command is not working. Any advice? Alex:testGit Alex$ git commit -a -m 'made a change' On branch v1.0 Untracked files: new_branch.txt nothing added to commit but untracked files present -- To unsubscribe from this list: send the line "unsubscribe git" in the

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

2015-08-29 Thread Alex Henrie
< git check-attr --stdin [-z] [-a | --all | ...] < git hash-object --stdin-paths < So if we need to say for clarity, we should also say and 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 t

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

2015-08-28 Thread Alex Henrie
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

2015-08-26 Thread Alex Henrie
-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

2015-08-26 Thread Alex Henrie
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

2015-08-26 Thread Alex Henrie
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

2015-08-26 Thread Alex Henrie
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

2015-08-26 Thread 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 --- 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

Re: git init with template dir

2015-06-12 Thread Alex Cornejo
question. Thanks again, 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

git init with template dir

2015-06-12 Thread Alex Cornejo
this behavior and wanted to disable it? - 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] gitk: Remove mc parameter from proc show_error

2015-04-05 Thread Alex Henrie
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-04-03 Thread Alex Henrie
ift-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 , about this bug? -Alex -- To unsubscribe from this list: send the lin

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

2015-04-03 Thread Alex Henrie
hought 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..

[PATCH] branch: fix funny-sounding error message

2015-04-02 Thread Alex Henrie
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

2015-04-02 Thread Alex Henrie
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

2015-04-02 Thread 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 --- gitk | 4 ++-- 1 file c

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

2015-04-02 Thread Alex Henrie
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-03-10 Thread Alex Henrie
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-23 Thread 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 >> > 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-16 Thread 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 yet > > been accepted or commented on. > > I think th

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

2015-02-09 Thread 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

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

2015-02-01 Thread Alex Henrie
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

2015-01-26 Thread Alex Henrie
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

2015-01-22 Thread Alex Henrie
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 Thread Alex Henrie
init-db' [-q | --quiet] [--bare] [--template=] >> + [--separate-git-dir ] >> + [--shared[=]] [directory] > > I realize that you copied/pasted the text from git-init.txt, but this > should really be []. We're also transitioning to using hyphens to separat

Re: [PATCH v2] standardize usage info string format

2015-01-12 Thread Alex Henrie
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

2015-01-12 Thread Alex Henrie
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

2015-01-07 Thread Alex Henrie
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: [PATCH v3] send-email: Improve format of smtp initialization error message

2014-12-30 Thread Alex Kuleshov
What's about output like this: Unable to initialize SMTP properly. Check config and use --smtp-debug. VALUES: server=smtp.gmail.com encryption= hello=localhost.localdomain port=587 Junio C Hamano @ 2014-12-30 00:50 QYZT: > Alexander Kuleshov writes: > >> Signed

Re: Fix wrong catalan translation

2014-12-19 Thread Alex Henrie
alan 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:/

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

2014-12-17 Thread Alex Henrie
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

<    1   2   3   >