Re: [PATCH v2 00/10] reroll of ap/log-mailmap

2013-01-08 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Antoine Pelisse apeli...@gmail.com writes: Have you been able to measure a speed increase due to less copies ? No. This topic was not strictly my itch, but I did the rewrite because I couldn't stand staring at that *_extended() function ;-) Now I

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Jan 8, 2013 at 1:54 PM, Junio C Hamano gits...@pobox.com wrote: Sounds buggy. Would anything break if we were to make --depth=1 mean 1 deep, including the tip commit? As long as we do not change the meaning of the shallow count going over the

Re: [PATCH] add warning for depth=0 in git clone.

2013-01-08 Thread Stefan Beller
Hi, I am struggling a little with the development process, is a sign-off strictly required for git as it is for kernel development? If so here would be my sign-off: Signed-off-by: Stefan Beller stefanbel...@googlemail.com This adds a warning and the previous patch adds the documentation.

Re: [PATCH] add warning for depth=0 in git clone.

2013-01-08 Thread Jonathan Nieder
Stefan Beller wrote: --- a/builtin/clone.c +++ b/builtin/clone.c @@ -818,6 +818,9 @@ int cmd_clone(int argc, const char **argv, const char *prefix) remote = remote_get(option_origin); transport = transport_get(remote, remote-url[0]); + if (option_depth

Re: [PATCH] add warning for depth=0 in git clone.

2013-01-08 Thread Jonathan Nieder
Stefan Beller wrote: I am struggling a little with the development process, is a sign-off strictly required for git as it is for kernel development? Yes. Documentation/SubmittingPatches has more hints. Signed-off-by: Stefan Beller stefanbel...@googlemail.com This adds a warning and the

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I think we need a protocol update to fix this; instead of sending Now I want your tips and N commits behind it, please update my shallow bottom accordingly, which creates the above by giving you Z and 3 generations back and updates your cut-off point

Re: [PATCH 1/8] Use %B for Split Subject/Body

2013-01-08 Thread greened
Junio C Hamano gits...@pobox.com writes: The question was about the lossage of the blank line, which does not seem to be related to what this patch wants to do. Ah, missed that. -# 25 +#25 Why the lossage of a SP? I think this got fixed later in the series. That is not a good excuse

Re: [PATCH 2/8] Add --unannotate

2013-01-08 Thread greened
Junio C Hamano gits...@pobox.com writes: gree...@obbligato.org writes: In the meantime, will you apply the patch or do you prefer a new design? The --unannotate option will become a baggage you will have to keep working until the end of time, if we applied it. I think it is not too uch a

[PATCH] upload-pack: only accept commits from shallow line

2013-01-08 Thread Nguyễn Thái Ngọc Duy
We only allow cuts at commits, not arbitrary objects. upload-pack will fail eventually in register_shallow if a non-commit is given with a generic error Object %s is a %s, not a commit. Check it early and give a more accurate error. This should never show up in an ordinary session. It's for buggy

Revised git-subtree Patches

2013-01-08 Thread David A. Greene
Here is the set of revised patches to git-subtree. I think I've got everything cleaned up now. -- 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

[PATCH 1/7] Remove Test Number Comments

2013-01-08 Thread David A. Greene
From: David A. Greene gree...@obbligato.org Delete the comments indicating test numbers as it causes maintenance headaches. t*.sh -i will help us find any broken tests. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 55

[PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-08 Thread David A. Greene
From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh

[PATCH 4/7] contrib/subtree: Better Error Handling for add

2013-01-08 Thread David A. Greene
From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 12 +--- 1 file changed, 9

[PATCH 3/7] contrib/subtree: Add --unannotate

2013-01-08 Thread David A. Greene
From: James Nylen jny...@gmail.com Teach git-subtree about --unannotate. This option strips a prefix from a commit message when doing a subtree split. Signed-off-by: James Nylen jny...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 11

[PATCH 5/7] contrib/subtree: Fix Synopsis

2013-01-08 Thread David A. Greene
From: David A. Greene gree...@obbligato.org Fix the documentation of add to show that a repository can be specified along with a commit. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6 ++

[PATCH 7/7] contrib/subtree: Make the Manual Directory if Needed

2013-01-08 Thread David A. Greene
From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Signed-off-by: Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |1 + 1 file changed, 1

[PATCH 6/7] contrib/subtree: Honor DESTDIR

2013-01-08 Thread David A. Greene
From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Signed-off-by: Adam Tkac at...@redhat.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH] fetch,upload-pack: make --depth=0 or --depth=inf for infinite depth

2013-01-08 Thread Nguyễn Thái Ngọc Duy
The user can do fetch --depth=2147483647 for infinite depth now. But it's hard to remember. Any other large numbers would also do if it's longer than the longest commit chain in repository (some guessing may be involved). Make --depth=0 or --depth=inf an alias for --depth=2147483647. JGit and

Understanding When to Use Branches

2013-01-08 Thread gw1500
As a git noobie I am beginning get get my head around git's version control philosophy. I am now trying to understand the purposes of branches or rather when to use them. In my case I have a Java application under version control with git. I am planning to port it into a mobile app. Is that an

Re: [PATCH] clone: forbid --bare --separate-git-dir dir

2013-01-08 Thread Duy Nguyen
On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote: Unfortunately we forgot to forbid the --bare --separate-git-dir combination. In practice, we know no one could be using --bare with --separate-git-dir because it is broken in the following way:

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Duy Nguyen
On Tue, Jan 8, 2013 at 2:36 PM, Junio C Hamano gits...@pobox.com wrote: Speaking of --depth, I think in Git 2.0 we should fix the semantics of deepening done with git fetch. Speaking of 2.0, we should support depth per ref. Well we don't have to wait until 2.0 because we could just add shallow2

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: Am 07.01.2013 02:39, schrieb Jonathan Nieder: (just cc-ing Jens and Peter, who might be interested) I´m currently working on teaching mv to move submodules and intend to send those patches to the list after finishing submodule

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Stefan Beller
On 01/08/2013 03:28 PM, Duy Nguyen wrote: On Tue, Jan 8, 2013 at 2:36 PM, Junio C Hamano gits...@pobox.com wrote: Speaking of --depth, I think in Git 2.0 we should fix the semantics of deepening done with git fetch. Speaking of 2.0, we should support depth per ref. Well we don't have to

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Duy Nguyen
On Tue, Jan 8, 2013 at 9:32 PM, Stefan Beller stefanbel...@googlemail.com wrote: On 01/08/2013 03:28 PM, Duy Nguyen wrote: On Tue, Jan 8, 2013 at 2:36 PM, Junio C Hamano gits...@pobox.com wrote: Speaking of --depth, I think in Git 2.0 we should fix the semantics of deepening done with git

[PATCH] remote-hg: Fix biridectionality - bidirectionality typos

2013-01-08 Thread W. Trevor King
Signed-off-by: W. Trevor King wk...@tremily.us --- I was looking for one of my older messages to the Git list, and I found this, which seems to have fallen through the cracks: On Wed, Nov 28, 2012 at 03:23:20PM -0500, W. Trevor King wrote: I'm not sure if this is the most recent patch iteration

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Tue, Jan 08, 2013 at 09:32:14AM -0500, W. Trevor King wrote: Thinking about this a bit more, I'm not clear on how out-of-tree updates (i.e. worktree in .git/modules/*/config) propogated during branch checkouts (merges, rebases, etc.). Actually, I don't understand why storing `worktree` in

Re: GIT get corrupted on lustre

2013-01-08 Thread Eric Chamberland
On 12/24/2012 10:11 AM, Brian J. Murrell wrote: Have you tried adding a -q to the git command line to quiet down git's feedback messages? Ok, I have modified my crontab to use -q and I will wait to see if the problem occurs from now. I discovered other oddities with using git on Lustre

Re: [PATCH] wincred: improve compatibility with windows versions

2013-01-08 Thread Karsten Blees
Am 04.01.2013 22:57, schrieb Erik Faye-Lund: On Fri, Jan 4, 2013 at 9:28 PM, Karsten Blees karsten.bl...@gmail.com wrote: On WinXP, the windows credential helper doesn't work at all (due to missing Cred[Un]PackAuthenticationBuffer APIs). On Win7, the credential format used by wincred is

git push --recurse-submodules=on-demand with submodule push tag

2013-01-08 Thread 乙酸鋰
Hi, In superproject, can I call git push --recurse-submodules=on-demand that pushes submodule with the submodule's tags? Very often I change version and tag the submodule and change version and tag the superproject at the same time. -- To unsubscribe from this list: send the line unsubscribe git

Invitation to use Google Talk

2013-01-08 Thread Google Talk
--- You've been invited by Sahil Mittal to use Google Talk. If you already have a Google account, login to Gmail and accept this chat invitation: http://mail.google.com/mail/b-b92f427051-793d4f02e1-Nt7jcnrXzIehJM3I3KZwb4sRS9c

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 15:32, schrieb W. Trevor King: On Mon, Jan 07, 2013 at 07:59:53AM +0100, Jens Lehmann wrote: Am 07.01.2013 02:39, schrieb Jonathan Nieder: (just cc-ing Jens and Peter, who might be interested) I´m currently working on teaching mv to move submodules and intend to send those

Re: [PATCH] clone: forbid --bare --separate-git-dir dir

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 15:16, schrieb Duy Nguyen: On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote: Unfortunately we forgot to forbid the --bare --separate-git-dir combination. In practice, we know no one could be using --bare with --separate-git-dir because it is

Re: Understanding When to Use Branches

2013-01-08 Thread Konstantin Khomoutov
On Tue, 08 Jan 2013 08:46:21 -0500 gw1500 wtriker@gmail.com wrote: As a git noobie I am beginning get get my head around git's version control philosophy. I am now trying to understand the purposes of branches or rather when to use them. In my case I have a Java application under version

Re: [PATCH] git clone depth of 0 not possible.

2013-01-08 Thread Junio C Hamano
Stefan Beller stefanbel...@googlemail.com writes: On 01/08/2013 03:28 PM, Duy Nguyen wrote: On Tue, Jan 8, 2013 at 2:36 PM, Junio C Hamano gits...@pobox.com wrote: Speaking of --depth, I think in Git 2.0 we should fix the semantics of deepening done with git fetch. Speaking of 2.0, we

Re: [PATCH] upload-pack: only accept commits from shallow line

2013-01-08 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: We only allow cuts at commits, not arbitrary objects. upload-pack will fail eventually in register_shallow if a non-commit is given with a generic error Object %s is a %s, not a commit. Check it early and give a more accurate error. This should

Re: [PATCH] remote-hg: Fix biridectionality - bidirectionality typos

2013-01-08 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: Signed-off-by: W. Trevor King wk...@tremily.us --- I was looking for one of my older messages to the Git list, and I found this, which seems to have fallen through the cracks: Thanks; didn't Documentation/SubmittingPatches ask you not to do PGP

Re: git push --recurse-submodules=on-demand with submodule push tag

2013-01-08 Thread Jens Lehmann
Am 08.01.2013 17:35, schrieb 乙酸鋰: In superproject, can I call git push --recurse-submodules=on-demand that pushes submodule with the submodule's tags? As that seems to call a plain git push in the submodule I think the tags won't be pushed by this command. Very often I change version and tag

Re: [PATCH] clone: forbid --bare --separate-git-dir dir

2013-01-08 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 08.01.2013 15:16, schrieb Duy Nguyen: On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote: Unfortunately we forgot to forbid the --bare --separate-git-dir combination. In practice, we know no one could be using --bare with

Re: Moving (renaming) submodules, recipe/script

2013-01-08 Thread W. Trevor King
On Tue, Jan 08, 2013 at 06:12:13PM +0100, Jens Lehmann wrote: Am 08.01.2013 15:32, schrieb W. Trevor King: The Git directory for the submodule stays in .git/modules/submod-1/ (good), but the worktree in .git/modules/submod-1/config still points to ../../../submod-1 (bad). You'll not

Re: [PATCH v4] git-completion.bash: add support for path completion

2013-01-08 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 05/01/2013 21:23, Marc Khouzam ha scritto: [...] 4- Completion choices include their entire path, which is not what bash does by default. For example: cd git/contrib ls completion/git-tab git-completion.bash git-completion.tcsh

Re: [PATCH] remote-hg: Fix biridectionality - bidirectionality typos

2013-01-08 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: On Tue, Jan 08, 2013 at 09:32:07AM -0800, Junio C Hamano wrote: Thanks; didn't Documentation/SubmittingPatches ask you not to do PGP multipart but send patches in plain text? Gah. I need to tell myself to reread that every time I send a patch :p. No

Re: [PATCH v4] git-completion.bash: add support for path completion

2013-01-08 Thread John Keeping
On Tue, Jan 08, 2013 at 06:54:09PM +0100, Manlio Perillo wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 05/01/2013 21:23, Marc Khouzam ha scritto: [...] 4- Completion choices include their entire path, which is not what bash does by default. For example: cd git/contrib ls

submodule name and path

2013-01-08 Thread 乙酸鋰
Hi, In doc, submodule name is not clearly mentioned? What is the purpose of submodule name? Must be same as submodule path? submodule path can be repeated, while submodule name unique? -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: [PATCH v4] git-completion.bash: add support for path completion

2013-01-08 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 08/01/2013 19:05, John Keeping ha scritto: [...] After some searching, I found how this is supposed to be done. It is possible to use the -o filenames option to tell Bash completion that the compspec generates filenames, so it can perform any

Re: submodule name and path

2013-01-08 Thread W. Trevor King
On Wed, Jan 09, 2013 at 02:17:42AM +0800, 乙酸鋰 wrote: In doc, submodule name is not clearly mentioned? What is the purpose of submodule name? Must be same as submodule path? submodule path can be repeated, while submodule name unique? The submodule name starts out the same as the submodule

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-08 Thread Junio C Hamano
David A. Greene gree...@obbligato.org writes: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene

troublesome branch name in remote repo causes .git/config inconsistency in cloned repo

2013-01-08 Thread Pavel Pospíšil
Hi, I think I came across a bug. I use git version 1.7.10.4 on Ubuntu 12.10. I haven't tried to find out if it's a known bug. Reproduction scenario: 1. create a git repo: $ mkdir -p tmp/bezdek $ cd tmp/bezdek/ $ echo *.swp .gitignore $ git init $ git add . $ git commit -m Initial commit 2.

Re: [PATCH 3/7] contrib/subtree: Add --unannotate

2013-01-08 Thread Junio C Hamano
David A. Greene gree...@obbligato.org writes: diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index c5bce41..75aa690 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -198,6 +198,21 @@ OPTIONS FOR split git subtree

Re: [PATCH 4/7] contrib/subtree: Better Error Handling for add

2013-01-08 Thread Junio C Hamano
David A. Greene gree...@obbligato.org writes: From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene gree...@obbligato.org ---

Re: [RFH] NetBSD 6?

2013-01-08 Thread Greg Troxel
Junio C Hamano gits...@pobox.com writes: [OLD_ICONV] It refers to the type of the second parameter to iconv(); OLD_ICONV makes it take const char *, as opposed to char *, the latter of which matches http://pubs.opengroup.org/onlinepubs/9699919799/functions/iconv.html I just wanted to

Re: troublesome branch name in remote repo causes .git/config inconsistency in cloned repo

2013-01-08 Thread Junio C Hamano
Pavel Pospíšil pospi...@gmail.com writes: I think that the problem may be with the branch name length. I think that git branch allows to created branches with very long names, however, such long name are not allowed in .git/config ... I think we lifted this limit back in 1.8.0.1 timeframe. --

Re: [RFH] NetBSD 6?

2013-01-08 Thread Junio C Hamano
Greg Troxel g...@ir.bbn.com writes: Junio C Hamano gits...@pobox.com writes: [OLD_ICONV] It refers to the type of the second parameter to iconv(); OLD_ICONV makes it take const char *, as opposed to char *, the latter of which matches

Re: [RFH] NetBSD 6?

2013-01-08 Thread Greg Troxel
Junio C Hamano gits...@pobox.com writes: Don't get too offended by the OLD_ prefix to that symbol, by the way. I do not think old means old and broken hence fixed in newer version and you are low life if you live on a platform that has to define it ;-). Thanks - it did throw me at the

[PATCH v3] git-fast-import(1): remove duplicate '--done' option

2013-01-08 Thread John Keeping
The '--done' option to git-fast-import is documented twice in its manual page. Combine the best bits of each description, keeping the location of the instance that was added first. Signed-off-by: John Keeping j...@keeping.me.uk --- The commit description gained some noise in v2; this version

Re: [PATCH] wincred: improve compatibility with windows versions

2013-01-08 Thread Erik Faye-Lund
On Tue, Jan 8, 2013 at 5:20 PM, Karsten Blees karsten.bl...@gmail.com wrote: Am 04.01.2013 22:57, schrieb Erik Faye-Lund: The only reason why I used Cred[Un]PackAuthenticationBuffer, were that I wasn't aware that it was possible any other way. I didn't even know there was a Windows Credential

[PATCH] commit: make default of cleanup option configurable

2013-01-08 Thread Ralf Thielow
The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. This commit introduces a new config option commit.cleanup which can be used to change the default of the

[PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread René Scharfe
The test fails for me on NetBSD 6.0.1 and reports: ok 1 - ref name '' is invalid ok 2 - ref name '/' is invalid ok 3 - ref name '/' is invalid with options --allow-onelevel ok 4 - ref name '/' is invalid with options --normalize error: bug in the test

Re: [PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: The test fails for me on NetBSD 6.0.1 and reports: ok 1 - ref name '' is invalid ok 2 - ref name '/' is invalid ok 3 - ref name '/' is invalid with options --allow-onelevel ok 4 - ref name '/' is invalid with options

Re: [PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread René Scharfe
Am 08.01.2013 21:39, schrieb Junio C Hamano: René Scharfe rene.scha...@lsrfire.ath.cx writes: # on NetBSD with /bin/sh $ a() { echo $#-$1-$2; } $ t=x; a ${t:+$t} 1-x- $ t=x y; a ${t:+$t} 2-x-y $ t=x y; a ${t:+x y} 1-x y- #

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-08 Thread Junio C Hamano
Ralf Thielow ralf.thie...@gmail.com writes: The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. This commit introduces a new config option commit.cleanup

Re: [PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx writes: A quick check shows that subtests 64-68 and 89-93 of t0008 fail for me on Debian (10 in total) and subtests 64 and 89 fail on NetBSD (2 in total). Unlike t1402 they don't report bug in the test script. t0008 only uses ${:+} substitution on

Enabling scissors by default?

2013-01-08 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 I was wondering why am's scissors option is not enabled by default. It seems a very handy feature, but I'm reluctant to use it when sending patches because the recipient has to notice the scissors and remember to pass --scissors to git am. Could this

[PATCH 11/10] doc: push.default is no longer matching

2013-01-08 Thread Junio C Hamano
The documentation for the command said that `push.default` is the default without referring to the releavant manual page. Now `simple` is the default behaviour. Document it right there where we say we take the default value from `push.default`, and remove the description of old default being

Re: Enabling scissors by default?

2013-01-08 Thread Junio C Hamano
Phillip Susi ps...@ubuntu.com writes: I was wondering why am's scissors option is not enabled by default. It is very easy to miss misidentification of scissors line; as a dangerous, potentially information losing option, I do not think it should be on by default. Another reason (and this is

trouble using cherry pick

2013-01-08 Thread Pyeron, Jason J CTR (US)
I am trying to accomplish the diagram below: * ??? Merge (or cherry-pick) all changes after 68fb8df from the task1prep branch? |\ |* ??? Change ... |* ??? Change 3 |* ??? Change 2 |* ??? Change 1 |* ??? Merge branch 'task1' into task1prep ||\ || * 5e51e26 v1.01 - fixed a

Git and Large Binaries: A Proposed Solution - current situation?

2013-01-08 Thread Christoph Buchner
Hello git devs! We are currently trying to deal with the large-binaries-in-git problem, and I found this conversation from 2011 on this mailing list: http://git.661346.n2.nabble.com/Fwd-Git-and-Large-Binaries-A-Proposed-Solution-td5948908.html I was also motivated by finding this git GSoC

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-08 Thread Techlive Zheng
2013/1/8 David A. Greene gree...@obbligato.org: From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene

Re: Enabling scissors by default?

2013-01-08 Thread Phillip Susi
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 On 01/08/2013 05:42 PM, Junio C Hamano wrote: It is very easy to miss misidentification of scissors line; as a dangerous, potentially information losing option, I do not think it should be on by default. I suppose if it only requires one instance

Re: [PATCH] clone: forbid --bare --separate-git-dir dir

2013-01-08 Thread Duy Nguyen
On Wed, Jan 9, 2013 at 12:45 AM, Junio C Hamano gits...@pobox.com wrote: Jens Lehmann jens.lehm...@web.de writes: Am 08.01.2013 15:16, schrieb Duy Nguyen: On Sun, Jan 06, 2013 at 02:19:48AM -0800, Jonathan Nieder wrote: Unfortunately we forgot to forbid the --bare --separate-git-dir

Re: Enabling scissors by default?

2013-01-08 Thread Junio C Hamano
Phillip Susi ps...@ubuntu.com writes: On 01/08/2013 05:42 PM, Junio C Hamano wrote: It is very easy to miss misidentification of scissors line; as a dangerous, potentially information losing option, I do not think it should be on by default. I suppose if it only requires one instance of 8

Re: [PATCH] clone: forbid --bare --separate-git-dir dir

2013-01-08 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: After all, Jonathan's suggestion to forbid it was because the combination does not make sense and does not have practical uses, and forbidding it would make the command easier to explain than leaving it accepted from the command line. If you choose to go

Re: [PATCH 2/7] contrib/subtree: Use %B for Split Subject/Body

2013-01-08 Thread Junio C Hamano
郑文辉(Techlive Zheng) techlivezh...@gmail.com writes: +test_expect_success 'check hash of split' ' +spl1=$(git subtree split --prefix subdir) +undo +git subtree split --prefix subdir --branch splitbr1test +check_equal ''$(git rev-parse splitbr1test)'' $spl1

What's cooking (interim report)

2013-01-08 Thread Junio C Hamano
I'll do the next issue of What's cooking after tomorrow's integration cycle, but here are the highlights. The following topics that have already graduated to the 'master' branch have been merged to the 'maint' branch (see the last What's cooking for details of individual topics):

Re: [PATCH] add warning for depth=0 in git clone.

2013-01-08 Thread Duy Nguyen
On Tue, Jan 8, 2013 at 3:07 PM, Stefan Beller stefanbel...@googlemail.com wrote: --- builtin/clone.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/clone.c b/builtin/clone.c index ec2f75b..5e91c1e 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -818,6 +818,9 @@ int

Re: [PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread Greg Troxel
René Scharfe rene.scha...@lsrfire.ath.cx writes: invalid_ref() constructs a test case description using its last argument, but the shell seems to split it up into two pieces if it contains a space. Minimal test case: This is indeed a bug in NetBSD's shell, which I reported after finding

Re: [PATCH] t1402: work around shell quoting issue on NetBSD

2013-01-08 Thread Greg Troxel
René Scharfe rene.scha...@lsrfire.ath.cx writes: The test fails for me on NetBSD 6.0.1 and reports: ok 1 - ref name '' is invalid ok 2 - ref name '/' is invalid ok 3 - ref name '/' is invalid with options --allow-onelevel ok 4 - ref name '/' is invalid with options

On --depth=funny value

2013-01-08 Thread Junio C Hamano
Here to outline my current thinking. Note that this is unrelated to the git clone --bottom=v1.2.3 to say I do not care about anything that happened before that version. * First, let's *not* do git fetch --depth=inf; if you want to unplug the bottom of your shallow clone, be more explicit and

Re: On --depth=funny value

2013-01-08 Thread Duy Nguyen
On Wed, Jan 9, 2013 at 9:53 AM, Junio C Hamano gits...@pobox.com wrote: * First, let's *not* do git fetch --depth=inf; if you want to unplug the bottom of your shallow clone, be more explicit and introduce a new option, e.g. git fetch --unshallow, or something. No problem. Something

Invitation to use Google Talk

2013-01-08 Thread Google Talk
--- You've been invited by Sahil Mittal to use Google Talk. If you already have a Google account, login to Gmail and accept this chat invitation: http://mail.google.com/mail/b-b92f427051-d9b5718875-hsYFzGz7Tf-0FB5xZ9uD5fZBj8E

Re: On --depth=funny value

2013-01-08 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Wed, Jan 9, 2013 at 9:53 AM, Junio C Hamano gits...@pobox.com wrote: ... * We would like to update clone --depth=1 to end up with a tip only repository, but let's not to touch git fetch (and git clone) and make them send 0 over the wire when the

Timberland Schuhe Herren

2013-01-08 Thread Eshini
Diese letzten Jahre habe ich nur in Turnschuhen kleiden, ohne Schnürsenkel, obwohl ich so bekommen habe die Skechers in diesen Tagen setzen wir auf Timberland Schuhe Herren http://www.timberlandschuheoutlet.org/ aus dem Schnee. Die Wahrheit ist, wenn Sie extra für die Paar Stiefel Timberland

The overall Collecting Pandora jewellery Listed here

2013-01-08 Thread helindaer
Danish jewelery thrown Pandora Add on ( pandora jewellery http://www.pandorajewellerycheap.co.uk ) so that you can actualize high-quality add on with dissipating various Side swept the modern world, all-around profits while in the third-largest add on make. Pandora Add on (Pandora), your

Re: [PATCH] commit: make default of cleanup option configurable

2013-01-08 Thread Jonathan Nieder
Hi, Ralf Thielow wrote: The default of the cleanup option in git commit is not configurable. Users who don't want to use the default have to pass this option on every commit since there's no way to configure it. Could you give an example? I'm trying to get a sense of whether these habitual