Re: git smart-http do not authent to allow git ls-remote to be called anonymously

2012-10-13 Thread Jeff King
[re-adding git@vger; please keep discussion on-list] On Sun, Oct 14, 2012 at 01:29:13PM +0800, 乙酸鋰 wrote: > Sorry, it does not serve the request. It returns http 401. > But if I add the username and password as a part of the URL, it succeeds. In that case, then you probably need to upgrade your

Re: [PATCH v5 04/12] wildmatch: remove unnecessary functions

2012-10-13 Thread Nguyen Thai Ngoc Duy
On Sun, Oct 14, 2012 at 12:04 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- > > The comment-fix seems to be new but otherwise this is unchanged, > right? Right.-- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-13 Thread Jeff King
On Sat, Oct 13, 2012 at 09:55:22PM -0700, Junio C Hamano wrote: > > When ~/.gitconfig is unreadable (EPERM), the messages are a symptom of > > an older issue: the config file is being ignored. Shouldn't git error > > out instead so the permissions can be fixed? E.g., if the sysadmin > > has set

Re: [PATCH 2/2] config: treat user and xdg config permission problems as errors

2012-10-13 Thread Jeff King
On Sat, Oct 13, 2012 at 05:04:02PM -0700, Jonathan Nieder wrote: > Better to error out and ask the user to correct the problem. > > This only affects the user and xdg config files, since the user > presumably has enough access to fix their permissions. If the system > config file is unreadable,

Re: [RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-13 Thread Jeff King
On Sat, Oct 13, 2012 at 05:02:10PM -0700, Jonathan Nieder wrote: > > Before reading a config file, we check "!access(path, R_OK)" > > to make sure that the file exists and is readable. If it's > > not, then we silently ignore it. > > git became noisy: > > $ git fetch --all > warning: unable to

[PATCH 18/20] cvsserver: support -r and sticky tags for most operations

2012-10-13 Thread Matthew Ogilvie
- Split off prepDirForOutput for "update" and "commit". Some low level protocol details were changed to more closely resemble CVS even in non-tagged cases. Hopefully it still works with finicky clients like Eclipse. - Substantial changes to "diff". The output is now closer to

[PATCH 09/20] cvsserver: cvs add: do not expand directory arguments

2012-10-13 Thread Matthew Ogilvie
Standard "cvs add" never does any recursion. With standard cvs, "cvs add dir" will either add just the "dir" to the repository, or error out. Prior to this change, git-cvsserver would try to recurse (perhaps re-adding sandbox-removed files?) into the existing directory instead. Signed-off-by: Ma

Re: [PATCH v2 2/2] git-cvsimport: allow local timezone for commits

2012-10-13 Thread Junio C Hamano
Chris Rorvick writes: > CVS patches are imported with the timezone offset of + (UTC). > Allow timezone offsets to be calculated from the the local timezone by > adding -l to the command line or specifying cvsimport.l in the config. A single "I do not like everybody's timestamp is in GMT, so

[PATCH 12/20] cvsserver: cleanup extra slashes in filename arguments

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 28 1 file changed, 28 insertions(+) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index dca0ed6..1d929df 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2309,6 +2309,9 @@ sub filenamesplit

[PATCH 11/20] cvsserver: factor out git-log parsing logic

2012-10-13 Thread Matthew Ogilvie
Some field conversion was already duplicated, and more calls will be added soon. Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 176 - 1 file changed, 105 insertions(+), 71 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.

[PATCH 15/20] cvsserver: implement req_Sticky and related utilities

2012-10-13 Thread Matthew Ogilvie
Nothing sets sticky yet, or uses the values set by this, but soon... Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 171 - 1 file changed, 169 insertions(+), 2 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 16

[PATCH 10/20] cvsserver status: provide real sticky info

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl| 24 t/t9401-git-cvsserver-crlf.sh | 35 +++ 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 4d514b4..c5ebfa0 10

[PATCH 20/20] cvsserver Documentation: new cvs ... -r support

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- Documentation/git-cvsserver.txt | 37 + 1 file changed, 37 insertions(+) diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 88d814a..940c2ba 100644 --- a/Documentation/git-cvsserver.txt +++ b

[PATCH 16/20] cvsserver: generalize getmeta() to recognize commit refs

2012-10-13 Thread Matthew Ogilvie
This allows getmeta() to recognize any commitish (sha1, tag/branch name, etc). Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 156 + 1 file changed, 145 insertions(+), 11 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.pe

[PATCH 17/20] cvsserver: Add version awareness to argsfromdir

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 228 ++--- 1 file changed, 198 insertions(+), 30 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 7bb6f83..5e558d1 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.pe

[PATCH 19/20] cvsserver: add t9402 to test branch and tag refs

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- t/t9402-git-cvsserver-refs.sh | 558 ++ 1 file changed, 558 insertions(+) create mode 100755 t/t9402-git-cvsserver-refs.sh diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh new file mode 100755 i

[PATCH 13/20] cvsserver: define a tag name character escape mechanism

2012-10-13 Thread Matthew Ogilvie
CVS tags are officially only allowed to use [-_0-9A-Za-f]. Git refs commonly uses other characters, especially [./]. Such characters need to be escaped from CVS in order to be referenced. This just defines functions to escape/unescape names. The functions are not used yet. Signed-off-by: Matth

[PATCH 05/20] cvsserver: remove unused functions _headrev and gethistory

2012-10-13 Thread Matthew Ogilvie
Remove: - _headrev() - It uses similar functionality from getmeta() and gethead(). - gethistory() - It uses similar functions gethistorydense() and getlog(). Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 36 1 file changed, 4 insertions(+), 32

[PATCH 07/20] cvsserver: split up long lines in req_{status,diff,log}

2012-10-13 Thread Matthew Ogilvie
Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 220 ++--- 1 file changed, 159 insertions(+), 61 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 9e71f30..eb8f138 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.pe

[PATCH 02/20] cvsserver: removed unused sha1Or-k mode from kopts_from_path

2012-10-13 Thread Matthew Ogilvie
sha1Or-k was a vestige from an early, never-released attempt to handle some oddball cases of CRLF conversion (-k option). Ultimately it wasn't needed, and I should have gotten rid of it before submitting the CRLF patch in the first place. See also 90948a42892779 (add ability to guess -kb from cont

[PATCH 14/20] cvsserver: add misc commit lookup, file meta data, and file listing functions

2012-10-13 Thread Matthew Ogilvie
These will be used soon, but not yet. PERFORMANCE NOTE: getMetaFromCommithash() does not scale well as currently implemented. See comment for possible optimization strategies. Fortunately, it will only be used in cases that would not have worked at all before this change. Signed-off-by: Matthew

[PATCH 08/20] cvsserver: use whole CVS rev number in-process; don't strip "1." prefix

2012-10-13 Thread Matthew Ogilvie
Keep track of the whole CVS revision number in-process. This will clarify code when we start handling non-linear revision numbers later. There is one externally visible change: conflict markers after an update will now include the full CVS revision number, including the "1." prefix. It used to l

[PATCH 04/20] cvsserver update: comment about how we shouldn't remove a user-modified file

2012-10-13 Thread Matthew Ogilvie
Instead of a comment, we should really add test cases and actually fix it. Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 4 1 file changed, 4 insertions(+) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 595865c..cc39b6b 100755 --- a/git-cvsserver.perl +++ b/git-cvsser

[PATCH 06/20] cvsserver: clean up client request handler map comments

2012-10-13 Thread Matthew Ogilvie
- Comment that it should not be considered a complete list. - #'annotate' comment - Uncommented annotate line is 2 lines earlier. Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.

[PATCH 03/20] cvsserver: add comments about database schema/usage

2012-10-13 Thread Matthew Ogilvie
No functionality changes, but these comments should make it easier to understand how it works. Signed-off-by: Matthew Ogilvie --- git-cvsserver.perl | 46 ++ 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/git-cvsserver.perl b/git-cvsser

[PATCH 01/20] cvsserver t9400: add basic 'cvs log' test

2012-10-13 Thread Matthew Ogilvie
'cvs log' output is arguably deficient in a number of ways (see the comment added with the test), but add a test for the current output to detect for accidental regressions. Signed-off-by: Matthew Ogilvie --- t/t9400-git-cvsserver-server.sh | 70 + 1 file

[PATCH 00/20] git-cvsserver: add support for cvs "-r" refs

2012-10-13 Thread Matthew Ogilvie
This patch series improves git-cvsserver's handling and support of refspecs requested by the client. Disclaimer: I don't actually intend to use any of this myself. I suspect no one really cares about cvsserver (I don't even really care myself). See also below. --- Features: ---

Re: [PATCH v5 05/12] Integrate wildmatch to git

2012-10-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +++ b/t/t3070-wildmatch.sh > @@ -0,0 +1,188 @@ > +#!/bin/sh > + > +test_description='wildmatch tests' > + > +. ./test-lib.sh > + > +match() { > +if [ $1 = 1 ]; then > + test_expect_success "wildmatch:match '$3' '$4'" " > + test-wildmatch wildmat

Re: [PATCH v5 04/12] wildmatch: remove unnecessary functions

2012-10-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- The comment-fix seems to be new but otherwise this is unchanged, right? > wildmatch.c | 164 > > wildmatch.h | 2 - > 2 files changed, 10 insertions(+), 1

Re: [PATCH v5 07/12] wildmatch: make wildmatch's return value compatible with fnmatch

2012-10-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > wildmatch returns non-zero if matched, zero otherwise. This patch > makes it return zero if matches, non-zero otherwise, like fnmatch(). > > Signed-off-by: Nguyễn Thái Ngọc Duy > --- OK, so ABORT cases where the patterns are either broken or impossible to match a

Re: [PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint

2012-10-13 Thread Nguyen Thai Ngoc Duy
On Sun, Oct 14, 2012 at 12:02 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> Signed-off-by: Nguyễn Thái Ngọc Duy >> --- > > The description to justify why it is ctype2[] seems to have been > lost. Intended? Nope. I added the description after generating patches and forgot to up

Re: [PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint

2012-10-13 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- The description to justify why it is ctype2[] seems to have been lost. Intended? > ctype.c | 18 ++ > git-compat-util.h | 13 + > 2 files changed, 31 insertions(+) > > diff --git a

Re: looking for suggestions for managing a tree of server configs

2012-10-13 Thread david
On Sat, 13 Oct 2012, Junio C Hamano wrote: da...@lang.hm writes: I've got a directory tree that holds config data for all my servers. This consists of one directory per server (which is updated periodically from what is currently configured on that server), plus higher level summary reports an

Re: [RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-13 Thread Junio C Hamano
Jonathan Nieder writes: > Hi Jeff, > > In August, Jeff King wrote: > >> Before reading a config file, we check "!access(path, R_OK)" >> to make sure that the file exists and is readable. If it's >> not, then we silently ignore it. > > git became noisy: > > $ git fetch --all > warning: unable to

Re: git reflog delete HEAD@{1} HEAD@{2} caught me by surprise...

2012-10-13 Thread Junio C Hamano
"George Spelvin" writes: > Try the following commands in an empty directory: > (I'm using the bash extention for {1..5}.) > > git init > for i in {1..5}; do git commit -m "Commit $i" --allow-empty; done > git reflog > bc93e06 HEAD@{0}: commit: Commit 5 > e14f92d HEAD@{1}: commit: Comm

Re: looking for suggestions for managing a tree of server configs

2012-10-13 Thread Junio C Hamano
da...@lang.hm writes: > I've got a directory tree that holds config data for all my > servers. This consists of one directory per server (which is updated > periodically from what is currently configured on that server), plus > higher level summary reports and similar information. > > today I have

Re: Why git shows staging area to users?

2012-10-13 Thread Junio C Hamano
David Aguilar writes: > On Sat, Oct 13, 2012 at 2:08 PM, Yi, EungJun wrote: >> Hi, all. >> >> Why git shows staging area to users, compared with the other scms hide >> it? What benefits users get? > > http://thkoch2001.github.com/whygitisbetter/#the-staging-area > http://tomayko.com/writings/the

Re: A design for subrepositories

2012-10-13 Thread Junio C Hamano
"Lauri Alanko" writes: > Firstly, if you simply do "git submodule add ./foo" (the obligatory > "./" being quite an unobvious pitfall), you get something quite > fragile, since now we have submodule.foo.url = ./foo. If the > submodules ever get reorganized and foo is moved to ./bar, then it is > i

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-13 Thread Junio C Hamano
Johannes Sixt writes: > It might be worth it. We already have a similar special case in > write_or_die.c:maybe_flush_or_die() for Windows, although it is not about > a colon in a path name. > > Perhaps like this. Hrm, the "we already have" one b2f5e26 (Windows: Work around an oddity when a pipe

Re: [PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes

2012-10-13 Thread Nguyen Thai Ngoc Duy
On Sun, Oct 14, 2012 at 12:44 AM, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Junio, > > This test in the current pu branch (commit bb0e6bf "Merge branch > 'aw/rebase-am-failure-detection' into pu", 11-10-2012) overwrites > the contents of t/.gitattributes. Note that the merg

[PATCH v5 12/12] Support "**" wildcard in .gitignore and .gitattributes

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/gitignore.txt| 19 +++ attr.c | 4 +++- dir.c | 4 +++- t/t0003-attributes.sh | 37 + t/t3001-ls-files-others-

[PATCH v5 11/12] wildmatch: make /**/ match zero or more directories

2012-10-13 Thread Nguyễn Thái Ngọc Duy
"foo/**/bar" matches "foo/x/bar", "foo/x/y/bar"... but not "foo/bar". We make a special case, when foo/**/ is detected (and "foo/" part is already matched), try matching "bar" with the rest of the string. "Match one or more directories" semantics can be easily achieved using "foo/*/**/bar". This

[PATCH v5 10/12] wildmatch: adjust "**" behavior

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Standard wildmatch() sees consecutive asterisks as "*" that can also match slashes. But that may be hard to explain to users as "abc/**/def" can match "abcdef", "abcxyzdef", "abc/def", "abc/x/def", "abc/x/y/def"... This patch changes wildmatch so that users can do - "**/def" -> all paths ending w

[PATCH v5 09/12] wildmatch: fix case-insensitive matching

2012-10-13 Thread Nguyễn Thái Ngọc Duy
dowild() does case insensitive matching by lower-casing the text. That means lower case letters in patterns imply case-insensitive matching, but upper case means exact matching. We do not want that subtlety. Lower case pattern too so iwildmatch() always does what we expect it to do. Signed-off-by

[PATCH v5 08/12] wildmatch: remove static variable force_lower_case

2012-10-13 Thread Nguyễn Thái Ngọc Duy
One place less to worry about thread safety. Also combine wildmatch and iwildmatch into one. Signed-off-by: Nguyễn Thái Ngọc Duy --- test-wildmatch.c | 4 ++-- wildmatch.c | 21 + wildmatch.h | 3 +-- 3 files changed, 8 insertions(+), 20 deletions(-) diff --git a

[PATCH v5 07/12] wildmatch: make wildmatch's return value compatible with fnmatch

2012-10-13 Thread Nguyễn Thái Ngọc Duy
wildmatch returns non-zero if matched, zero otherwise. This patch makes it return zero if matches, non-zero otherwise, like fnmatch(). Signed-off-by: Nguyễn Thái Ngọc Duy --- test-wildmatch.c | 4 ++-- wildmatch.c | 21 - 2 files changed, 14 insertions(+), 11 deletions(

[PATCH v5 06/12] t3070: disable unreliable fnmatch tests

2012-10-13 Thread Nguyễn Thái Ngọc Duy
These tests show different results on different fnmatch() versions. We don't want to test fnmatch here. We want to make sure wildmatch behavior matches fnmatch and that only makes sense in cases when fnmatch() behaves consistently. Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t3070-wildmatch.sh | 8

[PATCH v5 05/12] Integrate wildmatch to git

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- .gitignore | 1 + Makefile | 3 + t/t3070-wildmatch.sh | 188 +++ t/t3070/wildtest.txt | 165 test-wildmatch.c | 14 wildmatch.c

[PATCH v5 04/12] wildmatch: remove unnecessary functions

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- wildmatch.c | 164 wildmatch.h | 2 - 2 files changed, 10 insertions(+), 156 deletions(-) diff --git a/wildmatch.c b/wildmatch.c index f3a1731..fae7397 100644 --- a/wildmatch.c +++ b/wildmatch

[PATCH v5 03/12] Import wildmatch from rsync

2012-10-13 Thread Nguyễn Thái Ngọc Duy
These files are from rsync.git commit f92f5b166e3019db42bc7fe1aa2f1a9178cd215d, which was the last commit before rsync turned GPL-3. All files are imported as-is and no-op. Adaptation is done in a separate patch. rsync.git -> git.git lib/wildmatch.[ch] wildmatch.[ch] wildtest.txt

[PATCH v5 02/12] ctype: support iscntrl, ispunct, isxdigit and isprint

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- ctype.c | 18 ++ git-compat-util.h | 13 + 2 files changed, 31 insertions(+) diff --git a/ctype.c b/ctype.c index faeaf34..b4bf48a 100644 --- a/ctype.c +++ b/ctype.c @@ -26,6 +26,24 @@ const unsigned char sane_ctype[2

[PATCH v5 01/12] ctype: make sane_ctype[] const array

2012-10-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- ctype.c | 2 +- git-compat-util.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ctype.c b/ctype.c index 9353271..faeaf34 100644 --- a/ctype.c +++ b/ctype.c @@ -14,7 +14,7 @@ enum { P = GIT_PATHSPEC_MAGIC /* other

[PATCH v5 00/12] nd/wildmatch

2012-10-13 Thread Nguyễn Thái Ngọc Duy
This version splits fnmatch/wildmatch tests separately in t3070 and disables a lot more fnmatch tests. It also fixes the "cd .." in t0003 test and a comment in front of dowild(). No functional changes. Nguyễn Thái Ngọc Duy (12): ctype: make sane_ctype[] const array ctype: support iscntrl, ispu

Re: Why git shows staging area to users?

2012-10-13 Thread Sitaram Chamarty
On Sun, Oct 14, 2012 at 2:38 AM, Yi, EungJun wrote: > Hi, all. > > Why git shows staging area to users, compared with the other scms hide > it? What benefits users get? > > I feel staging area is useful, but it is difficult to explain why when > someone asks me about that. I wrote this a long tim

Re: Why git shows staging area to users?

2012-10-13 Thread David Aguilar
On Sat, Oct 13, 2012 at 2:08 PM, Yi, EungJun wrote: > Hi, all. > > Why git shows staging area to users, compared with the other scms hide > it? What benefits users get? http://thkoch2001.github.com/whygitisbetter/#the-staging-area http://tomayko.com/writings/the-thing-about-git http://gitready.co

[PATCH 2/2] config: treat user and xdg config permission problems as errors

2012-10-13 Thread Jonathan Nieder
Git reads multiple configuration files: settings come first from the system config file (typically /etc/gitconfig), then the xdg config file (typically ~/.config/git/config), then the user's dotfile (~/.gitconfig), then the repository configuration (.git/config). Git has always used access(2) to d

[PATCH 1/2] config, gitignore: failure to access with ENOTDIR is ok

2012-10-13 Thread Jonathan Nieder
The access_or_warn() function is used to check for optional configuration files like .gitconfig and .gitignore and warn when they are not accessible due to a configuration issue (e.g., bad permissions). It is not supposed to complain when a file is simply missing. Noticed on a system where ~/.con

[RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-13 Thread Jonathan Nieder
Hi Jeff, In August, Jeff King wrote: > Before reading a config file, we check "!access(path, R_OK)" > to make sure that the file exists and is readable. If it's > not, then we silently ignore it. git became noisy: $ git fetch --all warning: unable to access '/home/jrn/.config/git/config': Not

Re: [PATCH] Fix spelling error in post-receive-email hook

2012-10-13 Thread Richard Fearn
I resent this patch as Gmail wrapped it. Sorry for the noise... Regards, Rich -- Richard Fearn richardfe...@gmail.com -- 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-

[PATCH] Fix spelling error in post-receive-email hook

2012-10-13 Thread Richard Fearn
Signed-off-by: Richard Fearn --- contrib/hooks/post-receive-email | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 01af9df..b2171a0 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-r

[PATCH] Fix spelling error in post-receive-email hook

2012-10-13 Thread Richard Fearn
Signed-off-by: Richard Fearn --- contrib/hooks/post-receive-email | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index 01af9df..b2171a0 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-r

git reflog delete HEAD@{1} HEAD@{2} caught me by surprise...

2012-10-13 Thread George Spelvin
Try the following commands in an empty directory: (I'm using the bash extention for {1..5}.) git init for i in {1..5}; do git commit -m "Commit $i" --allow-empty; done git reflog bc93e06 HEAD@{0}: commit: Commit 5 e14f92d HEAD@{1}: commit: Commit 4 ac64d8e HEAD@{2}: commit:

looking for suggestions for managing a tree of server configs

2012-10-13 Thread david
I've got a directory tree that holds config data for all my servers. This consists of one directory per server (which is updated periodically from what is currently configured on that server), plus higher level summary reports and similar information. today I have just a single git tree coveri

Re: A design for subrepositories

2012-10-13 Thread perryh
"Lauri Alanko" wrote: > I'm going to get a bit religious here: > anything longer than a screenful shouldn't be written in shell ... Whence cometh this religion? I've heard of a modularity principle wherein no one function, in any language, ought to be longer than a page, but what's special abou

Re: A design for subrepositories

2012-10-13 Thread Lauri Alanko
Quoting "Junio C Hamano" : Now the subdirectory repositories are bound as submodules of the top level directory just fine. This is indeed possible, but with some serious caveats. Firstly, if you simply do "git submodule add ./foo" (the obligatory "./" being quite an unobvious pitfall), you g

Re: [RFC/PATCH] l10n: de.po: translate 825 new messages

2012-10-13 Thread Thomas Rast
Hi Ralf I just realized that, unfortunately, your original message is far beyond the message size limit on vger (10 bytes according to [1]). So nobody outside of the Cc list has seen it... Note for other readers: the glossary (also mentioned a few times below) is at https://github.com/ral

[PATCH] t0003-attributes.sh: Don't overwrite t/.gitattributes

2012-10-13 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, This test in the current pu branch (commit bb0e6bf "Merge branch 'aw/rebase-am-failure-detection' into pu", 11-10-2012) overwrites the contents of t/.gitattributes. Note that the merge of the two branches 'nd/wildmatch' and 'nd/attr-match-optim-more' bo

Re: A design for subrepositories

2012-10-13 Thread Junio C Hamano
"Lauri Alanko" writes: > I intend to work on a "subrepository" tool for git, but before I > embark on the actual programming, I thought to first invite comments > on the general design. > > Some background first. I know that there are several existing > approaches already for managing nested repo

A design for subrepositories

2012-10-13 Thread Lauri Alanko
Hello. I intend to work on a "subrepository" tool for git, but before I embark on the actual programming, I thought to first invite comments on the general design. Some background first. I know that there are several existing approaches already for managing nested repositories, but none o

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

2012-10-13 Thread Tomi Belan
Hello folks, I think I might've found a bug in git-subtree: I have a repository containing a directory "foo". I'd like to use its code in other projects, so I want to split it off into its own repository with git-subtree. But it doesn't work as it should. I found out that long ago, my repository c