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

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 recogn

Re: [BUG?] git http connection reuse

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),

what the text=auto docs should be

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 directo

[BUG?] git http connection reuse

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 CURLOPT_H

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

On Sat, Feb 15, 2014 at 10:37 PM, Nguyễn Thái Ngọc Duy 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 > stripping submodule

[PATCH 0/3] commit --cleanup=

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[] con

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

Signed-off-by: Nguyễn Thái Ngọc Duy --- 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 wt_status_truncat

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

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 th

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

Signed-off-by: Nguyễn Thái Ngọc Duy --- 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 char cut_line[] =

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

On Sat, Feb 15, 2014 at 9:28 PM, Nguyễn Thái Ngọc Duy 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 task, it makes mo

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

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 Signed-off-by: Nguyễn Th

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

On Fri, Feb 14, 2014 at 6:37 PM, Kirill A. Shutemov 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. > > Signed-off

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

On Sat, Feb 15, 2014 at 2:23 PM, Thomas Gummerer 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 Gummerer > ---

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

On Sun, Feb 16, 2014 at 2:23 AM, Thomas Gummerer 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 access to index-v4.

Re: Git GSoC 2014

On Sat, Feb 15, 2014 at 4:17 AM, Thomas Rast wrote: > David Kastrup writes: > >> Thomas Rast writes: >> >>> Motivation: I believe that migrating to libgit2 is the better approach, >>> medium term, than rewriting everything ourselves to be nice, clean and >>> thread-safe. I took a shot a while a

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

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 ve

[PATCH 1/3] introduce GIT_INDEX_VERSION environment variable

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. Si

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

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 --- Documentation/config.txt | 4 read-cache.c | 27 +

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

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

Is there something like a blamed diff?

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 unsubscr

the top few commits disappeared after 'git rebase origin'

(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 re

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

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:

[PATCH] Fix documentation AsciiDoc links for external urls

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] Provide a 'git help user-manual' route to the docbook

Signed-off-by: Philip Oakley --- Documentation/Makefile | 1 + Documentation/gituser-manual.txt | 34 ++ builtin/help.c | 1 + 3 files changed, 36 insertions(+) create mode 100644 Documentation/gituser-manual.txt diff --git a/Documen

[PATCH] provide a Git user-manual man page

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 direc

Re: Git GSoC 2014

Thomas Rast writes: > David Kastrup 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 applies if and when we

Re: Git GSoC 2014

On Sat, Feb 15, 2014 at 7:17 PM, Thomas Rast 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 while now. > t

git diff, external diff tool, and submodules

Hello, When a submodule has new commits, I noticed the following: $ git diff diff --git a/submodule b/submodule index 4c75be6..b272d40 16 --- a/submodule +++ b/submodule @@ -1 +1 @@ -Subproject commit 4c75be6435cd515887d35c300ed8b487f8143d8e +Subproject commit b272d4077fda29028c0bd02efba2837e

Re: Git GSoC 2014

David Kastrup writes: > Thomas Rast writes: > >> Motivation: I believe that migrating to libgit2 is the better approach, >> medium term, than rewriting everything ourselves to be nice, clean and >> thread-safe. I took a shot a while ago at making the pack reading code >> thread-safe, but it's a

Re: [PATCH 5/5] implement @{publish} shorthand

From: "Jeff King" Sent: Friday, January 24, 2014 9:35 PM On Thu, Jan 23, 2014 at 04:16:06PM -0800, Junio C Hamano wrote: Jeff King writes: > In a triangular workflow, you may have a distinct > @{upstream} that you pull changes from, but publish by > default (if you typed "git push") to a dif

[PATCH] Git release notes man page

A few days too late for the 1.9.0 release cycle :( This responds to Stefan N?we's request for a 'git help' command that would access the release notes. ($gmane/240595 17 Jan 2014). I've used the full name "release-notes" for the help guide rather than Stefan's original 'git help relnotes'. The r

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

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 --- The included lines are inset 11 spaces by the man page asciidoc formatting so some are more than 80 characters long.

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

On Sat, Feb 15, 2014 at 4:14 PM, Nguyễn Thái Ngọc Duy 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 --mixed in bare repos

[PATCH] reset: setup worktree on --mixed

--mixed does mainly two things: read_from_tree(), which does not require a worktree, and refresh_index(), which does. Reported-by: Patrick Palka Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/reset.c | 2 +- t/t7102-reset.sh | 11 +++ 2 files changed, 12 insertions(+), 1 deletion(-)

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

On Fri, Feb 14, 2014 at 08:32:07AM -0800, Junio C Hamano wrote: > Duy Nguyen writes: > > > On Fri, Feb 14, 2014 at 7:45 PM, Andreas Schwab > > wrote: > >> Josef Wolf writes: > >> > >>> Notice the refs/heads _within_ refs/heads! > >>> > >>> Now I wonder how I managed to get into this situation

Re: [PATCH 0/4] Good bye fnmatch

Duy Nguyen writes: > On Sat, Feb 15, 2014 at 3:23 PM, David Kastrup wrote: >> Nguyễn Thái Ngọc Duy 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 >> https://rsync.samba.org/GPL.ht

Re: [PATCH 0/4] Good bye fnmatch

On Sat, Feb 15, 2014 at 3:23 PM, David Kastrup wrote: > Nguyễn Thái Ngọc Duy 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 > https://rsync.samba.org/GPL.html>. So be sure to take an ol

Re: [PATCH 0/4] Good bye fnmatch

Nguyễn Thái Ngọc Duy 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 https://rsync.samba.org/GPL.html>. So be sure to take an older version. > And it opened a possibility to replace fnmatch co