Re: [PATCH 0/4] Good bye fnmatch

2014-02-15 Thread David Kastrup
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Long story short, we wanted globbing wildcard ** so I ripped wildmatch library from rsync to do it. Since version 3.0.0, rsync is GPLv3 URL:https://rsync.samba.org/GPL.html. So be sure to take an older version. And it opened a possibility to

Re: [PATCH 0/4] Good bye fnmatch

2014-02-15 Thread Duy Nguyen
On Sat, Feb 15, 2014 at 3:23 PM, David Kastrup d...@gnu.org wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Long story short, we wanted globbing wildcard ** so I ripped wildmatch library from rsync to do it. Since version 3.0.0, rsync is GPLv3 URL:https://rsync.samba.org/GPL.html. So

Re: [PATCH 0/4] Good bye fnmatch

2014-02-15 Thread David Kastrup
Duy Nguyen pclo...@gmail.com writes: On Sat, Feb 15, 2014 at 3:23 PM, David Kastrup d...@gnu.org wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Long story short, we wanted globbing wildcard ** so I ripped wildmatch library from rsync to do it. Since version 3.0.0, rsync is GPLv3

Re: error: src refspec refs/heads/master matches more than one.

2014-02-15 Thread Duy Nguyen
On Fri, Feb 14, 2014 at 08:32:07AM -0800, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Fri, Feb 14, 2014 at 7:45 PM, Andreas Schwab sch...@linux-m68k.org wrote: Josef Wolf j...@raven.inka.de writes: Notice the refs/heads _within_ refs/heads! Now I wonder how I

[PATCH] reset: setup worktree on --mixed

2014-02-15 Thread Nguyễn Thái Ngọc Duy
--mixed does mainly two things: read_from_tree(), which does not require a worktree, and refresh_index(), which does. Reported-by: Patrick Palka patr...@parcs.ath.cx Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/reset.c | 2 +- t/t7102-reset.sh | 11 +++ 2 files

Re: [PATCH] reset: setup worktree on --mixed

2014-02-15 Thread Duy Nguyen
On Sat, Feb 15, 2014 at 4:14 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: --mixed does mainly two things: read_from_tree(), which does not require a worktree, and refresh_index(), which does. .. and I should have run the entire test suite before sending this. It breaks t7103.5 (reset

[PATCH] [PATCH] Provide a release-notes man page / guide

2014-02-15 Thread Philip Oakley
Use the symlinked RelNote file as a list-block to act as the core of the release-notes man page. The mantainers work load should not be affected. Signed-off-by: Philip Oakley philipoak...@iee.org --- The included lines are inset 11 spaces by the man page asciidoc formatting so some are more

Re: Git GSoC 2014

2014-02-15 Thread Duy Nguyen
On Sat, Feb 15, 2014 at 7:17 PM, Thomas Rast t...@thomasrast.ch wrote: It also includes an ok from Nicolas Pitre, who has been the driving force behind packv5 development. The only thing that makes me uneasy is Nit: pack v4. You are probably confused with index v5, which is also cooking for a

Re: Git GSoC 2014

2014-02-15 Thread David Kastrup
Thomas Rast t...@thomasrast.ch writes: David Kastrup d...@gnu.org writes: This definitely should not be we'll think about it if and when that project is finished material. Yes, all of this is true. However, you are painting a big devil on the wall. [...] Your scenario above mostly

[PATCH] provide a Git user-manual man page

2014-02-15 Thread Philip Oakley
This is a resend of my original patch ($gman/240486), which disappeared without comment. I've cc'd those who have touched the User-Manual in the last year for comment on the provision of this access mechanism. The Git User Manual is formatted as a doc book, rather than as a man page so isn't

[PATCH] Provide a 'git help user-manual' route to the docbook

2014-02-15 Thread Philip Oakley
Signed-off-by: Philip Oakley philipoak...@iee.org --- Documentation/Makefile | 1 + Documentation/gituser-manual.txt | 34 ++ builtin/help.c | 1 + 3 files changed, 36 insertions(+) create mode 100644 Documentation/gituser-manual.txt

[PATCH] Fix documentation AsciiDoc links for external urls

2014-02-15 Thread Roberto Tyley
Turns out that putting 'link:' before the 'http' is actually superfluous in AsciiDoc, as there's already a predefined macro to handle it. http, https, [etc] URLs are rendered using predefined inline macros. http://www.methods.co.nz/asciidoc/userguide.html#_urls Hypertext links to files on the

[PATCH] git-contacts: do not fail parsing of good diffs

2014-02-15 Thread Lars Gullik Bjønnes
If a line in a patch starts with --- it will be deemed malformed unless it also contains the proper diff header format. This situation can happen with a valid patch if it has a line starting with -- and that line is removed. This patch just removes the check in git-contacts. Signed-off-by:

the top few commits disappeared after 'git rebase origin'

2014-02-15 Thread Hin-Tak Leung
(I have already worked around the issue, but just would like to report it and perhaps discuss - please cc'd as I am not subscribed). I noticed one or two most recent commits I made a few days ago is not around, so I thought I have mis-remembered it or forgot to do 'git add' (it was adding some

Is there something like a blamed diff?

2014-02-15 Thread David Kastrup
When comparing two branches, decorating the flat diff with the respectively responsible commits seems like it would be nice to do/have (the blame on the identical parts, in contrast, is not really interesting). Is there any tool that provides something like that? -- David Kastrup -- To

[PATCH 0/3] Wider exposure for index-v4

2014-02-15 Thread Thomas Gummerer
Hi, since index-v5 didn't seem to generate enough interest to be merged, I have a few patches that give users users easier access to index-v4. Until now users have to go into the source code and compile git themselves to use index-v4 by default, or use git-update-index to change the index file to

[PATCH 2/3] test-lib: allow setting the index format version

2014-02-15 Thread Thomas Gummerer
Allow adding a TEST_GIT_INDEX_VERSION variable to config.mak to set the index version with which the test suite should be run. If it isn't set, the default version given in the source code is used (currently version 3). To avoid breakages with index versions other than [23], also set the index

[PATCH 1/3] introduce GIT_INDEX_VERSION environment variable

2014-02-15 Thread Thomas Gummerer
Respect a GIT_INDEX_VERSION environment variable, when a new index is initialized. Setting the environment variable will not cause existing index files to be converted to another format, but will only affect newly written index files. This can be used to initialize repositories with index-v4.

[PATCH 3/3] read-cache: add index.version config variable

2014-02-15 Thread Thomas Gummerer
Add a config variable that allows setting the default index version when initializing a new index file. Similar to the GIT_INDEX_VERSION environment variable this only affects new index files. Signed-off-by: Thomas Gummerer t.gumme...@gmail.com --- Documentation/config.txt | 4

Re: Git GSoC 2014

2014-02-15 Thread Shawn Pearce
On Sat, Feb 15, 2014 at 4:17 AM, Thomas Rast t...@thomasrast.ch wrote: David Kastrup d...@gnu.org writes: Thomas Rast t...@thomasrast.ch writes: Motivation: I believe that migrating to libgit2 is the better approach, medium term, than rewriting everything ourselves to be nice, clean and

Re: [PATCH 0/3] Wider exposure for index-v4

2014-02-15 Thread Duy Nguyen
On Sun, Feb 16, 2014 at 2:23 AM, Thomas Gummerer t.gumme...@gmail.com wrote: Hi, since index-v5 didn't seem to generate enough interest to be merged, I I thought there were some comments last time that you were going to address and resubmit? have a few patches that give users users easier

Re: [PATCH 3/3] read-cache: add index.version config variable

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 2:23 PM, Thomas Gummerer t.gumme...@gmail.com wrote: Add a config variable that allows setting the default index version when initializing a new index file. Similar to the GIT_INDEX_VERSION environment variable this only affects new index files. Signed-off-by: Thomas

Re: [PATCH 3/3] config: teach git config --file - to read from the standard input

2014-02-15 Thread Eric Sunshine
On Fri, Feb 14, 2014 at 6:37 PM, Kirill A. Shutemov kir...@shutemov.name wrote: The patch extends git config --file interface to allow read config from stdin. Editing stdin or setting value in stdin is an error. Include by absolute path is allowed in stdin config, but not by relative path.

[PATCH v2] reset: optionally setup worktree and refresh index on --mixed

2014-02-15 Thread Nguyễn Thái Ngọc Duy
Refreshing index requires work tree. So we have to options: always set up work tree (and refuse to reset if failing to do so), or make refreshing index optional. As refreshing index is not the main task, it makes more sense to make it optional. Reported-by: Patrick Palka patr...@parcs.ath.cx

Re: [PATCH v2] reset: optionally setup worktree and refresh index on --mixed

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 9:28 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Refreshing index requires work tree. So we have to options: always set s/to/two/ up work tree (and refuse to reset if failing to do so), or make refreshing index optional. As refreshing index is not the main

[PATCH 2/3] wt-status.c: move cut-line print code out to wt_status_add_cut_line

2014-02-15 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wt-status.c | 19 --- wt-status.h | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/wt-status.c b/wt-status.c index 65e35c3..ed31b6a 100644 --- a/wt-status.c +++ b/wt-status.c @@ -808,6 +808,17 @@ void

[PATCH 3/3] commit: add --cleanup=scissors

2014-02-15 Thread Nguyễn Thái Ngọc Duy
Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the commit message - 2013-12-05) we have a less fragile way to cut out git status at the end of a commit message but it's only enabled for stripping submodule shortlogs. Add new cleanup option that reuses the same mechanism for the

[PATCH 1/3] wt-status.c: make cut_lines[] const to shrink .data section a bit

2014-02-15 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wt-status.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wt-status.c b/wt-status.c index 4e55810..65e35c3 100644 --- a/wt-status.c +++ b/wt-status.c @@ -17,7 +17,7 @@ #include strbuf.h #include utf8.h -static

[PATCH 0/3] commit --cleanup=scissors marker

2014-02-15 Thread Nguyễn Thái Ngọc Duy
I've been bitten by --cleanup=default stripping my # lines a few times. Cutting git status with a long scissors marker line reduces chances of that happening. Most of the code is already there in 1a72cfd. This is just to add the UI. Nguyễn Thái Ngọc Duy (3): wt-status.c: make cut_lines[] const

Re: [PATCH 3/3] commit: add --cleanup=scissors

2014-02-15 Thread Eric Sunshine
On Sat, Feb 15, 2014 at 10:37 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the commit message - 2013-12-05) we have a less fragile way to cut out git status at the end of a commit message but it's only enabled for

[BUG?] git http connection reuse

2014-02-15 Thread Jeff King
I've noticed that git does not reuse http connections when fetching, and I'm trying to figure out why. It seems related to our use of two curl features: 1. If we use the curl_multi interface (even though we are doing the requests sequentially), we do not get reuse. 2. If we set

what the text=auto docs should be

2014-02-15 Thread Cameron Taggart
It would be better if the text=auto section of the gitattributes Manual Page had this: This ensures that all files that git considers to be the text will have normalized (LF) line endings in the repository. If core.autocrlf=true, core.eol will be used to normalize the files in your working

Re: [BUG?] git http connection reuse

2014-02-15 Thread Kyle J. McKay
On Feb 15, 2014, at 20:05, Jeff King wrote: I've noticed that git does not reuse http connections when fetching, and I'm trying to figure out why. It seems related to our use of two curl features: 1. If we use the curl_multi interface (even though we are doing the requests sequentially),

[PATCH] web--browse: Use powershell on Windows

2014-02-15 Thread Steven Penny
On Windows you can have either MinGW or Cygwin. As has been shown in this script MinGW uses start while Cygwin uses cygstart. The cygstart command is robust but the start command breaks on certain URLs $ git web--browse 'http://wikipedia.org/wiki/Key__Peele' '_Peele' is not recognized as