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

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

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

Re

2018-01-13 Thread Alex
-- Hello, I have a project i want to bring to you.. please respond for details Alex

[ID] - [39485] [RE] - [Notice!]

2018-03-02 Thread alex
PayPal Dear, YoursaccountshassBeenslimited! -To getsbacksintosyourspaypalsaccount,syousneedstosconfirmsyoursidentity. -it'sseasy ! 1. Clicksonstheslinksbelow. 2. Confirmsthatsyou'resthesownersofsthesaccount,sandsthensfollowsthesinstructions. Confirm Your account Sincerely ,

[ID] - [39485] [RE] - [Notice!]

2018-03-02 Thread alex
PayPal Dear, YoursaccountshassBeenslimited! -To getsbacksintosyourspaypalsaccount,syousneedstosconfirmsyoursidentity. -it'sseasy ! 1. Clicksonstheslinksbelow. 2. Confirmsthatsyou'resthesownersofsthesaccount,sandsthensfollowsthesinstructions. Confirm Your account Sincerely ,

gitignore vs. exclude vs assume-unchanged?

2014-04-16 Thread alex
Any clarification on the differences much appreciated: http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged/23097509 -- 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 htt

Re: gitignore vs. exclude vs assume-unchanged?

2014-04-16 Thread alex
On 2014-04-16 10:51, Junio C Hamano wrote: a...@bellandwhistle.net writes: Any clarification on the differences much appreciated: http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged/23097509 Please don't force people to refer to external site. The .gitignor

Re: gitignore vs. exclude vs assume-unchanged?

2014-04-17 Thread alex
ow that the use case is performance, but that could be clearer. 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

Re: gitignore vs. exclude vs assume-unchanged?

2014-04-25 Thread alex
ps be improved on. But if anything, the names need to be more different, not less. Users should be able to instantly know what a speaker is talking about without having to doublecheck and ask if by "git-ignore", the speaker really meant "git ignore" or "dot-gi

[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

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

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

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

[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

[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

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

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

[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

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

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

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

[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

[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

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-

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

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

[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

[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

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

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

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:

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

[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

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

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

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

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

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

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

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

[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

Potential bug in pack-objects.c

2019-01-21 Thread Alex Netkachov
alised in init_threaded_search, which is called later in prepare_pack (through ll_find_deltas). Kind Regards, Alex Netkachov

Re: Potential bug in pack-objects.c

2019-01-22 Thread Alex Netkachov
On Tue, 22 Jan 2019 at 07:29, Jeff King wrote: > > On Mon, Jan 21, 2019 at 10:10:16PM +, Alex Netkachov wrote: > > > On the location builtin/pack-objects.c:1996 the code tries to set > > read_lock (pthread_mutex_lock(&read_mutex)) and fails. I suspect that > >

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

2019-04-16 Thread Alex Henrie
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/

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

2019-04-20 Thread Alex Henrie
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

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

2019-04-21 Thread Alex Henrie
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

possible submodule bug?

2019-05-30 Thread Alex Levy
ound a bug with .gitmodules being ignored after adding a given submodule? Or is this just user error, a case of "Don't do that. Initialize the submodule with the correct URL and move on."? Thanks, Alex Alex Levy Firmware Engineer VoltServer, Inc. 42 Ladd Street, Suite 227 East Greenwich, RI 02818 alex.l...@voltserver.com 888-622-8658 x413

Attention.

2018-11-07 Thread Alex Stewart
Compliments of the day ; I have a business proposition for you which I sent you previously,I do not know if you received it? Please do find it proper to write me if your email is still active. Yours Faithfully, Barr. Alexander Stewart.

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

2019-03-22 Thread Alex Henrie
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] In `git log --graph`, default to --pretty=oneline --abbrev-commit

2019-03-24 Thread Alex Henrie
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

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

2019-03-24 Thread Alex Henrie
; or something. 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 --abbrev-commit --pretty=oneline`. Junio, would you be on board with that? -Alex

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

2019-03-24 Thread Alex Henrie
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

2019-03-27 Thread Alex Henrie
27;t really need an alias. -Alex

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

2019-09-18 Thread Alex Henrie
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

[PATCH 0/3] scan-build fixes

2019-09-24 Thread Alex Henrie
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 1/3] commit-graph: remove a duplicate assignment

2019-09-24 Thread Alex Henrie
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

2019-09-24 Thread Alex Henrie
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 3/3] wrapper: use a loop instead of repetitive statements

2019-09-24 Thread Alex Henrie
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

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

2019-09-26 Thread Alex Henrie
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 v2] commit-graph: remove a duplicate assignment

2019-09-26 Thread Alex Henrie
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 3/3] wrapper: use a loop instead of repetitive statements

2019-09-28 Thread Alex Henrie
gt; > concerns like mine were considered carefully. > > ...this I would definitely agree with. Thanks for the feedback everyone. I am not used to projects requiring detailed commit messages for small changes. I will send a v3 of the three patches with the additional explanations you requested. -Alex

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

2019-09-28 Thread Alex Henrie
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

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

2019-09-28 Thread Alex Henrie
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] wrapper: use a loop instead of repetitive statements

2019-09-28 Thread Alex Henrie
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

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

2019-09-29 Thread Alex Henrie
environment, initially with this > test but also 3 other tests in this file. Thank you for reviewing this. I should have run `make test` myself before sending the patch; I do indeed see the same test failure that you saw. I will send a v4 of this patch with the label in the right place. -Alex

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

2019-09-29 Thread Alex Henrie
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] commit-graph: remove a duplicate assignment

2019-09-30 Thread Alex Henrie
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

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

2019-09-30 Thread Alex Henrie
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 v4] diffcore-break: use a goto instead of a redundant if statement

2019-09-30 Thread Alex Henrie
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

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

2019-09-30 Thread Alex Henrie
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

2019-09-30 Thread Alex Henrie
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 +

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

2019-09-30 Thread Alex Henrie
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

Git Merge contributor summit notes

2018-03-09 Thread Alex Vandiver
It was great to meet some of you in person! Some notes from the Contributor Summit at Git Merge are below. Taken in haste, so my apologies if there are any mis-statements. - Alex "Does anyone think ther

Socket activation for GitWeb FastCGI with systemd?

2018-04-03 Thread Alex Ivanov
Hi. I want to use systemd as fastcgi spawner for gitweb + nginx. The traffic is low and number of users is limited + traversal bots. For that reason I've decided to use following mimimal services gitweb.socket [Unit] Description=GitWeb Socket [Socket] ListenStream=/run/gitweb.sock Accept=false

  1   2   3   >