Hello Dear,

2016-04-03 Thread lolagabin368
Hello how are you doing together with your health i hope you are perfectly okay.my name is miss silvia please i have an urgent discussion with you which is very confidential and important. Please don't be upset with me meanwhile i mean no harm and i will also send my pictures to you, for you to

Re: [PATCH v3 4/4] tag: use pgp_verify_function in tag -v call

2016-04-03 Thread Santiago Torres
> > diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c > > index f776778..8abc357 100644 > > --- a/builtin/verify-tag.c > > +++ b/builtin/verify-tag.c > > @@ -30,6 +30,8 @@ int cmd_verify_tag(int argc, const char **argv, const > > char *prefix) > > { > > int i = 1, verbose = 0,

Re: [PATCH] comment for a long #ifdef

2016-04-03 Thread Eric Sunshine
On Sun, Apr 3, 2016 at 9:00 PM, Ivan Pozdeev wrote: > --- Missing sign-off. See Documentation/SubmittingPatches. > compat/poll/poll.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/compat/poll/poll.c b/compat/poll/poll.c > index db4e03e..5eb0280

[PATCH] rev-parse: fix --git-common-dir when executed from subpath of main tree

2016-04-03 Thread Michael Rappazzo
Executing `git-rev-parse --git-common-dir` from the root of the main worktree results in '.git', which is the relative path to the git dir. When executed from a subpath of the main tree it returned somthing like: 'sub/path/.git'. Change this to return the proper relative path to the git directory

Hello Dear

2016-04-03 Thread lolagabin368
Hello how are you doing together with your health i hope you are perfectly okay.my name is miss silvia please i have an urgent discussion with you which is very confidential and important. Please don't be upset with me meanwhile i mean no harm and i will also send my pictures to you, for you to

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

2016-04-03 Thread Eric Sunshine
On Sun, Apr 3, 2016 at 5:58 PM, Santiago Torres wrote: > On Sun, Apr 03, 2016 at 09:07:25AM -0400, Jeff King wrote: >> On Sun, Apr 03, 2016 at 03:59:46AM -0400, Eric Sunshine wrote: >> > On Sun, Apr 3, 2016 at 12:40 AM, Jeff King wrote: >> > > In fact, I suspect

[PATCH] comment for a long #ifdef

2016-04-03 Thread Ivan Pozdeev
--- compat/poll/poll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compat/poll/poll.c b/compat/poll/poll.c index db4e03e..5eb0280 100644 --- a/compat/poll/poll.c +++ b/compat/poll/poll.c @@ -441,7 +441,7 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout) } return

Re: [PATCH v12 4/5] t7507-commit-verbose: improve test coverage by testing number of diffs

2016-04-03 Thread Eric Sunshine
On Sun, Apr 3, 2016 at 8:02 PM, Eric Sunshine wrote: > On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: >> Make the fake "editor" store output of grep in a file so that we can >> see how many diffs were contained in the message and use them in

Re: [PATCH v12 5/5] commit: add a commit.verbose config variable

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Add commit.verbose configuration variable as a convenience for those > who always prefer --verbose. > > Signed-off-by: Pranit Bauva > --- > diff --git a/Documentation/config.txt

Re: [PATCH v12 4/5] t7507-commit-verbose: improve test coverage by testing number of diffs

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Make the fake "editor" store output of grep in a file so that we can > see how many diffs were contained in the message and use them in > individual tests where ever it is required. Also use write_script() > to create

Re: [PATCH v12 3/5] parse-options.c: make OPTION_COUNTUP respect "unspecified" values

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > The reason to make it respect "unspecified" values is to give the > ability to differentiate whether `--option` or `--no-option` was > specified at all. "unspecified" values should be in the form of negative > values.

Re: Out Of Place Capitalization In Stash Feedback

2016-04-03 Thread Saxon Knight
P.S. I suppose it would help if I added some relevant details, lol. I'm using git version 2.5.0 on 64-bit Ubuntu 15.10. Feel free to contact me for more specific details if needed. On Sun, Apr 3, 2016 at 12:09 PM, Saxon Knight wrote: > Hello, > > I recently did a git

Out Of Place Capitalization In Stash Feedback

2016-04-03 Thread Saxon Knight
Hello, I recently did a git stash save "working on main", and in the feedback, I noticed that "On" was capitalized ("...state On master..."). I don't think this is intentional, so I figured I'd try to let someone know. Here is the output (quotes included by me): "Saved working directory and

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

2016-04-03 Thread Santiago Torres
On Sun, Apr 03, 2016 at 09:07:25AM -0400, Jeff King wrote: > On Sun, Apr 03, 2016 at 03:59:46AM -0400, Eric Sunshine wrote: > > > On Sun, Apr 3, 2016 at 12:40 AM, Jeff King wrote: > > > In fact, I suspect you could replace the "GOODSIG" check as well by > > > doing something like:

Re: [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c

2016-04-03 Thread Santiago Torres
On Sun, Apr 03, 2016 at 04:19:26AM -0400, Eric Sunshine wrote: > On Sat, Apr 2, 2016 at 7:16 PM, wrote: > > The PGP verification routine for tags could be accessed by other > > commands that require it. We do this by moving it to the common tag.c > > code. We rename the

Re: [PATCH v3 1/4] builtin/verify-tag.c: Ignore SIGPIPE on gpg-interface

2016-04-03 Thread Santiago Torres
On Sun, Apr 03, 2016 at 08:50:27AM +0200, Johannes Sixt wrote: > Am 03.04.2016 um 01:16 schrieb santi...@nyu.edu: > > From: Santiago Torres > > > > The verify_signed_buffer comand might cause a SIGPIPE signal when the > > gpg child process terminates early (due to a bad keyid,

Re: [PATCH v3 4/4] tag: use pgp_verify_function in tag -v call

2016-04-03 Thread Santiago Torres
> > if (cmdmode == 'v') > > - return for_each_tag_name(argv, verify_tag); > > + return for_each_tag_name(argv, pgp_verify_tag, > > + GPG_VERIFY_VERBOSE); > > but I think that is coupling too closely. What happens later when the > public,

Re: [PATCH v12 2/5] test-parse-options: print quiet as integer

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Current implementation of parse-options.c treats OPT__QUIET() as integer > and not boolean and thus it is more appropriate to print it as integer > to avoid confusion. I can buy this line of reasoning, however, it

Re: [PATCH v12 1/5] t0040-test-parse-options.sh: fix style issues

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:33 PM, Pranit Bauva wrote: > Signed-off-by: Pranit Bauva > --- > diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh > @@ -7,7 +7,7 @@ test_description='our own option parser' > > . ./test-lib.sh > > -cat >

Re: [PATCH v2 0/7] t5520: tests for --[no-]autostash option

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > The following series is applicable on mj/pull-rebase-autostash. > > Changes made vs v1: > * [Patch v1 4/5] is broken into three patches to increase > readability of the patches. > >

Re: GIT_CONFIG - what's the point?

2016-04-03 Thread Matthew Persico
On Fri, Apr 1, 2016 at 1:28 PM, SZEDER Gábor wrote: >> Let me explain my scenario. I have an nfs mounted home directory. It >> is used across multiple machines. I use different colored xterms for >> each machine. But that means that the one set of colors in my one >> .gitconfig

Re: [PATCH v2 7/7] t5520: test --[no-]autostash with pull.rebase=true

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > "--[no-]autostash" option for git-pull is only valid in rebase mode( s/"--[no-]autostash"/The --[no-]autostash/ Also, move the '(' from the end of the line to the beginning of the next line. > i.e. either --rebase

Re: [PATCH v2 5/7] t5520: factor out common code

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > t5520: factor out common code To distinguish this title from that of patch 4/7, you could say: t5520: factor out common "failing autostash" code > Three tests contains repetitive lines of code. > > Factor out

Re: [PATCH v2 4/7] t5520: factor out common code

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 1:58 PM, Mehul Jain wrote: > t5520: factor out common code To distinguish this title from that of patch 5/7, you could say: t5520: factor out common "successful autostash" code > Four tests contains repetitive lines of code. > > Factor out

Re: [PATCH 5/5] t/t5520: test --[no-]autostash with pull.rebase=true

2016-04-03 Thread Eric Sunshine
On Fri, Apr 1, 2016 at 6:27 AM, Mehul Jain wrote: > I tried out this method also. Below is the script that I wrote for this: > > test_autostash () { > OLDIFS=$IFS > IFS=',=' > while read -r expect cmd config_variable value > do >

[ANNOUNCE] Git v2.8.1 (and call-for-help to "make rpmbuild" users)

2016-04-03 Thread Junio C Hamano
If you do not build RPM binary packages from our pristine source, you can safely ignore this release and stop reading this message. Now that the audience of this message has been limited to a narrow target, before I make an announcement, here is a call-for-help to you. Git v2.8 removed README

Re: [PATCH] Fix spelling mistakes

2016-04-03 Thread Eric Engestrom
I went by word-count: "through" was way more common than "thru", so I kept the fix. BTW, I used codespell to fix those, I didn't do it by hand :] https://github.com/lucasdemarchi/codespell I can remove the "thru" fixes if you'd prefer, and resend with only the other fixes. Cheers, Eric On Sun,

[PATCH] convert.c: fix some sparse warnings

2016-04-03 Thread Ramsay Jones
Sparse complains thus: SP convert.c convert.c:180:24: warning: Using plain integer as NULL pointer convert.c:241:28: warning: dubious: !x & y Signed-off-by: Ramsay Jones --- Hi Torsten, When you re-roll your 'tb/safe-crlf-output-fix' branch, could

Re: [PATCH] Fix spelling mistakes

2016-04-03 Thread Junio C Hamano
Eric Engestrom writes: > Signed-off-by: Eric Engestrom > --- While I think "through" is not wrong, I do not think it is worth the patch churn to do s/thru/through/; If the original author wants to spell the word "thru", we are in no position to say it

Re: [PATCH 01/34] Documentation/diff-config: fix description of diff.renames

2016-04-03 Thread Junio C Hamano
Sorry, please ignore (I had two similarly named scripts, one drives git-send-email, the other drives something entirely different, and mistakenly invoked the former when I meant to run the latter). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

Re: [PATCH 02/34] t4001-diff-rename: wrap file creations in a test

2016-04-03 Thread Junio C Hamano
Sorry, please ignore (I had two similarly named scripts, one drives git-send-email, the other drives something entirely different, and mistakenly invoked the former when I meant to run the latter). -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

[PATCH 02/34] t4001-diff-rename: wrap file creations in a test

2016-04-03 Thread Junio C Hamano
From: Matthieu Moy Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano --- t/t4001-diff-rename.sh | 66 ++ 1 file changed, 35 insertions(+), 31 deletions(-) diff --git

[PATCH 01/34] Documentation/diff-config: fix description of diff.renames

2016-04-03 Thread Junio C Hamano
From: Matthieu Moy The description was misleading, since "set to any boolean value" include "set to false", and diff.renames=false does not enable basic detection, but actually disables it. Also, document that diff.renames only affects Porcelain. Signed-off-by: Matthieu

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

2016-04-03 Thread Jeff King
On Sun, Apr 03, 2016 at 03:59:46AM -0400, Eric Sunshine wrote: > On Sun, Apr 3, 2016 at 12:40 AM, Jeff King wrote: > > In fact, I suspect you could replace the "GOODSIG" check as well by > > doing something like: > > > > # verifying 3 tags in one invocation should be exactly

[PATCH] Fix spelling mistakes

2016-04-03 Thread Eric Engestrom
Signed-off-by: Eric Engestrom --- builtin/apply.c| 2 +- builtin/clean.c| 2 +- config.c | 2 +- contrib/examples/git-am.sh | 2 +- contrib/hooks/multimail/README | 2 +-

Re: [PATCH v2 6/7] correct blame for files commited with CRLF

2016-04-03 Thread Torsten Bögershausen
Thanks for all the comments. I just reallized that t6038 is broken, which I didn't notice before :-( Please feel free to kick out tb/safe-crlf-output-fix from pu, until I have looked into the breakage and found a fix. -- To unsubscribe from this list: send the line "unsubscribe git" in the

[PATCH v2 6/7] t5520: reduce commom lines of code

2016-04-03 Thread Mehul Jain
These two tests are almost similar and thus can be folded in a for-loop. Helped-by: Eric Sunshine Signed-off-by: Mehul Jain --- t/t5520-pull.sh | 16 +++- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git

Re: [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c

2016-04-03 Thread Eric Sunshine
On Sat, Apr 2, 2016 at 7:16 PM, wrote: > The PGP verification routine for tags could be accessed by other > commands that require it. We do this by moving it to the common tag.c > code. We rename the verify_tag() function to pgp_verify_tag() to avoid > conflicts with the

Re: [PATCH v3 3/4] builtin/verify-tag: move verification code to tag.c

2016-04-03 Thread Eric Sunshine
On Sun, Apr 3, 2016 at 12:45 AM, Jeff King wrote: > On Sat, Apr 02, 2016 at 07:16:14PM -0400, santi...@nyu.edu wrote: >> - len = parse_signature(buf, size); >> - >> - if (size == len) { >> - if (flags & GPG_VERIFY_VERBOSE) >> -

Re: [PATCH v3 2/4] t/t7030-verify-tag.sh: Adds validation for multiple tags

2016-04-03 Thread Eric Sunshine
On Sun, Apr 3, 2016 at 12:40 AM, Jeff King wrote: > In fact, I suspect you could replace the "GOODSIG" check as well by > doing something like: > > # verifying 3 tags in one invocation should be exactly like > # verifying the 3 separately > tags="fourth-signed sixth-signed

Re: [PATCH v3 1/4] builtin/verify-tag.c: Ignore SIGPIPE on gpg-interface

2016-04-03 Thread Johannes Sixt
Am 03.04.2016 um 01:16 schrieb santi...@nyu.edu: From: Santiago Torres The verify_signed_buffer comand might cause a SIGPIPE signal when the gpg child process terminates early (due to a bad keyid, for example) and git tries to write to it afterwards. Previously, ignoring

Re: [PATCH v2 6/7] t5520: reduce commom lines of code

2016-04-03 Thread Johannes Sixt
Am 03.04.2016 um 08:24 schrieb Mehul Jain: On Sun, Apr 3, 2016 at 12:20 AM, Johannes Sixt wrote: Am 02.04.2016 um 19:58 schrieb Mehul Jain: +for i in --autostash --no-autostash +do + test_expect_success "pull $i (without --rebase) is illegal" ' +

Re: [PATCH v2 6/7] t5520: reduce commom lines of code

2016-04-03 Thread Mehul Jain
On Sun, Apr 3, 2016 at 12:20 AM, Johannes Sixt wrote: > Am 02.04.2016 um 19:58 schrieb Mehul Jain: >> +for i in --autostash --no-autostash >> +do >> + test_expect_success "pull $i (without --rebase) is illegal" ' >> + test_must_fail git pull $i . copy 2>err &&