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

2015-04-26 Thread Stepan Kasal
Hello, On Sun, Apr 26, 2015 at 10:31:11PM -0700, Junio C Hamano wrote: > [...] the commit you are proposing to revert [4d4813a5] > was a misguided attempt to "fix" a non issue, [...] yes, it was this. So I propose to remove the whole commit, including the test case and add two new test cases. D

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

2015-04-26 Thread Junio C Hamano
Torsten Bögershausen writes: > Although the intention of 4d4813a5 is good, it breaks > the usual EOL-handling for Windows. > Until we have a better solution, we suggest to revert it. That makes it sound like you are proposing to rob Peter to pay Paul, but that is not how we do things around here

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

2015-04-26 Thread Stepan Kasal
Hello, thank you Torsten for the patch [I'm the reporter, but could not do it myself] > -test_expect_success 'blaming files with CRLF newlines' ' > +test_expect_failure 'blaming files with CRLF newlines in repo, > core.autoclrf=input' ' Shouldn't the old test be rather removed? It deals with an

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

2015-04-26 Thread Junio C Hamano
On Sun, Apr 26, 2015 at 5:41 PM, 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? We walk the commit graph backwards to discover the common ancestries to

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

2015-04-26 Thread Brad Litterell
Hi, I'm using git with a submodule containing a (large) binary toolchain where I updated the version from GCC-4.7 to 4.8. When I added 4.8 I deleted 4.7 and now want to add 4.7 back to the HEAD. As shown in the tree objects below, the 4.7 bits are still in the repository (as expected), but wh

Re: git-p4 Question

2015-04-26 Thread Luke Diamand
On 24/04/15 15:36, FusionX86 wrote: I get an error if I misspell part of the path. For example, if I type //depot/maain instead of //depot/main I will get the "no such files" message you indicated. BUT using incorrect case like //depot/main instead of //depot/Main doesn't return any error, but st

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

2015-04-26 Thread Junio C Hamano
"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, we should also be able to improve the test framework to p

[PATCH v3 1/3] connect: simplify SSH connection code path

2015-04-26 Thread brian m. carlson
The code path used in git_connect pushed the majority of the SSH connection code into an else block, even though the if block returns. Simplify the code by eliminating the else block, as it is unneeded. Signed-off-by: Jeff King Signed-off-by: brian m. carlson --- connect.c | 42

[PATCH v3 2/3] t5601: fix quotation error leading to skipped tests

2015-04-26 Thread brian m. carlson
One of the tests in t5601 used single quotes to delimit an argument containing spaces. However, this caused test_expect_success to be passed three arguments instead of two, which in turn caused the test name to be treated as a prerequisite instead of a test name. As there was no prerequisite call

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

2015-04-26 Thread brian m. carlson
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 done by checking for "plink" anywhere in the string, which l

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

2015-04-26 Thread brian m. carlson
This series improves detection of plink (the putty utility). 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. Therefore, nobody noticed that the test was actually broken. brian m. carlson

Re: [PATCH v2 00/16] Convert parts of refs.c to struct object_id

2015-04-26 Thread Michael Haggerty
On 04/23/2015 01:24 AM, brian m. carlson wrote: > This is a conversion of parts of refs.c to use struct object_id. > > refs.c, and the for_each_ref series of functions explicitly, is the > source for many instances of object IDs in the codebase. Therefore, it > makes sense to convert this series

Re: [PATCH v2 2/2] connect: improve check for plink to reduce false positives

2015-04-26 Thread brian m. carlson
On Sat, Apr 25, 2015 at 06:03:22PM +0200, Torsten Bögershausen wrote: > (I'm not sute if the commit message describes the problem deep enough > for readers which are not familar with all the details of the original > report): > A feature implemented for Windows may break things for e.g. Linux users

Re: [PATCH RFC] add: Do not open editor if patch is empty

2015-04-26 Thread Eric Sunshine
On Sun, Apr 26, 2015 at 1:03 PM, Alexander Kuleshov wrote: > If we'll run 'git add -e ' on a path which has no > difference with the current index, empty editor will open. This > patch prevents this behaviour and checks that patch is not empty > before an editor with patch will be opened. > > Sign

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

2015-04-26 Thread Eric Sunshine
On Sun, Apr 26, 2015 at 8:02 AM, Torsten Bögershausen wrote: > A typicall setup under Windows: s/typicall/typical/ > core.eol is CRLF and a file is marked as "text" in .gitattributes. > > After 4d4813a5 "git blame" no longer works as expected, > every line is annotated as "Not Committed Yet", >

[PATCH RFC] add: Do not open editor if patch is empty

2015-04-26 Thread Alexander Kuleshov
If we'll run 'git add -e ' on a path which has no difference with the current index, empty editor will open. This patch prevents this behaviour and checks that patch is not empty before an editor with patch will be opened. Signed-off-by: Alexander Kuleshov --- builtin/add.c | 4 ++-- 1 file chan

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

2015-04-26 Thread Torsten Bögershausen
A typicall setup under Windows: core.eol is CRLF and a file is marked as "text" in .gitattributes. After 4d4813a5 "git blame" no longer works as expected, every line is annotated as "Not Committed Yet", even though the working directory is clean. commit 4d4813a5 removed the conversion in blame.c

Bug report : bad filter-branch (OSX only)

2015-04-26 Thread Olivier ROLAND
Hello, Seem to be a bug. 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' -- --all Result on OSX : Rewrite 65df7c5ac1ed95625