Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-04-27 Thread Johannes Schindelin
Hi, On 2015-04-26 22:30, brian m. carlson wrote: > The git_connect function has code to handle plink and tortoiseplink > specially, as they require different command line arguments from > OpenSSH (-P instead of -p for ports; tortoiseplink additionally requires > -batch). However, the match was do

gute Neuigkeiten

2015-04-27 Thread meotyji
gute Neuigkeiten Handy, Laptop, TV-Raum, Goultard . Versand ist kostenlos Alle unsere Produkte können Preferred Rabatt von 50% angeboten werden si te: weacaoo . com

[PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Michael Haggerty
The only changes are to the README files, most notably the list of maintainers and the project URL. Signed-off-by: Michael Haggerty --- contrib/hooks/multimail/README | 43 +++--- contrib/hooks/multimail/README.Git | 6 +++--- 2 files changed, 25 insertions(+

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Matthieu Moy
Michael Haggerty writes: > The only changes are to the README files, most notably the list of > maintainers and the project URL. > > Signed-off-by: Michael Haggerty > --- > contrib/hooks/multimail/README | 43 > +++--- > contrib/hooks/multimail/README.Git |

Re: [PATCH v8 2/4] cat-file: teach cat-file a '--literally' option

2015-04-27 Thread karthik nayak
On 04/25/2015 10:34 PM, Junio C Hamano wrote: karthik nayak writes: >> Is there any other way to make cat-file looser other than accepting >> an unknown type name from the future? If not, then perhaps it may >> make sense to give it a generic name that implies that we would >> trigger such ad

Re: Cleaning projects with submodules

2015-04-27 Thread Heiko Voigt
Hi, On Sat, Apr 25, 2015 at 11:36:25PM +0200, Simon Richter wrote: > I'm trying to set up a continuous integration build for Boost, which > uses massive amounts of submodules, and keep running into problems when > running "git clean" in the toplevel project. > > When I switch to a version where a

[PATCH v2] git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

2015-04-27 Thread Elia Pinto
To get number of elements in an array git use the ARRAY_SIZE macro defined as: #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) The problem with it is a possibility of mistakenly passing to it a pointer instead an array. The ARRAY_SIZE macro as conventionally defined does not provide good

Re: [PATCH] blame: add blame.showemail config option

2015-04-27 Thread Quentin Neill
Thanks for the thorough review! I have adjusted the commit messages and updated the documentation changes. I'm in trying to add tests, I'll probably have some issues but will post something that works soon. As for the comments on behavior, see my responses below. -- Quentin "There! His Majesty ca

Re: [PATCH v3 0/3] Improve robustness of putty detection

2015-04-27 Thread Torsten Bögershausen
On 04/27/2015 12:04 AM, Junio C Hamano wrote: > "brian m. carlson" writes: > >> While I was adding tests, I noticed that we had a broken test due to the >> use of single quotes within a test, which resulted in the test always >> being skipped. > > Good eyes. While fixing the test is necessary,

Fwd: Can't override username of default credential context to have different username in custom context.

2015-04-27 Thread Vladislav Kostenko
Hi, Here is my scenario: 1. First I set default username git config --global credential.username myUsername 2. Then I want to have different username for my other repository git config --global credential.https://myOtherRepository.visualstudio.com.username myOtherUsername 3. When I try to pull

Re: [PATCH] Clarify documentation on commit message strip

2015-04-27 Thread Junio C Hamano
Fredrik Gustafsson writes: > I agree that it is very clear once you do edit the commit message. My main > point with this patch was to clarify -v, since it's not obvious from the > documentation that it will be removed. While I agree with you that the documentation should make it clear that the

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread Junio C Hamano
Junio C Hamano writes: > I suspect (I haven't looked very carefully for this round yet to be > sure, though) that it may turn out that the commit you are proposing > to revert was a misguided attempt to "fix" a non issue, or to break > the behaviour to match a mistaken expectation. If that is th

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Junio C Hamano
Michael Haggerty writes: > The only changes are to the README files, most notably the list of > maintainers and the project URL. > > Signed-off-by: Michael Haggerty > --- > contrib/hooks/multimail/README | 43 > +++--- > contrib/hooks/multimail/README.Git |

Re: [PATCH v2] git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

2015-04-27 Thread Junio C Hamano
Elia Pinto writes: > This is the second version of this patch. It had not been > discussed before. In the second version, I just tried to clarify > the comment in the commit. I resend it just in case you missed I do not recall seeing it before. No discussion usually means no interest, so I'll

Re: [PATCH] blame: add blame.showemail config option

2015-04-27 Thread Junio C Hamano
Quentin Neill writes: >> It's not clear why you relocated documentation of --show-email from >> git-blame.txt to blame-options.txt, and the commit message does not >> explain the move. If there's a good reason for the relocation, the >> justification should be spelled out so that people reviewing

Re: [PATCH v2] git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

2015-04-27 Thread Junio C Hamano
Junio C Hamano writes: >> +#if SUPPORT__BUILTIN_TYPES_COMPATIBLE_P >> +/* &arr[0] degrades to a pointer: a different type from an array */ >> +#define _array_size_chk(arr) >> \ >> +BUILD_ASSERT_OR_ZERO(!__builtin_types_compatible_p(typeof(arr),

Re: [PATCH] Clarify documentation on commit message strip

2015-04-27 Thread Fredrik Gustafsson
On Mon, Apr 27, 2015 at 10:31:28AM -0700, Junio C Hamano wrote: > Fredrik Gustafsson writes: > > > I agree that it is very clear once you do edit the commit message. My main > > point with this patch was to clarify -v, since it's not obvious from the > > documentation that it will be removed. >

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Matthieu Moy
Junio C Hamano writes: >> --- a/contrib/hooks/multimail/README.Git >> +++ b/contrib/hooks/multimail/README.Git >> @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users. >> git-multimail is developed as an independent project at the following >> website: >> >> -https:/

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >>> --- a/contrib/hooks/multimail/README.Git >>> +++ b/contrib/hooks/multimail/README.Git >>> @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users. >>> git-multimail is developed as an independent project at the following >>>

Re: [PATCH v8 2/4] cat-file: teach cat-file a '--literally' option

2015-04-27 Thread Eric Sunshine
On Mon, Apr 27, 2015 at 7:57 AM, karthik nayak wrote: > On 04/25/2015 10:34 PM, Junio C Hamano wrote: >> karthik nayak writes: >> > Yes this gives the best description, but its large, while we could use >> > something like --no-strict instead. >> >> We could, if you answered my first question wit

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Junio C Hamano writes: >> --- a/contrib/hooks/multimail/README.Git +++ b/contrib/hooks/multimail/README.Git @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git users. git-multimail is developed as an indepe

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> >>> Junio C Hamano writes: >>> > --- a/contrib/hooks/multimail/README.Git > +++ b/contrib/hooks/multimail/README.Git > @@ -3,13 +3,13 @@ section of the Git project as a convenience to Git > users. >

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> Was that obtained from the upstream project (i.e. you) and match >>> your 1.0.2 tag? >> >> Yes. Isn't that what the text above says? > > Well, the patch does not update git_multimail.py at all. Requoting > the par

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread Johannes Sixt
Am 27.04.2015 um 08:11 schrieb Stepan Kasal: Git does not support CRLF as the internal line separator. If you commit file in binary mode with CRLF, you are on your own. When I commit my C source code files with CRLF into the repository (because I do not set any line ending options or configura

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Junio C Hamano
Matthieu Moy writes: > Junio C Hamano writes: > >> Matthieu Moy writes: >> >>> Junio C Hamano writes: >>> Was that obtained from the upstream project (i.e. you) and match your 1.0.2 tag? >>> >>> Yes. Isn't that what the text above says? >> >> Well, the patch does not update git_multi

git-rebase doesn't forward --quiet to git-checkout

2015-04-27 Thread Sam Cates
STEPS TO REPRODUCE: 1. git checkout master 2. git rebase --quiet master topic EXPECTED RESULTS: The checkout and rebase occur with no output. ACTUAL RESULTS: The output from the checkout is not suppressed. Thanks, Sam -- To unsubscribe from this list: send the line "unsubscribe git" in the body

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Matthieu Moy
Junio C Hamano writes: > Hmm, that may be technically correct but it is grossly misleading to > update the existing "was obtained on 2014-04-07" to "was obtained on > 2015-04-27", especially if nothing was actually obtained, isn't it? That is because you're looking at the patch. The intended aud

Re: [PATCH] blame: add blame.showemail config option

2015-04-27 Thread Eric Sunshine
On Mon, Apr 27, 2015 at 2:10 PM, Junio C Hamano wrote: > Quentin Neill writes: >> Eric Sunshine writes: >>> Quentin Neill writes: - if (opt & OUTPUT_SHOW_EMAIL) + if ((opt & OUTPUT_SHOW_EMAIL) || show_email) >>> >>> The desired behavior is f

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread Torsten Bögershausen
On 04/27/2015 07:47 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> I suspect (I haven't looked very carefully for this round yet to be >> sure, though) that it may turn out that the commit you are proposing >> to revert was a misguided attempt to "fix" a non issue, or to break >> the beha

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread Torsten Bögershausen
On 04/27/2015 08:58 PM, Johannes Sixt wrote: > Am 27.04.2015 um 08:11 schrieb Stepan Kasal: >> Git does not support CRLF as the internal line separator. >> If you commit file in binary mode with CRLF, you are on your own. > > When I commit my C source code files with CRLF into the repository (beca

GSoC 2015: 2 accepted proposals

2015-04-27 Thread Matthieu Moy
Hi, The results just got offical: the Git organization has 2 students accepted for the summer of code 2015. Karthik Nayak will work on "Unifying git branch -l, git tag -l, and git for-each-ref" mentored by Christian Couder and yours truly. Paul Tan will work on "Make git-pull and git-am builtins

Re: [PATCH] blame: add blame.showemail config option

2015-04-27 Thread Eric Sunshine
On Mon, Apr 27, 2015 at 9:46 AM, Quentin Neill wrote: > On Fri, Apr 24, 2015 at 12:22 AM, Eric Sunshine > wrote: >> It's not clear why you relocated documentation of --show-email from >> git-blame.txt to blame-options.txt, and the commit message does not >> explain the move. If there's a good re

[ANNOUNCE] Git v2.3.7

2015-04-27 Thread Junio C Hamano
The latest maintenance release Git v2.3.7 is now available at the usual places. Hopefully this will be the last v2.3.x update until the master front is tagged as v2.4 final. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a

What's cooking in git.git (Apr 2015, #04; Mon, 27)

2015-04-27 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. I'll merge two small documentation follow-up to the new features in 2.4.0 (mg/status-v-v and nd/versioncmp-prereleases topics) to 'master' and t

Re: [PATCH] Update git-multimail to version 1.0.2

2015-04-27 Thread Michael Haggerty
On 04/27/2015 09:05 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Junio C Hamano writes: >> [...] >>> Well, the patch does not update git_multimail.py at all. Requoting >>> the part you omitted from my response >>> >>> $ git rev-list -1 master contrib/hooks/multimail/ >>> b513f7

Re: Rebasing with submodule change causes red herring with --continue

2015-04-27 Thread Robert Dailey
On Thu, Apr 23, 2015 at 5:43 PM, John Keeping wrote: > On Thu, Apr 23, 2015 at 09:35:38PM +0100, John Keeping wrote: >> On Thu, Apr 23, 2015 at 09:43:44PM +0200, Jens Lehmann wrote: >> > Am 23.04.2015 um 21:07 schrieb Robert Dailey: >> > > On Thu, Apr 23, 2015 at 1:17 PM, Robert Dailey >> > > wr

[PATCH] git-p4: prevent --chain-lint failure

2015-04-27 Thread Luke Diamand
t9814 has a test that simply sets up a pre-requisite for another test, and as such, always succeeds. The way it was written doesn't quite work with the test lint checks introduced with the --chain-lint option. Add an additional layer of {} to prevent the --chain-lint code getting confused. Signed

[PATCH] Fixup test-lint error in git-p4 t9814 test

2015-04-27 Thread Luke Diamand
While running the git-p4 tests, I noticed that t9814 has started failing due to the (very ingenious!) chain-lint detection introduced in: bb79af9 t/test-lib: introduce --chain-lint option I think that what's going on is that the chain-lint test is getting itself confused by this test, which is

Re: [PATCH] git-p4: prevent --chain-lint failure

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 11:20:28PM +0100, Luke Diamand wrote: > t9814 has a test that simply sets up a pre-requisite for > another test, and as such, always succeeds. The way it was > written doesn't quite work with the test lint checks introduced > with the --chain-lint option. > > Add an additi

Re: Regular Rebase Failure

2015-04-27 Thread Stefan Beller
[+mailing list, so others can also chime in and have an answer/opinion] On Mon, Apr 27, 2015 at 10:07 AM, Adam Steel wrote: > Stefan, > > So I switched git versions. > > $ git --version > git version 2.3.1 > > I'm still getting the same regular rebase failures. > > --- > > fatal: Unable to create

Re: [PATCH/RFC] blame: CRLF in the working tree and LF in the repo

2015-04-27 Thread brian m. carlson
On Mon, Apr 27, 2015 at 10:47:29AM -0700, Junio C Hamano wrote: > The original says this: > > blame: correctly handle files regardless of autocrlf > > If a file contained CRLF line endings in a repository with > core.autocrlf=input, then blame always marked lines as "Not > Com

curl

2015-04-27 Thread Thiago Farina
Hi, Is it right that git uses libcurl to download while libgit2 does without it? -- Thiago Farina -- 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 v3 3/3] connect: improve check for plink to reduce false positives

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 08:30:12PM +, brian m. carlson wrote: > The git_connect function has code to handle plink and tortoiseplink > specially, as they require different command line arguments from > OpenSSH (-P instead of -p for ports; tortoiseplink additionally requires > -batch). However,

Re: [PATCH v3 0/3] Improve robustness of putty detection

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 03:04:56PM -0700, Junio C Hamano wrote: > The test scripts are expected to take either 3 or 4 parameters, and > the extra parameter when it takes 4 is the comma separated list of > prerequisites. "bracketed hostnames are still ssh" does not look > like prerequisites at all

Re: [PATCH 5/5] ref_transaction_commit(): only keep one lockfile open at a time

2015-04-27 Thread Jeff King
On Sat, Apr 25, 2015 at 12:21:07PM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > I am not too worried about "push --atomic", as we can just add a few > > words to Release Notes and documentation saying "this is still an > > experimental broken code that is unusable; don't use the f

Re: curl

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 11:49:51PM -0300, Thiago Farina wrote: > Is it right that git uses libcurl to download while libgit2 does without it? I'm not sure if you mean "right" as in "this statement is true" or as in "is this a good thing that it is the case". For the former, yes, libgit2 does not

[PATCH] rebase: silence "git checkout" for noop rebase

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 12:05:41PM -0700, Sam Cates wrote: > STEPS TO REPRODUCE: > 1. git checkout master > 2. git rebase --quiet master topic > > EXPECTED RESULTS: > The checkout and rebase occur with no output. > > ACTUAL RESULTS: > The output from the checkout is not suppressed. Can you be m

Re: Fwd: Can't override username of default credential context to have different username in custom context.

2015-04-27 Thread Jeff King
[+cc Kyle, who I forgot on the initial send. Oops!] On Tue, Apr 28, 2015 at 01:25:02AM -0400, Jeff King wrote: > On Mon, Apr 27, 2015 at 09:19:31PM +0500, Vladislav Kostenko wrote: > > > Here is my scenario: > > > > 1. First I set default username > > git config --global credential.username myU

Re: Fwd: Can't override username of default credential context to have different username in custom context.

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 09:19:31PM +0500, Vladislav Kostenko wrote: > Here is my scenario: > > 1. First I set default username > git config --global credential.username myUsername > > 2. Then I want to have different username for my other repository > git config --global > credential.https://myO

Re: Question about how git determines the minimum packfile for a push.

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 12:41:28AM +, Brad Litterell wrote: > Is it possible git is not computing the delta correctly? Or does git > only look at the top-level commit objects to figure out what to > include in the push packfile? It's the latter. Junio mentioned that "push" is not as thorough

Re: [PATCH v2] git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array

2015-04-27 Thread Jeff King
On Mon, Apr 27, 2015 at 10:56:30AM -0700, Junio C Hamano wrote: > Elia Pinto writes: > > > This is the second version of this patch. It had not been > > discussed before. In the second version, I just tried to clarify > > the comment in the commit. I resend it just in case you missed > > I do

Re: Bug report : bad filter-branch (OSX only)

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 11:25:52AM +0200, Olivier ROLAND wrote: > OSX 10.10.3 git 2.3.6 HFS+ case-sensitive > > How to reproduce : > Step 1 : git clone https://github.com/begeric/FastParsers.git > Step 2 : cd FastParsers/ > Step 3 : git filter-branch --env-filter 'if [ 0 = 1 ]; then echo 0; fi' -

Re: [PATCH v5 2/5] setup: sanity check file size in read_gitfile_gently

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 08:49:42AM +0200, Erik Elfström wrote: > read_gitfile_gently will allocate a buffer to fit the entire file that > should be read. Add a sanity check of the file size before opening to > avoid allocating a potentially huge amount of memory if we come across > a large file th

Re: [PATCH v5 1/5] setup: add gentle version of read_gitfile

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 08:49:41AM +0200, Erik Elfström wrote: > -extern const char *read_gitfile(const char *path); > + > +#define READ_GITFILE_ERR_STAT_FAILED 1 > +#define READ_GITFILE_ERR_NOT_A_FILE 2 > +#define READ_GITFILE_ERR_OPEN_FAILED 3 > +#define READ_GITFILE_ERR_READ_FAILED 4 > +#define

Re: [PATCH v5 5/5] clean: improve performance when removing lots of directories

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 08:49:45AM +0200, Erik Elfström wrote: > +/* > + * Return 1 if the given path is the root of a git repository or > + * submodule else 0. Will not return 1 for bare repositories with the > + * exception of creating a bare repository in "foo/.git" and calling > + * is_git_rep

[PATCHv2] git-p4: t9814: prevent --chain-lint failure

2015-04-27 Thread Luke Diamand
Use test_lazy_prereq to setup prerequisites for the p4 move test. This both makes the test simpler and clearer, and also means they no longer fail the new --chain-lint tests. Suggested-by: Jeff King Signed-off-by: Luke Diamand --- t/t9814-git-p4-rename.sh | 11 +++ 1 file changed, 3 ins

[PATCHv2] Fixup test-lint error in git-p4 t9814 test

2015-04-27 Thread Luke Diamand
Using Jeff's suggestion of converting the t9814 test to use test_lazy_prereq makes the test a lot clearer, and as a bonus, also fixes the --chain-lint error. Thanks, Luke Luke Diamand (1): git-p4: t9814: prevent --chain-lint failure t/t9814-git-p4-rename.sh | 11 +++ 1 file changed, 3

Re: [PATCH v5 4/5] p7300: add performance tests for clean

2015-04-27 Thread Jeff King
On Sun, Apr 26, 2015 at 08:49:44AM +0200, Erik Elfström wrote: > diff --git a/t/perf/p7300-clean.sh b/t/perf/p7300-clean.sh > new file mode 100755 > index 000..6ae55ec > --- /dev/null > +++ b/t/perf/p7300-clean.sh > @@ -0,0 +1,31 @@ > +#!/bin/sh > + > +test_description="Test git-clean performa