RE: Feature Request - Hide ignored files before checkout

2012-12-09 Thread Matthew Ciancio
I'm glad we are on the same page now and thanks for bringing in others. Not wanting the files in the repository seems to be in conflict with the desire to have them under its control (i.e., disappear/reappear behavior.) Sorry, when I said I didn't want them in the repository, I meant I wanted

Re: Feature Request - Hide ignored files before checkout

2012-12-09 Thread Junio C Hamano
Chris Rorvick ch...@rorvick.com writes: It's not in branchA, it's just no longer ignored because your changes to .gitignore were effectively reverted by jumping back to the commit that branchA points to. ... hide/reappear is the equivalent to saying deleted/created in the case of a tracked

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

2012-12-09 Thread Junio C Hamano
Łukasz Stelmach stl...@poczta.fm writes: 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

Re: [PATCH] shortlog: Fix wrapping lines of wraplen

2012-12-09 Thread Junio C Hamano
Steffen Prohaska proha...@zib.de writes: 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. Could you clarify As a side effect a bit more? Do you mean something like this? Earlier

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

2012-12-09 Thread Junio C Hamano
Torsten Bögershausen tbo...@web.de writes: Use TAB's for indentation Put the closing ' at the begin of the line Signed-off-by: Torsten Bögershausen tbo...@web.de --- The entire series looked cleanly done. I've tweaked the last patch a bit to wrap overlong lines, though. Thanks. -- To

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

2012-12-09 Thread Torsten Bögershausen
On 09.12.12 10:43, Junio C Hamano wrote: Torsten Bögershausen tbo...@web.de writes: Use TAB's for indentation Put the closing ' at the begin of the line Signed-off-by: Torsten Bögershausen tbo...@web.de --- The entire series looked cleanly done. I've tweaked the last patch a bit to wrap

[PATCH] Makefile: whitespace style fixes in macro definitions

2012-12-09 Thread Stefano Lattarini
Consistently use a single space before and after the = (or :=, +=, etc.) in assignments to make macros. Granted, this was not a big deal, but I did find the needless inconsistency quite distracting. Signed-off-by: Stefano Lattarini stefano.lattar...@gmail.com --- Makefile | 56

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

2012-12-09 Thread Paul Mackerras
On Sun, Dec 09, 2012 at 01:18:08AM -0800, Junio C Hamano wrote: Łukasz Stelmach stl...@poczta.fm writes: 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.

Re: [PATCH] git-clean: Display more accurate delete messages

2012-12-09 Thread Zoltan Klinger
Hrm, following your discussion (ellided above), I would have expected that you would show Removing directory foo/bar Removing untracked_file1 Also it would be nice to have warnings about undeleted directories since this git clean behavior (or the work around to pass -f twice) is

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

2012-12-09 Thread John Szakmeister
On Sun, Dec 9, 2012 at 5:01 AM, Torsten Bögershausen tbo...@web.de wrote: [snip] PS: for some reason I don't get any mails to my (google) account any more, which I use to read the list. Am I the only one having this problem? I noticed that the kernel.org lists are pretty unaccommodating. If

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

2012-12-09 Thread Lukasz Stelmach
W dniu 09.12.2012 10:18, Junio C Hamano pisze: Łukasz Stelmach stl...@poczta.fm writes: 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

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

2012-12-09 Thread Lukasz Stelmach
W dniu 09.12.2012 11:44, Paul Mackerras pisze: On Sun, Dec 09, 2012 at 01:18:08AM -0800, Junio C Hamano wrote: Łukasz Stelmach stl...@poczta.fm writes: Enable gitk read and write repository specific configuration file: .git/k if the file exists. To make gitk use the local file simply create

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

2012-12-09 Thread Nguyen Thai Ngoc Duy
On Sat, Dec 8, 2012 at 12:59 AM, Junio C Hamano gits...@pobox.com wrote: * If somebody has a working replacement URL, we could use that instead, of course. Takers? A possible alternative could be https://www.ohloh.net/p/git/contributors/summary Nice charts! -- Duy -- To unsubscribe

Re: Weird problem with git-submodule.sh

2012-12-09 Thread Stefano Lattarini
Hi Junio, Marc. On 12/07/2012 10:08 PM, Junio C Hamano wrote: Marc Branchaud marcn...@xiplink.com writes: It's FreeBSD 7.2, which I know is an obsolete version but I'm not able to upgrade the machine. I believe FreeBSD's sh is, or is derived from, dash. Finally. Yes, as you suspected, I

RE: Feature Request - Hide ignored files before checkout

2012-12-09 Thread Matthew Ciancio
I appreciate your involvement, Mr Hamano. You have made me realise that my intentions were flawed from the beginning, because I had been misusing the branch feature. Thank you for your time. -Original Message- From: Junio C Hamano [mailto:gits...@pobox.com] Sent: Sunday, 9 December

Re: exit code from git reset

2012-12-09 Thread Junio C Hamano
Martin von Zweigbergk martinv...@gmail.com writes: git reset currently returns 0 (if successful) while git reset $pathspec returns 0 iff the index matches HEAD after resetting (on all paths, not just those matching $pathspec). So in short, you observed that either of them reports with its

Re: exit code from git reset

2012-12-09 Thread Martin von Zweigbergk
On Sun, Dec 9, 2012 at 3:04 PM, Junio C Hamano gits...@pobox.com wrote: Martin von Zweigbergk martinv...@gmail.com writes: git reset currently returns 0 (if successful) while git reset $pathspec returns 0 iff the index matches HEAD after resetting (on all paths, not just those matching

Re: Feature Request - Hide ignored files before checkout

2012-12-09 Thread Andrew Ardill
Hi Matt, On 8 December 2012 11:50, Matthew Ciancio matthew.cianci...@gmail.com wrote: Problem: ignore.txt does not disappear like foo.txt does and is now just sitting in branchA (and now any other branch I checkout into). When I first started using Git, I genuinely thought this was a bug,

RE: Feature Request - Hide ignored files before checkout

2012-12-09 Thread Matthew Ciancio
Thanks for explaining that Andrew. I guess that was my intention: to have an ignored file snapshot, but I can see now that it goes against Git's definitions and is not really needed. I have overcome the problem by re-organising my repository and ... using more 'traditional' git workflows..

[PATCH] gitweb: Sort projects with undefined ages last

2012-12-09 Thread Matthew Daley
Sorting gitweb's project list by age ('Last Change') currently shows projects with undefined ages at the head of the list. This results in a less useful result when there are a number of projects that are missing or otherwise faulty and one is trying to see what projects have been updated

Re: [PATCH] gitweb: Sort projects with undefined ages last

2012-12-09 Thread Junio C Hamano
Matthew Daley mat...@gmail.com writes: Sorting gitweb's project list by age ('Last Change') currently shows projects with undefined ages at the head of the list. This results in a less useful result when there are a number of projects that are missing or otherwise faulty and one is trying to

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

2012-12-09 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Sat, Dec 8, 2012 at 12:59 AM, Junio C Hamano gits...@pobox.com wrote: * If somebody has a working replacement URL, we could use that instead, of course. Takers? A possible alternative could be

Re: [PATCH v2] cache-tree: invalidate i-t-a paths after generating trees

2012-12-09 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/cache-tree.c b/cache-tree.c index 28ed657..989a7ff 100644 --- a/cache-tree.c +++ b/cache-tree.c @@ -248,6 +248,7 @@ static int update_one(struct cache_tree *it, int missing_ok = flags WRITE_TREE_MISSING_OK; int

Re: [PATCH] git-clean: Display more accurate delete messages

2012-12-09 Thread Junio C Hamano
Zoltan Klinger zoltan.klin...@gmail.com writes: Would like to get some more feedback on the proposed output in case of (1) an untracked subdirectory with multiple files where at least one of them cannot be removed. (2) reporting ignored untracked git subdirectories Suppose we have a