Re: [PATCH v3] ls-files: Add eol diagnostics

On Mon, Nov 23, 2015 at 6:05 PM, Torsten Bögershausen wrote: > or, as another example: > git ls-files -o --eol > i/ w/binaryattr/ zlib.o I see, somewhat convincing I have to agree. On another note, how about making the prefix either all just one

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

On Fri, Nov 20, 2015 at 10:58 PM, Torsten Bögershausen wrote: > On 2015-11-20 22.08, Stefan Beller wrote: > The patch looks good at first glance, one minor remark below: >> >> diff --git a/run-command.c b/run-command.c > >> @@ -1071,70 +1089,31 @@ static void pp_output(struct

Re: [PATCH v3] ls-files: Add eol diagnostics

On Mon, Nov 23, 2015 at 2:45 PM, Sebastian Schuberth wrote: > On Mon, Nov 23, 2015 at 6:05 PM, Torsten Bögershausen wrote: >> git ls-files -o --eol >> i/ w/binaryattr/ zlib.o > > I see, somewhat convincing I have to agree. > > On

branch --set-upstream-to unexpectedly fails with "starting point ... is no branch"

There is a strange "branch --set-upstream-to" failure for "clones" which haven't been created using "git clone" but constructed using "git init", "git remote add" and "git fetch". Following script first creates a "main" repository and then constructs the clone. Finally, in the clone branches

Best practice setup for github projects on server

Hi, I was hoping that somebody could give me advice since I'm new to git. I'll be installing a couple of projects from github on our servers, and adding some features. Should I create a repository on our server (e.g. in /opt/git/), add the github project as a remote, and create a branch?

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On 20/11/15 14:09, Jeff King wrote: What's cooking in git.git (Nov 2015, #03; Fri, 20) -- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.

[PATCH] http: treat config options sslCAPath and sslCAInfo as paths

From: Charles Bailey This enables ~ and ~user expansion for these config options. Signed-off-by: Charles Bailey --- In the only place that we (optionally) test https specifically, we also turn off SSL verification so I couldn't see a sensible

add support for --show-signature in gitk

Hi, the cli command `git log --show-signatures` has the nice feature of showing additional informations for signed commits. I want to add this informations into the gitk view of a commit. I already have finished a first draft of this here

[PATCH] filter-branch: deal with object name vs. pathname ambiguity in tree-filter

'git filter-branch' fails complaining about an ambiguous argument, if a tree-filter renames a path and the new pathname happens to match an existing object name. After the tree-filter has been applied, 'git filter-branch' looks for changed paths by running: git diff-index -r --name-only

Re: [PATCH v7 1/2] config.mak.uname: Darwin: define NO_GETTEXT for OS X 10.9 and later

On 11/23/2015 09:25 AM, larsxschnei...@gmail.com wrote: From: Lars Schneider At least since OS X 10.9 Mavericks "libintl.h" is not available on OS X anymore. Disable the support with the NO_GETTEXT flag. Signed-off-by: Lars Schneider ---

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

Hi Peff, On Fri, 20 Nov 2015, Jeff King wrote: > * pt/http-socks-proxy (2015-11-20) 1 commit > (merged to 'next' on 2015-11-20 at dc6ae48) > + remote-http(s): support SOCKS proxies > > Add support for talking http/https over socks proxy. > > Will cook in 'next'. With all due respect, I

[PATCH v7 2/2] Add Travis CI support

From: Lars Schneider The tests are currently executed on "Ubuntu 12.04 LTS Server Edition 64 bit" and on "OS X Mavericks" using gcc and clang. Perforce and Git-LFS are installed and therefore available for the respective tests. Signed-off-by: Lars Schneider

[PATCH v7 0/2] Add Travis CI support

From: Lars Schneider diff to v6 (thanks Peff for the review): * removed sub topics "de-flaking test_must_fail" and "p4 test improvements" as suggested by Peff * fixed Perforce spelling * disabled t9810 and t9816 in .travis.yml as they are instable * removed commented

[PATCH v7 1/2] config.mak.uname: Darwin: define NO_GETTEXT for OS X 10.9 and later

From: Lars Schneider At least since OS X 10.9 Mavericks "libintl.h" is not available on OS X anymore. Disable the support with the NO_GETTEXT flag. Signed-off-by: Lars Schneider --- config.mak.uname | 5 + 1 file changed, 5 insertions(+)

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On 11/20/2015 05:09 PM, Jeff King wrote: * vl/grep-configurable-threads (2015-11-01) 1 commit - grep: add --threads= option and grep.threads configuration "git grep" can now be configured (or told from the command line) how many threads to use when searching in the working tree files.

Re: [PATCH v4] blame: add support for --[no-]progress option

On 11/24/2015 02:07 AM, Edmundo Carmona Antoranz wrote: diff --git a/builtin/blame.c b/builtin/blame.c index 83612f5..1d43b52 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -28,6 +28,7 @@ #include "line-range.h" #include "line-log.h" #include "dir.h" +#include "progress.h"

Re: [PATCH v4] blame: add support for --[no-]progress option

On Mon, Nov 23, 2015 at 7:07 PM, Edmundo Carmona Antoranz wrote: > { > struct rev_info *revs = sb->revs; > struct commit *commit = prio_queue_get(>commits); > + struct progress_info *pi = NULL; Switched to using pointer to make it more elegant. -- To

Re: [PATCH/RFC 01/10] ref-filter: introduce a parsing function for each atom in valid_atom

On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: > Introduce a parsing function for each atom in valid_atom. Using this > we can define special parsing functions for each of the atoms. Since > we have a third field in valid_atom structure, we now fill out missing >

Re: [PATCH] git-send-email.perl: Fixed sending of many/huge changes/patches

On 2015-09-30 10:51, Junio C Hamano wrote: > Lars Wendler writes: > >> It seems to me that there is a size limit, after cutting down the patch >> to ~16K, sending started to work. I cut it twice, once by removing lines >> from the head and once from the bottom, in both

[PATCH v4] blame: add support for --[no-]progress option

* created struct progress_info in builtin/blame.c this struct holds the information used to display progress so that only one additional parameter is passed to found_guilty_entry(). * --[no-]progress option is also inherited by git-annotate. Signed-off-by: Edmundo Carmona Antoranz

Re: [PATCH 2/2] send-email: expand paths in sendemail.{to,cc}cmd config

On Tue, Nov 17, 2015 at 5:01 PM, John Keeping wrote: > These configuration variables specify the paths to commands so we should > support tilde-expansion for files inside a user's home directory. Hmm, I don't see anything in the documentation which says that these are paths

Re: git rm --recursive

On Wed, Nov 18, 2015 at 10:06 AM, Hans Ginzel wrote: > I have added the --recursive alias for the -r option to the rm command. When sending a patch, separate the patch itself from the above commentary with a scissor line (--- 8< ---) so that git-am can extract the patch

Fwd: Git clone fails during pre-commit hook due to GIT_WORK_TREE=. (regression 2.5 -> 2.6)

* Short description of the problem * It seems GIT_WORK_DIR is now exported invariantly when calling git hooks such as pre-commit. If these hooks involve cloning repositories they will not fail due to this exported environment variable. This was not the case in prior versions (such as v2.5.0).

[PATCHv2] git-p4: clean up after p4 submit failure

From: GIRARD Etienne When "p4 submit" command fails in P4Submit.applyCommit, the workspace is left with the changes. We already have code to revert the changes to the workspace when the user decides to cancel submission by aborting the editor that edits the change

[PATCHv2] git-p4: Handle p4 submit failure

This is a small reroll of Etienne's earlier patch to clean up the p4 repo on submit failure. The only difference is to fix the t9807- test. This test was trying to remove a file which had already been cleaned up as a result of this change. GIRARD Etienne (1): git-p4: clean up after p4 submit

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On Mon, Nov 23, 2015 at 02:09:42PM +0100, Johannes Schindelin wrote: > On Fri, 20 Nov 2015, Jeff King wrote: > > > * pt/http-socks-proxy (2015-11-20) 1 commit > > (merged to 'next' on 2015-11-20 at dc6ae48) > > + remote-http(s): support SOCKS proxies > > > > Add support for talking

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On Mon, Nov 23, 2015 at 12:02:35AM +0530, Karthik Nayak wrote: > > * kn/for-each-branch-remainder (2015-10-02) 9 commits > > - branch: implement '--format' option > > - branch: use ref-filter printing APIs > > - ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams > > -

Re: What's cooking in git.git (Nov 2015, #03; Fri, 20)

On Mon, Nov 23, 2015 at 09:06:32AM +, Luke Diamand wrote: > > Some commits need better explanation. > > > > Waiting for a reroll. > > > > > >* ld/p4-detached-head (2015-09-09) 2 commits > > - git-p4: work with a detached head > > - git-p4: add failing test for submit from detached head >

Re: branch --set-upstream-to unexpectedly fails with "starting point ... is no branch"

On 23.11.2015 18:04, Carlos Martín Nieto wrote: Hello Mark, On 23 Nov 2015, at 12:04, Marc Strapetz wrote: There is a strange "branch --set-upstream-to" failure for "clones" which haven't been created using "git clone" but constructed using "git init", "git remote

Re: [PATCHv2] run-command: detect finished children by closed pipe rather than waitpid

On Mon, Nov 23, 2015 at 10:44 AM, Stefan Beller wrote: > On Fri, Nov 20, 2015 at 10:58 PM, Torsten Bögershausen wrote: >> On 2015-11-20 22.08, Stefan Beller wrote: >> The patch looks good at first glance, one minor remark below: >>> >>> diff --git

Re: [PATCH v3] ls-files: Add eol diagnostics

On 22.11.15 09:20, Sebastian Schuberth wrote: > On 21.11.2015 08:36, Torsten Bögershausen wrote: > >> git ls-files --eol gives an output like this: >> >> i/text-no-eol w/text-no-eol attr/text=auto t/t5100/empty > > I'm sorry if this has been discussed before, but hav you considered to use a

Re: branch --set-upstream-to unexpectedly fails with "starting point ... is no branch"

Hello Mark, On 23 Nov 2015, at 12:04, Marc Strapetz wrote: > There is a strange "branch --set-upstream-to" failure for "clones" which > haven't been created using "git clone" but constructed using "git init", "git > remote add" and "git fetch". > > Following script

Re: [PATCH v3] ls-files: Add eol diagnostics

On Sat, Nov 21, 2015 at 2:36 AM, Torsten Bögershausen wrote: > When working in a cross-platform environment, a user wants to > check if text files are stored normalized in the repository and if > .gitattributes are set appropriately. > > Make it possible to let Git show the line

Re: [PATCH v6 0/6] Add Travis CI support

On 19/11/15 08:58, larsxschnei...@gmail.com wrote: From: Lars Schneider diff to v5: * check if PID file still exists on P4D cleanup (thanks Luke) * fix space/tab formatting error * add sleep to timeout loops (thanks Luke) * replace 'date +%s' with platform independent

Re: Best practice setup for github projects on server

On Mon, Nov 23, 2015 at 3:19 AM, Matthew Leach wrote: > Hi, > > I was hoping that somebody could give me advice since I'm new to git. > > I'll be installing a couple of projects from github on our servers, and > adding some features. So you take source code from github and

[PATCH] merge-file: consider core.crlf when writing merge markers

When merging files in repos with core.eol = crlf, git merge-file inserts just a LF at the end of the merge markers. Files with mixed line endings cause trouble in Windows editors and e.g. contrib/git-jump, where an unmerged file in a run of "git jump merge" is reported as simply "binary file

[PATCHv3] run-command: detect finished children by closed pipe rather than waitpid

Detect if a child stopped working by checking if their stderr pipe was closed instead of checking their state with waitpid. This resembles the way we work with child processes in the non-parallel case. Having a better consistency between the different methods to run child processes, is the main