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

2015-11-25 Thread Marc Strapetz
On 24.11.2015 17:58, Carlos Martín Nieto wrote: On 23 Nov 2015, at 19:59, Marc Strapetz wrote: 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

Bug: Incorrect stripping of the [PATCH] prefix in git-am

2015-11-25 Thread huebbe
Description: When applying a patch created via `git format-patch` with `git am`, any prefix of the commit message that's within square brackets is stripped from the commit message. Reproduction: $ git log --oneline --decorate --graph --all * b41514b (HEAD) [baz] baz | * 5e31740

Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am

2015-11-25 Thread stefan.naewe
Am 25.11.2015 um 16:29 schrieb huebbe: > Description: > > When applying a patch created via `git format-patch` with `git am`, > any prefix of the commit message that's within square brackets is stripped > from the commit message. As advertised in the man page of 'git am' (or 'git mailinfo' that

Re: Bug: Incorrect stripping of the [PATCH] prefix in git-am

2015-11-25 Thread huebbe
Yes, it looks like the `--keep-non-patch` option works around this. However, shouldn't that be the default behaviour? I mean, what is the point in stripping stuff that is not proven to be inserted by `git` itself? That's not what I expect a tool to do which I trust. Cheers, Nathanael On

Re: [PATCH v2] wt-status: correct and simplify check for detached HEAD

2015-11-25 Thread Matthieu Moy
René Scharfe writes: > diff --git a/wt-status.c b/wt-status.c > index 435fc28..ced53dd 100644 > --- a/wt-status.c > +++ b/wt-status.c > @@ -1317,15 +1317,14 @@ static int grab_1st_switch(unsigned char *osha1, > unsigned char *nsha1, > target += strlen(" to "); >

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 2:30 PM, Jens Lehmann wrote: >> >> >> I like the concept of subgroups as it allows to have some control over >> subsubmodules you may want to aggregate from a third party via the >> middleman submodule. > > > That's the point (though maybe someone

Signed tags and git repository

2015-11-25 Thread Stephen & Linda Smith
I've been following commits to the linux and git repostitories for some time. I used signed tags for projects that I'm working on. I know that the linux and git repositories have signed tags, but I'm not able to verify them because my key isn't signed by anyone that leads back to one of

Re: [PATCHv2] builtin/clone: support submodule groups

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 4:31 PM, Stefan Beller wrote: > This passes each group to the `submodule update` invocation and > additionally configures the groups to be automatically updated. > > Signed-off-by: Stefan Beller > --- > > This is a resend of the

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 21:03 schrieb Stefan Beller: On Wed, Nov 25, 2015 at 11:50 AM, Jens Lehmann wrote: My thinking is that groups are implying recursive, whereas recursive implies "all groups", so a git clone --group --recursive makes not much sense to me as it begs the

[PATCHv2] builtin/clone: support submodule groups

2015-11-25 Thread Stefan Beller
This passes each group to the `submodule update` invocation and additionally configures the groups to be automatically updated. Signed-off-by: Stefan Beller --- This is a resend of the patch "[PATCH 5/5] builtin/clone: support submodule groups" as that's where Jens and I

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This is also available at https://github.com/stefanbeller/git/tree/submodule-groups It applies on top of the submodule-parallel-patch series I sent a few minutes ago. Consider having a real large software project in Git with each component in a

diff --minimal versus --diff-algorithm=minimal

2015-11-25 Thread Дилян Палаузов
Hello, after I put in ~/.config/git "[diff] algorithm=histogram", and called "git diff --minimal" I expect from git to use algorithm=minimal. But it uses histogram, unless I call "--diff-algorithm=minimal". According to the documentation, however, --minimal and --diff-algorithm=minimal

Re: Signed tags and git repository

2015-11-25 Thread Johannes Löthberg
On 25/11, Stephen & Linda Smith wrote: I know that the linux and git repositories have signed tags, but I'm not able to verify them because my key isn't signed by anyone that leads back to one of the git or linux maintainers. Your key would only have to be signed for others to be able to

arbitrary memory allocation

2015-11-25 Thread ytrezq
Hello, First, something I still don t understand, should I always ulimit ram usage for security purposes when I m manage a public server? If not, you may find the attachment interesting#!/usr/bin/python from socket import * import sys,time if len(sys.argv)!=3: print "Ok, it is not a real memory

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This passes each group to the `submodule update` invocation and additionally configures the groups to be automatically updated. Signed-off-by: Stefan Beller --- Documentation/git-clone.txt | 11 builtin/clone.c

Re: Sparse checkout in worktree

2015-11-25 Thread Michael J Gruber
Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: > On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber > wrote: >> Hi there, >> >> I'm wondering how much it would take to enable worktree specific sparse >> checkouts. From a superfluous look: >> >> -

Re: Git super slow on Windows 7

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 10:42 AM, Lars Schneider wrote: > After some investigation I figured that ~50 Submodules are the culprit. > Does anyone have an idea how to speed up Git on Windows while keeping 50 > Submodules? > > Thanks, > Lars > > Use the latest version of

Re: Sparse checkout in worktree

2015-11-25 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber wrote: > Hi there, > > I'm wondering how much it would take to enable worktree specific sparse > checkouts. From a superfluous look: > > - $GIT_DIR/info/sparse_checkout needs to be worktree specific It already is. > -

Re: [PATCH 1/3] prepare_packed_git(): find more garbage

2015-11-25 Thread Stefan Beller
On Fri, Nov 13, 2015 at 4:46 PM, Doug Kelly wrote: > return "no corresponding .idx"; > - case PACKDIR_FILE_IDX: > + else if (seen_bits & PACKDIR_FILE_IDX && seen_bits ^ > ~PACKDIR_FILE_PACK) Did you intend to use (seen_bits & PACKDIR_FILE_IDX

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 19:08 schrieb Stefan Beller: On Wed, Nov 25, 2015 at 9:52 AM, Jens Lehmann wrote: +--group:: + After the clone is created, all submodules which are part of the + group are cloned. This option can be given multiple times to specify +

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Stefan Beller
--cc Johannes Sixt On Wed, Nov 25, 2015 at 9:35 AM, Jens Lehmann wrote: >> [submodule "gcc"] >> path = gcc >> url = git://... >> groups = default,devel >> [submodule "linux"] >> path = linux >> url = git://... >> groups =

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
(Sorry for the resend of my last mail, but I received bounce messages from my email provider) Am 25.11.2015 um 19:00 schrieb Stefan Beller: --cc Johannes Sixt On Wed, Nov 25, 2015 at 9:35 AM, Jens Lehmann wrote: [submodule "gcc"] path = gcc url =

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-25 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 10:00 AM, Ævar Arnfjörð Bjarmason wrote: > On Wed, Nov 25, 2015 at 7:35 AM, Christian Couder > wrote: >> At Booking.com we know that mtime works everywhere and we don't >> want the untracked cache to stop working when a kernel

Re: [RFC PATCH 0/5] Submodule Groups

2015-11-25 Thread Jens Lehmann
Am 25.11.2015 um 02:32 schrieb Stefan Beller: This is also available at https://github.com/stefanbeller/git/tree/submodule-groups It applies on top of the submodule-parallel-patch series I sent a few minutes ago. Consider having a real large software project in Git with each component in a

Re: Git super slow on Windows 7

2015-11-25 Thread Lars Schneider
After some investigation I figured that ~50 Submodules are the culprit. Does anyone have an idea how to speed up Git on Windows while keeping 50 Submodules? Thanks, Lars > On 25 Nov 2015, at 13:35, Lars Schneider wrote: > > Hi Johannes, > > I am working with Git

A Survey on Git contribution strategies employed by Software Intensive Organizations

2015-11-25 Thread Hassan Munir
Hello Git community, I am studying OSS communities to investigate the OSS contributions strategies employed by the software-Intensive organizations. The idea is to see how contributions to OSS help software- Intensive organizations to gain value in relation to non-contributors. Therefore, a

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 9:52 AM, Jens Lehmann wrote: >> +--group:: >> + After the clone is created, all submodules which are part of the >> + group are cloned. This option can be given multiple times to >> specify >> + different groups. > > > Ah, that

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

2015-11-25 Thread Eric Sunshine
On Wed, Nov 25, 2015 at 7:10 AM, Karthik Nayak wrote: > On Tue, Nov 24, 2015 at 5:14 AM, Eric Sunshine > wrote: >> On Wed, Nov 11, 2015 at 2:44 PM, Karthik Nayak wrote: >>> Introduce a parsing function for each atom in

Re: Git super slow on Windows 7

2015-11-25 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 7:47 PM, Stefan Beller wrote: > On Wed, Nov 25, 2015 at 10:42 AM, Lars Schneider > wrote: >> After some investigation I figured that ~50 Submodules are the culprit. >> Does anyone have an idea how to speed up Git on Windows

[PATCH] convert.c: mark a file-local function static

2015-11-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Torsten, If you need to re-roll your 'tb/ls-files-eol' patch, could you please squash this into the patch. Thanks. ATB, Ramsay Jones convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/convert.c

[PATCH] builtin/ff-refs.c: mark some file-local variables static

2015-11-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Michael, If you need to re-roll the patches in your 'mr/ff-refs' branch, could you please squash parts of this patch into the relevant patches from your branch. Thanks. Also, I note that gcc complains about the two calls to

[PATCH] test_must_fail: compare exit_code using integer -eq operator

2015-11-25 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Jeff, Can we squash this into your fixup? ATB, Ramsay Jones t/test-lib-functions.sh | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index

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

2015-11-25 Thread Duy Nguyen
On Tue, Nov 24, 2015 at 6:57 PM, Stefan Beller wrote: > +to Nguyễn Thái Ngọc Duy > > On Mon, Nov 23, 2015 at 6:22 PM, Anthony Sottile wrote: >> * Short description of the problem * >> >> It seems GIT_WORK_DIR is now exported invariantly

opentracker bug

2015-11-25 Thread Username
Hello. I have found a bug in opentracker // http://erdgeist.org/gitweb/opentracker/ , or it is something wrong with my PC (?). Every time when I access statistics page at "localhost:6969/st?mode=everything", it redirects my browser to "http://www.localhost.com:6969/st?mode=everything; and

opentracker bug

2015-11-25 Thread Debian User
Hello. I have found a bug in opentracker // http://erdgeist.org/gitweb/opentracker/ , or it is something wrong with my PC (?). Every time when I access statistics page at "localhost:6969/st?mode=everything", it redirects my browser to "http://www.localhost.com:6969/st?mode=everything; and

Re: Sparse checkout in worktree

2015-11-25 Thread Michael J Gruber
Duy Nguyen venit, vidit, dixit 25.11.2015 21:17: > On Wed, Nov 25, 2015 at 8:44 PM, Michael J Gruber > wrote: >> Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: >>> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber >>> wrote: Hi there,

Re: Sparse checkout in worktree

2015-11-25 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 8:44 PM, Michael J Gruber wrote: > Duy Nguyen venit, vidit, dixit 25.11.2015 20:38: >> On Wed, Nov 25, 2015 at 1:40 PM, Michael J Gruber >> wrote: >>> Hi there, >>> >>> I'm wondering how much it would take to enable

Re: Sparse checkout in worktree

2015-11-25 Thread Duy Nguyen
On Wed, Nov 25, 2015 at 9:44 PM, Michael J Gruber wrote: > OTOH, config is common: core.sparseCheckout > So, the per worktree "switch" is the presence of the sparse-checkout file. Oh.. but yeah, splitting config file per worktree is on my todo list. Or you can help

Re: [PATCH 5/5] builtin/clone: support submodule groups

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 11:50 AM, Jens Lehmann wrote: > >> My thinking is that groups are implying recursive, whereas recursive >> implies >> "all groups", so a git clone --group --recursive >> makes not much sense to me as it begs the question, what does --recursive >>

Re: Git super slow on Windows 7

2015-11-25 Thread Stefan Beller
On Wed, Nov 25, 2015 at 12:23 PM, Duy Nguyen wrote: > On Wed, Nov 25, 2015 at 7:47 PM, Stefan Beller wrote: >> On Wed, Nov 25, 2015 at 10:42 AM, Lars Schneider >> wrote: >>> After some investigation I figured that ~50 Submodules

Re: [PATCH] notes: allow merging from arbitrary references

2015-11-25 Thread Jacob Keller
On Tue, Nov 24, 2015 at 3:42 PM, Jeff King wrote: > On Tue, Nov 24, 2015 at 05:47:09PM -0500, Jeff King wrote: > >> On Fri, Nov 13, 2015 at 08:34:22AM -0800, Jacob Keller wrote: >> >> > --- >> > I do not remember what version this was since it has been an age ago >> > that I sent

Re: Signed tags and git repository

2015-11-25 Thread Stephen & Linda Smith
On Thursday, November 26, 2015 04:56:00 AM Johannes Löthberg wrote: > You don't even need the Web of Trust though, you can just verify the > signature and then check that the key used to make the signature is the > correct one, Ok, but if I don't have a link to the Web or Trust, how do I know

Re: [PATCHv2] builtin/clone: support submodule groups

2015-11-25 Thread Trevor Saunders
On Wed, Nov 25, 2015 at 04:31:24PM -0800, Stefan Beller wrote: > This passes each group to the `submodule update` invocation and > additionally configures the groups to be automatically updated. > > Signed-off-by: Stefan Beller > --- > > This is a resend of the patch "[PATCH

[PATCH 1/3] prepare_packed_git(): find more garbage

2015-11-25 Thread Doug Kelly
.bitmap and .keep files without .idx/.pack don't make much sense, so make sure these are reported as garbage as well. At the same time, refactoring report_garbage to handle extra bits. Signed-off-by: Doug Kelly --- builtin/count-objects.c | 16 ++-- cache.h

Combining APPLE_COMMON_CRYPTO=1 and NO_OPENSSL=1 produces unexpected result

2015-11-25 Thread Jack Nagel
When compiling git on OS X (where APPLE_COMMON_CRYPTO=1 is the default) and specifying NO_OPENSSL=1, the resulting git uses the BLK_SHA1 implementation rather than the functions available in CommonCrypto. $ uname -a Darwin broadwell.local 15.0.0 Darwin Kernel Version 15.0.0: Sat Sep 19 15:53:46

Re: [PATCH v2] Documentation/git-update-index: add missing opts to synopsys

2015-11-25 Thread Christian Couder
On Wed, Nov 25, 2015 at 10:03 AM, Jeff King wrote: > On Wed, Nov 25, 2015 at 07:53:12AM +0100, Christian Couder wrote: > >> Untracked cache and split index related options should appear >> in the 'SYNOPSIS' section. >> >> These options are already documented in the 'OPTIONS'

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-25 Thread Christian Couder
Hi Johannes, On Wed, Nov 25, 2015 at 11:25 AM, Johannes Schindelin wrote: > Hi Christian, > > On Wed, 25 Nov 2015, Christian Couder wrote: > >> diff --git a/config.c b/config.c >> index 248a21a..d720b1f 100644 >> --- a/config.c >> +++ b/config.c >> @@ -691,6 +691,13

[PATCH v4] Documentation/git-update-index: add missing opts to synopsis

2015-11-25 Thread Christian Couder
Split index related options should appear in the 'SYNOPSIS' section. These options are already documented in the 'OPTIONS' section. Signed-off-by: Christian Couder --- This v4 contains only the split-index options and applies on top of the new master that already

Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)

2015-11-25 Thread John Keeping
On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > * jk/send-email-ssl-errors (2015-11-24) 1 commit > - send-email: enable SSL level 1 debug output > > Improve error reporting when SMTP TLS fails. > > Will merge to 'next'. Can you hold off on this one? I think my last-minute

Re: [PATCH v2] send-email: die if CA path doesn't exist

2015-11-25 Thread John Keeping
On Tue, Nov 24, 2015 at 06:35:36PM -0500, Jeff King wrote: > On Tue, Nov 24, 2015 at 11:31:40PM +, John Keeping wrote: > > > If the CA path isn't found it's most likely to indicate a > > misconfiguration, in which case accepting any certificate is unlikely to > > be the correct thing to do. >

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-25 Thread Johannes Schindelin
Hi Christian, On Wed, 25 Nov 2015, Christian Couder wrote: > diff --git a/config.c b/config.c > index 248a21a..d720b1f 100644 > --- a/config.c > +++ b/config.c > @@ -691,6 +691,13 @@ static int git_default_core_config(const char *var, > const char *value) > trust_ctime =

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-25 Thread Ævar Arnfjörð Bjarmason
On Wed, Nov 25, 2015 at 7:35 AM, Christian Couder wrote: > At Booking.com we know that mtime works everywhere and we don't > want the untracked cache to stop working when a kernel is upgraded > or when the repo is copied to a machine with a different kernel. > I will

Re: [PATCH v1] git rev-list doesn't complain when repo is empty

2015-11-25 Thread Jeff King
On Tue, Nov 24, 2015 at 11:00:53PM -0800, atous...@gmail.com wrote: > From: Atousa Pahlevan Duprat > > Signed-off-by: Atousa Pahlevan Duprat > --- > builtin/rev-list.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git

Re: [PATCH] wt-status: use strncmp() for length-limited string comparison

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 03:16:49AM +0100, René Scharfe wrote: > > Hmm. I think this is mostly harmless, as a comparison like: > > > >memcmp("HEAD and more", "HEAD", strlen("HEAD")) > [...] > > Yes, except it should be strlen("HEAD and more") in your example code; > with strlen("HEAD") it

Re: [PATCH v2] Documentation/git-update-index: add missing opts to synopsys

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 07:53:12AM +0100, Christian Couder wrote: > Untracked cache and split index related options should appear > in the 'SYNOPSIS' section. > > These options are already documented in the 'OPTIONS' section. > > Signed-off-by: Christian Couder > --- >

Re: Suspected bug on `git -C rev-list --all` where has 0 commits

2015-11-25 Thread Jeff King
On Tue, Nov 24, 2015 at 10:56:50PM -0800, Atousa Duprat wrote: > I agree with Yac that this error is unwarranted, though it's been like > that since forever. > If a repo is empty, git rev-list should probably just return without > erroring out. > The fix is trivial, if the list agrees that this

Re: What's cooking in git.git (Nov 2015, #04; Tue, 24)

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 10:13:42AM +, John Keeping wrote: > On Tue, Nov 24, 2015 at 08:07:23PM -0500, Jeff King wrote: > > * jk/send-email-ssl-errors (2015-11-24) 1 commit > > - send-email: enable SSL level 1 debug output > > > > Improve error reporting when SMTP TLS fails. > > > > Will

Re: [PATCH v2] send-email: die if CA path doesn't exist

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 10:19:09AM +, John Keeping wrote: > > > Changes since v1: > > > - add missing path to error message > > > - remove trailing '.' on error message since die appends "at > > > /path/to/git-send-email line ..." > > > > It won't if the error message ends with a newline.

'git log --source' seems to fail to show ref name after the first tag comes out.

2015-11-25 Thread Raymundo
Hello, At first, I'm sorry I'm not good at English. When I execute this command: git log --oneline --source --all --decorate I get the output below: (I replaced commit messages written in Korean with "COMMIT MSG") 295c670 refs/heads/gyparkwiki_base (gyparkwiki_base) COMMIT MSG c130d61

Re: [PATCH] wt-status: use strncmp() for length-limited string comparison

2015-11-25 Thread Matthieu Moy
Jeff King writes: >> diff --git a/wt-status.c b/wt-status.c >> index 435fc28..96a731e 100644 >> --- a/wt-status.c >> +++ b/wt-status.c >> @@ -1317,14 +1317,14 @@ static int grab_1st_switch(unsigned char *osha1, >> unsigned char *nsha1, >> target += strlen(" to "); >>

Re: [RFC] rename detection: allow more renames

2015-11-25 Thread Andreas Krey
Hi Jeff, thanks for the reply! On Tue, 24 Nov 2015 18:33:28 +, Jeff King wrote: ... > I didn't dig in the archive, but I think we discussed the "just show > progress for destinations" before. The problem you run into is that the > items aren't a good indication of the amount of work. You

[PATCH] typofix for Documentation/git-cherry-pick.txt

2015-11-25 Thread bin0515
From: Bin Chen Signed-off-by: Bin Chen --- Documentation/git-cherry-pick.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index

Re: [RFC] rename detection: allow more renames

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 01:03:15PM +0100, Andreas Krey wrote: > On Tue, 24 Nov 2015 18:33:28 +, Jeff King wrote: > ... > > I didn't dig in the archive, but I think we discussed the "just show > > progress for destinations" before. The problem you run into is that the > > items aren't a good

Git super slow on Windows 7

2015-11-25 Thread Lars Schneider
Hi Johannes, I am working with Git for Windows right now and it is dramatically slower than on OS X. I executed "time git status" on Windows and OS X with the same repository and the following results: ## Windows git version 2.6.3.windows.1 (with enabled experimental flag on install): real

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

2015-11-25 Thread Johannes Schindelin
Hi Beat, On Tue, 24 Nov 2015, Beat Bolli wrote: > On 24.11.15 23:43, Beat Bolli wrote: > > On 24.11.15 09:21, Johannes Schindelin wrote: > >> > >> On Mon, 23 Nov 2015, Beat Bolli wrote: > >> > >>> When merging files in repos with core.eol = crlf, git merge-file > >>> inserts just a LF at the end

Re: [PATCH] typofix for Documentation/git-cherry-pick.txt

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 08:05:11PM +0800, bin0...@gmail.com wrote: > `git cherry-pick master`:: > > - Apply the change introduced by the commit at the tip of the > + Apply the change introduced by the commit at the top of the > master branch and create a new commit with this

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

2015-11-25 Thread Karthik Nayak
On Tue, Nov 24, 2015 at 5:14 AM, Eric Sunshine wrote: > 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.

Re: [PATCH/RFC 00/10] ref-filter: use parsing functions

2015-11-25 Thread Karthik Nayak
On Wed, Nov 25, 2015 at 3:18 AM, Jeff King wrote: > On Thu, Nov 12, 2015 at 01:14:26AM +0530, Karthik Nayak wrote: > >> Karthik Nayak (10): >> ref-filter: introduce a parsing function for each atom in valid_atom >> ref-filter: introduce struct used_atom >> ref-fitler: bump

Sparse checkout in worktree

2015-11-25 Thread Michael J Gruber
Hi there, I'm wondering how much it would take to enable worktree specific sparse checkouts. From a superfluous look: - $GIT_DIR/info/sparse_checkout needs to be worktree specific - We don't have much tooling around sparse to speak of at all. The endgoal would be to have something like git

Re: 'git log --source' seems to fail to show ref name after the first tag comes out.

2015-11-25 Thread Raymundo
2015-11-25 21:59 GMT+09:00 Jeff King : > > Sounds like a good opportunity to use git-bisect. I came up with 2073949 > (traverse_commit_list: support pending blobs/trees with paths, > 2014-10-15) from git v2.2.0, which unfortunately was written by me. :) > > This one-liner seems to

Re: 'git log --source' seems to fail to show ref name after the first tag comes out.

2015-11-25 Thread Jeff King
On Wed, Nov 25, 2015 at 07:29:02PM +0900, Raymundo wrote: > At first, I'm sorry I'm not good at English. No problem. Your report was very clear. :) > When I execute this command: > > git log --oneline --source --all --decorate > [...] > As you can see, ref names in the second column repeats to

[PATCH/RFC 10/10] ref-filter: introduce objectname_atom_parser()

2015-11-25 Thread Karthik Nayak
Introduce objectname_atom_parser() which will parse the '%(objectname)' atom and store information into the 'used_atom' structure based on the modifiers used along with the atom. Signed-off-by: Karthik Nayak --- ref-filter.c | 42 +++---

[PATCH v2] wt-status: correct and simplify check for detached HEAD

2015-11-25 Thread René Scharfe
If a branch name is longer than four characters then memcmp() reads over the end of the static string "HEAD". This causes the following test failures with AddressSanitizer: t3203-branch-output.sh (Wstat: 256 Tests: 18 Failed: 4) Failed tests: 12, 15-17 Non-zero

Re: [RFC/PATCH] config: add core.trustmtime

2015-11-25 Thread Christian Couder
Hi Duy, On Wed, Nov 25, 2015 at 8:51 PM, Duy Nguyen wrote: > On Wed, Nov 25, 2015 at 10:00 AM, Ævar Arnfjörð Bjarmason > wrote: >> On Wed, Nov 25, 2015 at 7:35 AM, Christian Couder >> wrote: >>> At Booking.com we know that mtime

допоможіть нашому сайту http://guru.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

2015-11-25 Thread admin
Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://guru.pp.ua/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли заплатити

Re: [PATCH 1/3] prepare_packed_git(): find more garbage

2015-11-25 Thread Doug Kelly
Apparently, I fixed this and forgot to re-run format-patch, so I sent out the same patch the second time... My fault on that one. I've at least checked what I sent this time around, and it seems to match what's in my current tree. :) The second and third patches should be unmodified. Thanks for