Aw: Re: Aw: Re: [PATCH 0/3] Move CodingGuidelines and SubmittingPatches to ./Documentation/technical

2012-12-31 Thread Thomas Ackermann
Implementation details are part of API; CG and SP are social not technical. This depends on your definition of social ;-) Also CG and SP are in the part of the documents that are not installed for end-users and that is their right place. They matter only to the people who grab our

Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows

2012-12-31 Thread Thomas Ackermann
Junio C Hamano gitster at pobox.com writes: Thanks; I just realized that nothing in Documentation/ hierarchy mentions these; they are only mentioned in A Note from the Maintainer I send out every once in a while (kept in MaintNotes of 'todo' branch): Wouldn't it be a good idea to put

Re: Lockless Refs? (Was [PATCH] refs: do not use cached refs in repack_without_ref)

2012-12-31 Thread Martin Fick
On Thursday, December 27, 2012 04:11:51 pm Martin Fick wrote: It concerns me that git uses any locking at all, even for refs since it has the potential to leave around stale locks. ... [a previous not so great attempt to fix this] ... I may have finally figured out a working loose ref

git filter-branch doesn't dereference annotated tags

2012-12-31 Thread Grégory Pakosz
Hello, I noticed git-filter-branch doesn't dereference annotated tags prior to invoking git update-ref -d. Please find a patch attached that changes the call to git update-ref: -git update-ref -m filter-branch: delete -d $ref $sha1 +git update-ref -m filter-branch: delete -d $(git rev-parse

git filter-branch doesn't dereference annotated tags

2012-12-31 Thread Grégory Pakosz
Please disregard the previous email that contains an incorrect fix suggestion. I wish my first contribution was flawless. Here is what's happening. git-filter-branch let git-update-ref -d verify that the value for $ref matches $sha1. However, when $ref points to an annotated tag that is being

Re: git.wiki.kernel.org spam ...

2012-12-31 Thread Johannes Schindelin
Hi Rupert, On Sat, 29 Dec 2012, rupert THURNER wrote: ich hab gesehen, du bist ober-meister des kernle.org git wikis. da gibt es ganz schön viel neue user und spam derzeit, zb: https://git.wiki.kernel.org/index.php?title=User_talk:Bridgetevans0521redirect=no möchtest du das erzeugen von

Re: [RFC] pack-objects: compression level for non-blobs

2012-12-31 Thread Shawn Pearce
This thread is pretty interesting. Unfortunately the holidays have kept me busy. But I am excited by the work David and Peff are doing. :-) On Sun, Dec 30, 2012 at 1:31 PM, Jeff King p...@peff.net wrote: On Sun, Dec 30, 2012 at 07:53:48PM +0700, Nguyen Thai Ngoc Duy wrote: $ cd objects/pack

Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows

2012-12-31 Thread Jason Holden
On Mon, Dec 31, 2012 at 09:40:19AM +, Thomas Ackermann wrote: Junio C Hamano gitster at pobox.com writes: Thanks; I just realized that nothing in Documentation/ hierarchy mentions these; they are only mentioned in A Note from the Maintainer I send out every once in a while (kept in

Re: git filter-branch doesn't dereference annotated tags

2012-12-31 Thread Junio C Hamano
Grégory Pakosz gpak...@visionobjects.com writes: 1) either make git-filter-branch dereference annotated tags and do the verification itself then use the two arguments version of git update-ref 2) in the case of an annotated tag, pass another old value to git update-ref Please find

Re: [PATCH 0/2] Add MAINTAINERS file and clarify gui workflows

2012-12-31 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Thanks; I just realized that nothing in Documentation/ hierarchy mentions these; they are only mentioned in A Note from the Maintainer I send out every once in a while (kept in MaintNotes of 'todo' branch): Wouldn't it be a good idea to put

[PATCH] merge --no-edit: do not add comments meant for --edit mode

2012-12-31 Thread Junio C Hamano
The credit lines By and Via to credit authors and committers for their contributions on the side branch are meant as a hint to the integrator to decide whom to mention in the log message text. After the integrator saves the message in the editor, they are meant to go away and that is why they are

Re: [RFC/PATCH] gitk: Visualize a merge commit with a right-click in gitk

2012-12-31 Thread Jason Holden
On Mon, Dec 31, 2012 at 03:27:36PM +1100, Paul Mackerras wrote: Thanks for the patch. I have a couple of comments about it. First, the exec command waits for the process to complete, which means that the initial gitk GUI will be unresponsive until the user quits the gitk window showing the

Re: [PATCH v2 1/2] Add top-level maintainers file with email/canonical repository information

2012-12-31 Thread Jacob Helwig
One minor grammar nit below. On Mon, Dec 31, 2012 at 2:19 PM, Jason Holden jason.k.holden.sw...@gmail.com wrote: Certain parts of git have a semi-formalized workflow for incoming patches. This file documents the maintainers, their area of specialization, their email address, and their

Re: Bug/Enhancement: contrib/subtree should ship with manpage

2012-12-31 Thread greened
Neil kngsp...@gmail.com writes: Actual: git-subtree.1 fails to be generated because my system doesn't ship asciidoc and xmlto. Well, you need those tools to build ANY git documentation. I just ran a test to build git-subtree and its documentation and it went just fine. This is not a bug.

Re: [PATCH] subtree.sh: Use raw subject and body modifier %B instead of %s%n%n%b

2012-12-31 Thread greened
gree...@obbligato.org writes: Techlive Zheng techlivezh...@gmail.com writes: %s%n%n%b is not always equal to %B. If the commit msg does not have a body, this will append an extra new-line character to the msg title which would cause the splited commit has a new sha1 hash. In most cases,

Re: [PATCH] Add --unannotate option to git-subtree

2012-12-31 Thread greened
Herman van Rink r...@initfour.nl writes: Has anybody looked at this? It has been very useful for me. I am looking at it now. The version of subtree in contrib is rather out-dated unfortunately. It is the official version. What's missing? You have a bunch of changes that need rework to

Re: [PATCH] gitk: Replaced green with #00FF00.

2012-12-31 Thread Paul Mackerras
On Thu, Dec 27, 2012 at 09:27:37AM -0800, Junio C Hamano wrote: Peter Hofmann git-...@uninformativ.de writes: Subject: Re: [PATCH] gitk: Replaced green with #00FF00. gitk looks pretty awkward with Tk 8.6. green is simply too dark now because it has changed from #00FF00 to #008000.

Re: [PATCH v2 2/2] Provide better guidance for submitting patches against upstream utilities

2012-12-31 Thread Junio C Hamano
Jason Holden jason.k.holden.sw...@gmail.com writes: git-gui, gitk, and git-po are maintained upstream of git. Document this, and the procedure for submitting patches to these tools Signed-off-by: Jason Holden jason.k.holden.sw...@gmail.com --- Documentation/SubmittingPatches | 11

[ANNOUNCE] Git v1.8.1

2012-12-31 Thread Junio C Hamano
The latest feature release Git v1.8.1 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: ac8dced9c3232c0ec6a88d04600a4d0eaf2ba4e3 git-1.8.1.tar.gz a256fc56c89dc3c8d58b81a2c02dc89299f1f29b

What's cooking in git.git (Dec 2012, #08; Mon, 31)

2012-12-31 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of the 'master' branch is at 1.8.1; the tip of 'next' will be rewound soonish to reorder topics that are already well cooked during the

A note from the maintainer

2012-12-31 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[BUG] git fetch --all --tags doesn't fetch remote branches, only tags

2012-12-31 Thread Dennis Heidsiek
Dear Git community, i think there may be a bug in the fetch command: The command $ git fetch --all --tags Fetching origin doesn’t fetch new commits from origin/master, while i see via the web browser of my remote repository that they exist. The same with verbose: $ git fetch --all --tags

Re: [BUG] git fetch --all --tags doesn't fetch remote branches, only tags

2012-12-31 Thread Junio C Hamano
Dennis Heidsiek dennis.heids...@gmail.com writes: i think there may be a bug in the fetch command: The command $ git fetch --all --tags Fetching origin doesn’t fetch new commits from origin/master, while i see via the web browser of my remote repository that they exist. The --all option

Re: [PATCH] Add --unannotate option to git-subtree

2012-12-31 Thread greened
James Nylen jny...@gmail.com writes: Rather than adding a marker to each commit when splitting out the commits back to the subproject, --unannotate removes the specified string (or bash glob pattern) from the beginning of the first line of the commit message. This enables the following

Re: [BUG] git fetch --all --tags doesn't fetch remote branches, only tags

2012-12-31 Thread Dennis Heidsiek
Dear Mr. Hamano, so i /did/ misunderstand the documentation – my fault. Thank you very much for your rapid clarification! With grateful greetings, Dennis Heidsiek -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: [BUG?] git-subtree behavior when the -P tree is removed and recreated

2012-12-31 Thread greened
Tomi Belan tomi.be...@gmail.com writes: Thanks. Here's one more bump. Avery? David? I don't know how this is supposed to work, unfortunately. I'm still in the middle of learning the code... -David -- To unsubscribe from this list: send the line unsubscribe git in the

Re: [BUG?] git-subtree behavior when the -P tree is removed and recreated

2012-12-31 Thread greened
Junio C Hamano gits...@pobox.com writes: Maybe it is a seasonal thing, just before the holiday season, but this has been unresponded for a couple of months, not even with a That combination is not supported, or Thanks for a bug report. I did finally see this message. I totally admit that

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread greened
Drew Crawford d...@drewcrawfordapps.com writes: I noticed today that if you leave off the branch name from git subtree like so: $ git subtree add --prefix somewhere -m adding CDH as subtree path/to/repo warning: read-tree: emptying the index with no arguments is deprecated; use --empty

Re: [DOCBUG] git subtree synopsis needs updating

2012-12-31 Thread greened
Yann Dirson dir...@bertin.fr writes: Ah, it's nice to see subtree updates. Any plans to get them merged anytime soon ? As soon as there is one patch per feature that applies cleanly to contrib/ and testcases use the native git test facility. These patches should be submitted to the mailing

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread greened
Drew Crawford d...@drewcrawfordapps.com writes: Ideally it would be better to emit an error-message from a script higher up the calling chain that would be more descriptive about the problem (such as suggesting no branch is specified).-- I'm looking at implementing this but I need a bit of

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread greened
Drew Crawford d...@drewcrawfordapps.com writes: Ideally it would be better to emit an error-message from a script higher up the calling chain that would be more descriptive about the problem (such as suggesting no branch is specified).-- Ok, I used git rev-parse --verify and I have this

[PATCH v3 00/10] fnmatch replacement

2012-12-31 Thread Nguyễn Thái Ngọc Duy
The first patch actually belongs to nd/wildmatch as it fixes how ** is only effective when it's surrounded by slashes. Other fixes from v2 are WM_PATHNAME check is replaced by match_slash (or special previously) in 8/10 and 9/10. WM_PATHNAME is only used to set match_slash. If we rely on (the

[PATCH v3 01/10] wildmatch: fix ** special case

2012-12-31 Thread Nguyễn Thái Ngọc Duy
** is adjusted to only be effective when surrounded by slashes, in 40bbee0 (wildmatch: adjust ** behavior - 2012-10-15). Except that the commit did it wrong: 1. when it checks for the preceding slash unless ** is at the beginning, it compares to wrong pointer. It should have compared to the

[PATCH v3 02/10] compat/fnmatch: respect NO_FNMATCH* even on glibc

2012-12-31 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- compat/fnmatch/fnmatch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/compat/fnmatch/fnmatch.c b/compat/fnmatch/fnmatch.c index 9473aed..6f7387d 100644 --- a/compat/fnmatch/fnmatch.c +++ b/compat/fnmatch/fnmatch.c

[PATCH v3 03/10] wildmatch: replace variable 'special' with better named ones

2012-12-31 Thread Nguyễn Thái Ngọc Duy
'special' is too generic and is used for two different purposes. Replace it with 'match_slash' to indicate ** pattern and 'negated' for [!...] and [^...]. Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wildmatch.c | 18 +- 1 file changed, 9 insertions(+), 9

[PATCH v3 04/10] wildmatch: rename constants and update prototype

2012-12-31 Thread Nguyễn Thái Ngọc Duy
- All exported constants now have a prefix WM_ - Do not rely on FNM_* constants, use the WM_ counterparts - Remove TRUE and FALSE to follow Git's coding style - While at it, turn flags type from int to unsigned int - Add an (unused yet) argument to carry extra information so that we don't have

[PATCH v3 05/10] wildmatch: make dowild() take arbitrary flags

2012-12-31 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wildmatch.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wildmatch.c b/wildmatch.c index 2a655fa..1b5bbac 100644 --- a/wildmatch.c +++ b/wildmatch.c @@ -52,7 +52,7 @@ typedef unsigned char uchar;

[PATCH v3 06/10] wildmatch: support no FNM_PATHNAME mode

2012-12-31 Thread Nguyễn Thái Ngọc Duy
So far, wildmatch() has always honoured directory boundary and there was no way to turn it off. Make it behave more like fnmatch() by requiring all callers that want the FNM_PATHNAME behaviour to pass that in the equivalent flag WM_PATHNAME. Callers that do not specify WM_PATHNAME will get

[PATCH v3 07/10] test-wildmatch: add perf command to compare wildmatch and fnmatch

2012-12-31 Thread Nguyễn Thái Ngọc Duy
It takes a text file, a pattern, a number n and pathname flag. Each line in the text file is matched against the pattern n times. If pathname is given, FNM_PATHNAME is used. test-wildmatch is built with -O2 and tested against glibc 2.14.1 (also -O2) and compat/fnmatch. The input file is

[PATCH v3 08/10] wildmatch: make a special case for */ with FNM_PATHNAME

2012-12-31 Thread Nguyễn Thái Ngọc Duy
Normally we need recursion for *. In this case we know that it matches everything until / so we can skip the recursion. glibc, '*/*/*' on linux-2.6.git file list 2000 times before: wildmatch 8s 74513us fnmatch 1s 97042us or 13.59% faster after: wildmatch 3s 521862us fnmatch 3s 488616us or

[PATCH v3 09/10] wildmatch: advance faster in asterisk + literal patterns

2012-12-31 Thread Nguyễn Thái Ngọc Duy
Normally when we match *X on abcX, we call dowild(X, abcX), dowild(X, bcX), dowild(X, cX) and dowild(X, X). Only the last call may have a chance of matching. By skipping the text before X, we can eliminate the first three useless calls. compat, '*/*/*' on linux-2.6.git file list 2000 times,

[PATCH v3 10/10] Makefile: add USE_WILDMATCH to use wildmatch as fnmatch

2012-12-31 Thread Nguyễn Thái Ngọc Duy
This is similar to NO_FNMATCH but it uses wildmatch instead of compat/fnmatch. This is an intermediate step to let wildmatch be used as fnmatch replacement for wider audience before it replaces fnmatch completely and compat/fnmatch is removed. fnmatch in test-wildmatch is not impacted by this and

Re: [PATCH] DESTDIR support in contrib/subtree/Makefile

2012-12-31 Thread greened
Adam Tkac at...@redhat.com writes: Signed-off-by: Adam Tkac at...@redhat.com --- It is a good habit in Makefiles to honor DESTDIR variable to support `make DESTDIR=/instalroot install` syntax. Comments are welcomed. Applied. I'll be sending this to the mailing list tonight or

Re: [PATCH] For git-subtree, when installing docs (make install-doc), create man1 folder first.

2012-12-31 Thread greened
Junio C Hamano gits...@pobox.com writes: Jesper L. Nielsen lya...@gmail.com writes: From: Jesper L. Nielsen lya...@gmail.com Hi.. I installed Git subtree and discovered that the if the man1dir doesn't exist the man-page for Git Subtree is just called man1. So, small patch to create the

Re: [PATCH] For git-subtree, when installing docs (make install-doc), create man1 folder first.

2012-12-31 Thread greened
Jesper L. Nielsen lya...@gmail.com writes: So, small patch to create the folder first in the Makefile. Hope everything is right with the patch and submitting of the patch. I've applied this to my local copy and will send it to the list for integration. Thanks for fixing this!

Re: [PATCH] git-subtree: ignore git-subtree executable

2012-12-31 Thread greened
Michael Schubert msc...@elegosoft.com writes: Signed-off-by: Michael Schubert msc...@elegosoft.com Obviously good. Applied and will send for integration. -David -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread Junio C Hamano
gree...@obbligato.org writes: git-subtree add accepts either a refspec or a path to a repository and a refspec. With one positional option, git-subtree add simply assumes it's a refspec. Is there an easy way to check whether a string is a proper refspec? Even better would be a way to

git-subtree Patches to Apply

2012-12-31 Thread David A. Greene
Here are all of the patches for git-subtree that have been posted to the mailing list that I could apply and test in a reasonable amount of time. These are all rebased from trunk as of tonight. Many apologies for being *so* behind. Work has been a bear but I'm hoping things will ease up in the

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

2012-12-31 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. Author:Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh

[PATCH 2/8] Add --unannotate

2012-12-31 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. Author:James Nylen jny...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 11

[PATCH 3/8] Better Error Handling for add

2012-12-31 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, 12

[PATCH 4/8] Fix Synopsis

2012-12-31 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. Change commit to refspec in the synopsis for add. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org ---

[PATCH 5/8] Honor DESTDIR

2012-12-31 Thread David A. Greene
From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Author:Adam Tkac at...@redhat.com 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

[PATCH 6/8] Make the Manual Directory if Needed

2012-12-31 Thread David A. Greene
From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Author:Jesper L. Nielsen lya...@gmail.com Signed-off-by:Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org ---

[PATCH 8/8] Fix Documentation Typo

2012-12-31 Thread David A. Greene
From: Michael Schubert msc...@elegosoft.com split is documented below push so fix the reference to it in push's documentation. Author:Michael Schubert msc...@elegosoft.com Signed-off-by:Michael Schubert msc...@elegosoft.com Signed-off-by: David A. Greene gree...@obbligato.org ---

[PATCH 7/8] Ignore git-subtree

2012-12-31 Thread David A. Greene
From: Michael Schubert msc...@elegosoft.com Add the git-subtree command executable to .gitignore. Author:Michael Schubert msc...@elegosoft.com Signed-off-by:Michael Schubert msc...@elegosoft.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/.gitignore |1

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread greened
Junio C Hamano gits...@pobox.com writes: With one positional option, git-subtree add simply assumes it's a refspec. Is there an easy way to check whether a string is a proper refspec? Even better would be a way to check if a string is a path to a git repository. Do you literally mean a

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

2012-12-31 Thread greened
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. Wow. So that was a spectacular fail. Sorry about th duplicate patch e-mails. I have no

Re: [RFC] pack-objects: compression level for non-blobs

2012-12-31 Thread Duy Nguyen
On Tue, Jan 1, 2013 at 1:06 AM, Shawn Pearce spea...@spearce.org wrote: 3. Dropping the commits file and just using the pack-*.idx as the index. The problem is that it is sparse in the commit space. So just naively storing 40 bytes per entry is going to waste a lot of space.

Re: git subtree error (just how do you expect me to merge 0 trees?)

2012-12-31 Thread Junio C Hamano
gree...@obbligato.org writes: Junio C Hamano gits...@pobox.com writes: With one positional option, git-subtree add simply assumes it's a refspec. Is there an easy way to check whether a string is a proper refspec? Even better would be a way to check if a string is a path to a git

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

2012-12-31 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. Is this an unconditional improvement, or is it generally an improvement but for some users it

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

2012-12-31 Thread Junio C Hamano
gree...@obbligato.org writes: 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. Wow. So that was a spectacular fail. Sorry about th