Re: Feature Request - Hide ignored files before checkout

2012-12-08 Thread Chris Rorvick
On Sat, Dec 8, 2012 at 6:06 PM, Matthew Ciancio wrote: > Hi Chris, > > Yes, I don't think I have explained myself well enough. > > When I say "disappear" I do not mean "get deleted", I mean: go out of view > just like foo.txt does, as it is committed to branchB and not merged into > branchA. > > S

[PATCH 8/8] t9402: Use TABs for indentation

2012-12-08 Thread Torsten Bögershausen
Use TAB's for indentation Put the closing ' at the begin of the line Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 746 +- 1 file changed, 373 insertions(+), 373 deletions(-) diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-g

[PATCH 7/8] t9402: Rename check.cvsCount and check.list

2012-12-08 Thread Torsten Bögershausen
Checking and comparing the number of line in check.list and check.cvsCount had been replaced by comparing both files line by line. Rename the filenames to make clear which is expected and which is actual: check.list-> list.expected check.cvsCount-> list.actual Signed-off-by: Torsten Bögershaus

[PATCH 6/8] t9402: Simplify git ls-tree

2012-12-08 Thread Torsten Bögershausen
Use "git ls-tree --name-only" which does not need a sed to filter out the sha Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh index d525778..fad

[PATCH 6/8] t9402: Simplify git ls-tree

2012-12-08 Thread Torsten Bögershausen
Use "git ls-tree --name-only" which does not need a sed to filter out the sha Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh index d525778..fad

[PATCH 5/8] t9402: Add missing &&; Code style

2012-12-08 Thread Torsten Bögershausen
Add missing && at 2 places Re-formated the sub-shell parantheses (coding style) Added missing ] in the test_expect_success header at 2 places Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 110 -- 1 file changed, 52 insertions(+),

[PATCH 4/8] t9402: No space after IO-redirection

2012-12-08 Thread Torsten Bögershausen
Redirection should not have SP before the filename (i.e. ">out", not "> out"). Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 60 +-- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/t/t9402-git-cvsserver-refs.sh b/t

[PATCH 3/8] t9402: Dont use test_must_fail cvs

2012-12-08 Thread Torsten Bögershausen
Replace "test_must_fail cvs" with "! cvs" Signed-off-by: Torsten Bögershausen --- t/t9402-git-cvsserver-refs.sh | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh index f1bea0f..21000ec 100755 -

[PATCH 2/8] t9402: improve check_end_tree() and check_end_full_tree()

2012-12-08 Thread Torsten Bögershausen
check_end_tree(): - Instead of counting lines using wc in expectCount and cvsCount: Sort and compare the files byte by byte with test_cmp, which is more exact and easier to debug - Chain all shell comands together using && check_end_full_tree() - Instead of counting lines using wc in expectC

[PATCH 1/8] t9402: sed -i is not portable

2012-12-08 Thread Torsten Bögershausen
On some systems sed allows the usage of e.g. sed -i -e "s/line1/line2/" afile to edit the file "in place". Other systems don't allow that: one observed behaviour is that sed -i -e "s/line1/line2/" afile creates a backup file called afile-e, which breaks the test. As sed -i is not part of POSIX, avo

[PATCHv2] Add directory pattern matching to attributes

2012-12-08 Thread Jean-Noël AVILA
The manpage of gitattributes says: "The rules how the pattern matches paths are the same as in .gitignore files" and the gitignore pattern matching has a pattern ending with / for directory matching. This rule is specifically relevant for the 'export-ignore' rule used for git archive. Signed-off-

[PATCH] shortlog: Fix wrapping lines of wraplen (was broken since recent off-by-one fix)

2012-12-08 Thread Steffen Prohaska
A recent commit [1] fixed a off-by-one wrapping error. As a side-effect, add_wrapped_shortlog_msg() needs to be changed to always append a newline. [1] 14e1a4e1ff70aff36db3f5d2a8b806efd0134d50 utf8: fix off-by-one wrapping of text Signed-off-by: Steffen Prohaska --- builtin/shortlog.c |

Re: Feature Request - Hide ignored files before checkout

2012-12-08 Thread Chris Rorvick
On Fri, Dec 7, 2012 at 6:50 PM, Matthew Ciancio wrote: > Imagine this scenario: > > 1) You have a Git repo with two branches (branchA and branchB), which are > currently identical. > 2) Checkout to branch. > 3) Create file foo.txt, stage it and commit it. > 4) Create file ignore.txt and add it to

[PATCH] gitk: read and write a repository specific configuration file

2012-12-08 Thread Łukasz Stelmach
Enable gitk read and write repository specific configuration file: ".git/k" if the file exists. To make gitk use the local file simply create one, e.g. with the touch(1) command. This is very useful if one uses different views for different repositories. Now there is no need to store all of them i

Re: [PATCH] git(1): remove a defunct link to "list of authors"

2012-12-08 Thread Jeff King
On Fri, Dec 07, 2012 at 01:09:51PM -0800, Shawn O. Pearce wrote: > On Fri, Dec 7, 2012 at 9:59 AM, Junio C Hamano wrote: > > Junio C Hamano writes: > > > >> The linked page has not been showing the promised "more complete > >> list" for more than 6 months by now, and nobody has resurrected > >>

Re: [PATCH] sh-setup: work around "unset IFS" bug in some shells

2012-12-08 Thread Andreas Schwab
Junio C Hamano writes: > Andreas Schwab writes: > >> Junio C Hamano writes: >> >>> +# Similarly for IFS, but some shells (e.g. FreeBSD 7.2) are buggy and >>> +# do not equate an unset IFS with IFS with the default, so here is >>> +# an explicit SP HT LF. >>> +IFS=' >>> +' >> >> Trailing w