Re: Standardization of messages - dot after the sentence

2015-09-07 Thread Michael J Gruber
sigo venit, vidit, dixit 05.09.2015 14:22: > I've found really "little bug" with dots in the git output. > > $ git push > Everything up-to-date > > git pull > Already up-to-date. > > Could all phrases contain dots? :) > In this case, also both messages mean the same but are phrased

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

2015-09-07 Thread Junio C Hamano
Karthik Nayak writes: > diff --git a/Documentation/git-for-each-ref.txt > b/Documentation/git-for-each-ref.txt > index d039f40..c5154bb 100644 > --- a/Documentation/git-for-each-ref.txt > +++ b/Documentation/git-for-each-ref.txt > @@ -128,13 +128,14 @@ color:: > are

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

2015-09-07 Thread Matthieu Moy
Junio C Hamano writes: > I am flexible with the terminology, but the point is that I think > the quoting rules are better be specified _outside_ the description > of a particular atom, but as a general rule. I agree, but for now we have only one %($open) ... %(end) pair, so

[PATCH v3 0/5] git-p4: add support for large file systems

2015-09-07 Thread larsxschneider
From: Lars Schneider Diff to v2: * add proper commit messages * split commits into generic large file system and GitLFS implementation * improve docs, mention clean/smduge filter and add example for clean checkout * fix spelling * add option to push large files to

[PATCH v3 4/5] git-p4: add support for large file systems

2015-09-07 Thread larsxschneider
From: Lars Schneider Perforce repositories can contain large (binary) files. Migrating these repositories to Git generates very large local clones. External storage systems such as Git LFS [1], Git Fat [2], or Git Media [2] try to address this problem. Add a generic

[PATCH v3 5/5] git-p4: add Git LFS backend for large file system

2015-09-07 Thread larsxschneider
From: Lars Schneider Add example implementation including test cases for the large file system using Git LFS. Pushing files to the Git LFS server is not tested. Signed-off-by: Lars Schneider --- Documentation/git-p4.txt | 4 +- git-p4.py

[PATCH v3 1/5] git-p4: add optional type specifier to gitConfig reader

2015-09-07 Thread larsxschneider
From: Lars Schneider The functions “gitConfig” and “gitConfigBool” are almost identical. Make “gitConfig” more generic by adding an optional type specifier. Use the type specifier “—bool” with “gitConfig” to implement “gitConfigBool. This prepares the implementation

[PATCH v3 3/5] git-p4: return an empty list if a list config has no values

2015-09-07 Thread larsxschneider
From: Lars Schneider Signed-off-by: Lars Schneider --- git-p4.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/git-p4.py b/git-p4.py index 40ad4ae..90d3b90 100755 --- a/git-p4.py +++ b/git-p4.py @@ -638,6 +638,8 @@ def

[PATCH v3 2/5] git-p4: add gitConfigInt reader

2015-09-07 Thread larsxschneider
From: Lars Schneider Add a git config reader for integer variables. Please note that the git config implementation automatically supports k, m, and g suffixes. Signed-off-by: Lars Schneider --- git-p4.py | 11 +++ 1 file changed, 11

Bug: git-upload-pack will return successfully even when it can't read all references

2015-09-07 Thread Ævar Arnfjörð Bjarmason
We have a process to back up our Git repositories at work, this started alerting because it wasn't getting the same refs as the remote. This turned out to be a pretty trivial filesystem error. refs/heads/master wasn't readable by the backup process, but some other stuff in refs/heads and

Re: [PATCH v1 0/2] contrib/subtree: make it respect spaces in a repository path

2015-09-07 Thread Alexey Shumkin
On Fri, Sep 04, 2015 at 04:08:06PM -0700, Junio C Hamano wrote: > Alexey Shumkin writes: > > > Some repositories may have spaces in their paths. Currently `git-subtree` > > raises an error in such cases. > > Also, `git-subtree` currently does not have tests for its 'push'

[PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-07 Thread Gábor Bernát
From: Gabor Bernat adds seconds progress and estimated seconds time if getting the current timestamp is supported by the date %+s command Signed-off-by: Gabor Bernat --- I've submitted this first to this list as a feature request,

[PATCH v1 0/2] git-p4: handle "Translation of file content failed"

2015-09-07 Thread larsxschneider
From: Lars Schneider Hi, this patch fixes the P4 "Translation of file content failed" error. Unfortuantly I was not able to generate a P4 test repository to reproduce the error with a test case. An Internet search shows that this error happens in the wild:

[PATCH v1 2/2] git-p4: handle "Translation of file content failed"

2015-09-07 Thread larsxschneider
From: Lars Schneider A P4 repository can get into a state where it contains a file with file type UTF16 that does not not contain valid UTF16 characters. If git-p4 attempts to retrieve the file as UTF16 from P4 then the process crashes with a "Translation of file

[PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-07 Thread Gábor Bernát
From: Gabor Bernat adds seconds progress and estimated seconds time if getting the current timestamp is supported by the date +%s command Signed-off-by: Gabor Bernat --- I've submitted this first to this list as a feature request,

Re: bash completion lacks options

2015-09-07 Thread Ævar Arnfjörð Bjarmason
On Mon, Sep 7, 2015 at 5:07 PM, Olaf Hering wrote: > "git send-email --f" lacks --find-renames and others. Is the list > of possible options maintained manually? Yes, see contrib/completion/git-completion.bash. There's no code for send-email there, you (or someone) could submit

Re: bash completion lacks options

2015-09-07 Thread Olaf Hering
Am 07.09.2015 um 17:34 schrieb Ævar Arnfjörð Bjarmason: > On Mon, Sep 7, 2015 at 5:07 PM, Olaf Hering wrote: >> https://github.com/libguestfs/libguestfs/commit/0306c98d319d189281af3c15101c8d343e400f13 > > This is an interesting approach, but wouldn't help with git-send-email >

Re: [PATCH v2 2/5] enter_repo: avoid duplicating logic, use is_git_directory() instead

2015-09-07 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- The cover letter talks about "local clone", and in this entire series, I saw new tests only for the local case, but doesn't this and the next change also affect the case where a Git

Re: [PATCH v2 4/5] clone: allow --local from a linked checkout

2015-09-07 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Noticed-by: Bjørnar Snoksrud > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > builtin/clone.c | 6 -- > t/t2025-worktree-add.sh | 5 + > 2 files changed, 9 insertions(+), 2 deletions(-) > >

bash completion lacks options

2015-09-07 Thread Olaf Hering
"git send-email --f" lacks --find-renames and others. Is the list of possible options maintained manually? Perhaps this should be automated by placing the long strings in an ELF section, then filling variables like $__git_format_patch_options from such ELF section. An example how this was done in

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

2015-09-07 Thread Matthieu Moy
Karthik Nayak writes: > On Mon, Sep 7, 2015 at 12:03 PM, Junio C Hamano wrote: >>> diff --git a/builtin/tag.c b/builtin/tag.c >>> index 9fa1400..f55dfda 100644 >>> --- a/builtin/tag.c >>> +++ b/builtin/tag.c >>> @@ -43,8 +43,8 @@ static int

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-07 Thread Ramsay Jones
On 07/09/15 13:31, Gábor Bernát wrote: > From: Gabor Bernat > > adds seconds progress and estimated seconds time if getting the current > timestamp is supported by the date %+s command s/%+s/+%s/ ATB, Ramsay Jones -- To unsubscribe from this list: send the line

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

2015-09-07 Thread Karthik Nayak
On Mon, Sep 7, 2015 at 12:03 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> diff --git a/Documentation/git-for-each-ref.txt >> b/Documentation/git-for-each-ref.txt >> index d039f40..c5154bb 100644 >> --- a/Documentation/git-for-each-ref.txt >>

Improving auto conflict resolving while merge

2015-09-07 Thread KES
Hi. **To not apply big patches, I will supply links to public repository Lets start 1. git clone https://github.com/KES777/Plack 2. git show ed485bf75a6 Nothing interesting. Usual merge conflict while merge branch 'feature/doc_contribute' to 'master' But I was interested by this part:

Conditionally define vars to improve portability

2015-09-07 Thread Renato Botelho
Default variables used to build are set using = on Makefile, (e.g. CC, INSTALL, CFLAGS, …). GNU make overwrite these values if it’s passed as an argument (make CC=clang) and it works as expected. Default method of passing arguments for make operations on FreeBSD ports tree is using environment

Re: [PATCH v16 05/14] ref-filter: introduce match_atom_name()

2015-09-07 Thread Karthik Nayak
On Mon, Sep 7, 2015 at 1:22 AM, Eric Sunshine wrote: > On Sat, Sep 5, 2015 at 2:52 PM, Karthik Nayak wrote: >> Introduce match_atom_name() which helps in checking if a particular >> atom is the atom we're looking for and if it has a value attached

Subdividing an existing Repository

2015-09-07 Thread David A Cobb
Several Repositories I'm interested in, e.g. MINGW-PACKAGES@GITHUB, contain multiple "products." Usually, I'm only interested in one or two. I want to have a local repo with, e.g. iodbc from MinGW-Packages as sub-moules. I don't even need to keep local content for many of the other included

Re: Questions about git-push for huge repositories

2015-09-07 Thread Jeff King
On Mon, Sep 07, 2015 at 09:05:41AM +0800, Levin Du wrote: > > Instead, the object transfer is optimized by comparing what commits > > each side has and sending trees and blobs that are reachable from > > the commits that the receiving side does not have. > > The sender A sends all the commits

[PATCH, RESEND] gitk: adjust the menu line numbers to compensate for the new entry

2015-09-07 Thread Beat Bolli
Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Bolli

Re: Bug in default commit hook (improperly forbidding a single blank line at EOF)

2015-09-07 Thread Jeff King
On Mon, Sep 07, 2015 at 06:37:29PM -0700, Raymond Jennings wrote: > Please see https://bugs.gentoo.org/show_bug.cgi?id=559920 for further > details. > > Files *should* have a single blank line at the end, because a line should > always have a newline at the end. I'm not sure I follow. Lines

Bug in default commit hook (improperly forbidding a single blank line at EOF)

2015-09-07 Thread Raymond Jennings
Please see https://bugs.gentoo.org/show_bug.cgi?id=559920 for further details. Files *should* have a single blank line at the end, because a line should always have a newline at the end. Adding a newline to the end of a file whose last line doesn't have one should be legal...as long as you

Re: Bug in default commit hook (improperly forbidding a single blank line at EOF)

2015-09-07 Thread Raymond Jennings
On 09/07/15 21:55, Jeff King wrote: On Mon, Sep 07, 2015 at 06:37:29PM -0700, Raymond Jennings wrote: Please see https://bugs.gentoo.org/show_bug.cgi?id=559920 for further details. Files *should* have a single blank line at the end, because a line should always have a newline at the end. I'm

Re: Questions about git-push for huge repositories

2015-09-07 Thread Jeff King
On Tue, Sep 08, 2015 at 09:30:09AM +0800, Levin Du wrote: > Take kernel source code for example: > > # Clone the kernel to A and B > $ git --version > git version 2.3.2 > $ git clone --bare ../kernel/ A > $ git clone --bare ../kernel/ B OK, two repos with the same source. > # Create the

Re: [PATCH v16 00/14] port tag.c to use ref-filter APIs

2015-09-07 Thread Karthik Nayak
On Mon, Sep 7, 2015 at 7:35 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> On Mon, Sep 7, 2015 at 12:03 PM, Junio C Hamano wrote: diff --git a/builtin/tag.c b/builtin/tag.c index 9fa1400..f55dfda 100644

Re: [PATCH/RFC] Pinning of submodules

2015-09-07 Thread Anders Ro
On 07/09/15 22:13, Jens Lehmann wrote: > Am 07.09.2015 um 01:43 schrieb Eric Sunshine: >> On Sun, Sep 6, 2015 at 6:08 PM, Anders Ro >> wrote: >>> On 04/09/15 07:02, Eric Sunshine wrote: On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro

Re: Questions about git-push for huge repositories

2015-09-07 Thread Levin Du
I consider 'git push' need further optimization. Take kernel source code for example: # Clone the kernel to A and B $ git --version git version 2.3.2 $ git clone --bare ../kernel/ A $ git clone --bare ../kernel/ B # Create the orphan commit and check $ cd A $ git branch test Switched to a new

Re: [PATCH v3 0/5] git-p4: add support for large file systems

2015-09-07 Thread Luke Diamand
On 7 September 2015 at 13:21, wrote: > From: Lars Schneider > > One thing I don't like about the current implementation is that I don't see a > way to test the "git-p4.pushLargeFiles" config. I could start a git lfs server > locally but that

Re: [PATCH] filter-branch: add passed/remaining seconds on progress

2015-09-07 Thread Eric Sunshine
On Mon, Sep 7, 2015 at 9:52 AM, Gábor Bernát wrote: > From: Gabor Bernat > > adds seconds progress and estimated seconds time if getting the current > timestamp is supported by the date +%s command > > Signed-off-by: Gabor Bernat

Re: [PATCH] interpret-trailers: allow running outside a repository

2015-09-07 Thread Christian Couder
On Sat, Sep 5, 2015 at 3:39 PM, John Keeping wrote: > It may be useful to run git-interpret-trailers without needing to be in > a repository. Yeah, it looks like it works fine outside a repo. Tested-by: Christian Couder Thanks, Christian. -- To

Re: [PATCH/RFC] Pinning of submodules

2015-09-07 Thread Jens Lehmann
Am 07.09.2015 um 01:43 schrieb Eric Sunshine: On Sun, Sep 6, 2015 at 6:08 PM, Anders Ro wrote: On 04/09/15 07:02, Eric Sunshine wrote: On Wed, Sep 2, 2015 at 7:34 PM, Anders Ro wrote: git-submodule.sh: pin submodule when branch name is

[PATCH v1 1/2] git-p4: print stderr if P4 read_pipe operation fails

2015-09-07 Thread larsxschneider
From: Lars Schneider If read_pipe crashes then the caller can inspect the error and handle it appropriately. Signed-off-by: Lars Schneider --- git-p4.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-p4.py

Re: More builtin git-am issues..

2015-09-07 Thread Christian Couder
On Sat, Sep 5, 2015 at 9:39 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> To salvage "interpret-trailers" needs a lot more, as we are >> realizing that the definition that led to its external design does >> not match the way users use footers in

Re: [PATCH v16 06/14] ref-filter: implement an `align` atom

2015-09-07 Thread Karthik Nayak
On Mon, Sep 7, 2015 at 1:40 AM, Eric Sunshine wrote: > On Sat, Sep 5, 2015 at 2:52 PM, Karthik Nayak wrote: >> Implement an `align` atom which left-, middle-, or right-aligns the >> content between %(align:...) and %(end). >> >> It is followed by