Re: [PATCH v2] rev-list docs: clarify --topo-order description

2012-08-15 Thread Junio C Hamano
Junio C Hamano writes: > We could remove it if you find it confusing. > > I think the original motivation that line was added was to help > people who see "git log" (without any frills) output for the first > time not to be alarmed when they see newer things first: "In > general, the "time" flows

Re: [PATCH v2] rev-list docs: clarify --topo-order description

2012-08-15 Thread Junio C Hamano
Martin von Zweigbergk writes: > On Wed, Aug 15, 2012 at 1:02 PM, Junio C Hamano wrote: >> diff --git a/Documentation/rev-list-options.txt >> b/Documentation/rev-list-options.txt >> index 6a4b635..9404d08 100644 >> --- a/Documentation/rev-list-options.txt >> +++ b/Documentation/rev-list-options.

Re: [PATCH v2] rev-list docs: clarify --topo-order description

2012-08-15 Thread Martin von Zweigbergk
On Wed, Aug 15, 2012 at 1:02 PM, Junio C Hamano wrote: > diff --git a/Documentation/rev-list-options.txt > b/Documentation/rev-list-options.txt > index 6a4b635..9404d08 100644 > --- a/Documentation/rev-list-options.txt > +++ b/Documentation/rev-list-options.txt > @@ -578,16 +578,33 @@ Commit Orde

Re: [PATCH/RFC] index-pack: produce pack index version 3

2012-08-15 Thread Junio C Hamano
Shawn Pearce writes: > ... But I think its worth giving > him a few weeks to finish getting the code ready, vs. rushing > something in that someone else thinks might help. We have waited more > than 6 years or whatever to improve packing. Colby's experiments are > showing massive improvements (40

Re: Can't track untracked file

2012-08-15 Thread Junio C Hamano
Marco S Hyman writes: > And there is NOTHING I can do to get that directory into git. > > $ git add 2010 > $ git commit -m 'will it work?' > # On branch master > # Untracked files: > # (use "git add ..." to include in what will be committed) > # > # 2010/ > nothing added to co

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Junio C Hamano
Junio C Hamano writes: > My preference is to remove "static int is_executable()" function > from help.c, have an... > ... I wouldn't mind seeing the implementation of posix_is_executable() > in help.c, which will be dead-code on Windows and Cygwin, if that > makes linking and Makefile easier. An

Can't track untracked file

2012-08-15 Thread Marco S Hyman
Don't know if this is a git bug or something I'm doing wrong. Suggestions appreciated. On a machine named server: server[saturday]$ uname -a OpenBSD server.snafu.org 5.1 SERVER#342 amd64 server[saturday]$ git --version git version 1.7.6 server[saturday]$ git status # On branch master

[ANNOUNCE] Git v1.7.12-rc3

2012-08-15 Thread Junio C Hamano
A release candidate Git v1.7.12-rc3 is now available for testing at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 8719af22c3479b3e21845a6fba0b9c56087a0280 git-1.7.12.rc3.tar.gz 7dbb5ba4f9ed0202e7153e8728

[ANNOUNCE] Git v1.7.11.5

2012-08-15 Thread Junio C Hamano
The latest maintenance release Git v1.7.11.5 is now available at the usual places. The release tarballs are found at: http://code.google.com/p/git-core/downloads/list and their SHA-1 checksums are: 44013d9418ef23dd8bb67e80b27c9327356bfae8 git-1.7.11.5.tar.gz 8e19f56b2f484dc3327f1e8316c114d

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Junio C Hamano
Heiko Voigt writes: > I do not know why you are against filling that information into "struct > stat". Because it is *WRONG*. Isn't it a good enough reason? If the issue you are trying to solve were """stat emulation on Windows and Cygwin does not give the correct x-bit (and the user sometimes

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Heiko Voigt
Hi Junio, On Wed, Aug 15, 2012 at 10:53:55AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > > On Mon, Aug 13, 2012 at 10:48:14AM -0700, Junio C Hamano wrote: > >> Heiko Voigt writes: > >> > What do you think? > >> > >> Does having the "stat()" help on Windows in any way? Does it ever

Re: Feature request - discard hunk in add --patch mode

2012-08-15 Thread Junio C Hamano
Mina Almasry writes: > On 12-08-15 02:46 PM, Junio C Hamano wrote: > ... >> Please forget this question. A better way in the form of "stash -p" >> was suggested in the old thread to get rid of debug cruft in the >> tree before an "add -p" session (or during a series of "add -p" >> sessions). >>

Re: [PATCH/RFC v3 14/16] transport-helper: add import|export-marks to fast-import command line.

2012-08-15 Thread Florian Achleitner
On Wednesday 15 August 2012 22:20:45 Florian Achleitner wrote: > On Wednesday 15 August 2012 12:52:43 Junio C Hamano wrote: > > Florian Achleitner writes: > > > fast-import internally uses marks that refer to an object via its sha1. > > > Those marks are created during import to find previously cr

Re: Feature request - discard hunk in add --patch mode

2012-08-15 Thread Mina Almasry
On 12-08-15 02:46 PM, Junio C Hamano wrote: Junio C Hamano writes: Thomas Rast writes: This has come up before, and actually led to the introduction of 'checkout -p' and 'reset -p': http://thread.gmane.org/gmane.comp.version-control.git/123854 That is a blast from the past. Why is say

Re: [PATCH 2/4] revisions passed to cherry-pick should be in "default" order

2012-08-15 Thread Martin von Zweigbergk
On Wed, Aug 15, 2012 at 11:39 AM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >> Makes sense, I'll try to implement it that way. I was afraid that >> we would need to call prepare_revision_walk() once first and then >> if we afterwards find out that we should not walk, we would need >

Re: [PATCH/RFC v3 10/16] Create a note for every imported commit containing svn metadata.

2012-08-15 Thread Junio C Hamano
Florian Achleitner writes: > To provide metadata from svn dumps for further processing, e.g. > branch detection, attach a note to each imported commit that > stores additional information. > The notes are currently hard-coded in refs/notes/svn/revs. > Currently the following lines from the svn du

Re: [PATCH/RFC v3 11/16] When debug==1, start fast-import with "--stats" instead of "--quiet".

2012-08-15 Thread Junio C Hamano
Florian Achleitner writes: > fast-import prints statistics that could be interesting to the > developer of remote helpers. > > Signed-off-by: Florian Achleitner > --- Sounds sensible and could be useful outside the context of this series. Perhaps place it earlier in the series? > transport-h

Re: [PATCH/RFC v3 14/16] transport-helper: add import|export-marks to fast-import command line.

2012-08-15 Thread Florian Achleitner
On Wednesday 15 August 2012 12:52:43 Junio C Hamano wrote: > Florian Achleitner writes: > > fast-import internally uses marks that refer to an object via its sha1. > > Those marks are created during import to find previously created objects. > > At exit the accumulated marks can be exported to a f

Re: [PATCH/RFC v3 10/16] Create a note for every imported commit containing svn metadata.

2012-08-15 Thread Florian Achleitner
On Wednesday 15 August 2012 12:49:04 Junio C Hamano wrote: > Florian Achleitner writes: > > To provide metadata from svn dumps for further processing, e.g. > > branch detection, attach a note to each imported commit that > > stores additional information. > > The notes are currently hard-coded in

[PATCH v2] rev-list docs: clarify --topo-order description

2012-08-15 Thread Junio C Hamano
It was unclear what "--topo-order" was really about in the documentation. It is not just about "children before parent", but also about "don't mix lineages". Reword the description for both "--date-order" and "--topo-order", and add an illustration to it. Signed-off-by: Junio C Hamano --- Tho

Re: [PATCH/RFC v3 14/16] transport-helper: add import|export-marks to fast-import command line.

2012-08-15 Thread Junio C Hamano
Florian Achleitner writes: > fast-import internally uses marks that refer to an object via its sha1. > Those marks are created during import to find previously created objects. > At exit the accumulated marks can be exported to a file and reloaded at > startup, so that the previous marks are avai

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Junio C Hamano
Junio C Hamano writes: >> diff --git a/help.c b/help.c >> ... >> + > > Yuck. > > Why should we need even a single line of the implementation of a > function that tells if a given pathname contains an executable > command, which we know is platform specific? Sorry; sent without sufficient proof

Re: Your branch and 'origin/master' have diverged

2012-08-15 Thread Junio C Hamano
Junio C Hamano writes: > Updating Documentation/pull-fetch-param.txt would be a bear, though. > The documentation is stale in that it was written in the days back > when .git/remotes/ was the primary way to configure remotes, and was > not adjusted to use the termilology used in the [remote "wher

Re: Your branch and 'origin/master' have diverged

2012-08-15 Thread Junio C Hamano
"Holger Hellmuth (IKS)" writes: > Am 15.08.2012 19:30, schrieb Junio C Hamano: >> The current rule is very >> simple and understandable. You either say from the command line >> exactly what should happen (refspec without colon is the same as the >> refspec with colon at the end, meaning "do not

Re: [PATCH] gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

2012-08-15 Thread Junio C Hamano
Jakub Narebski writes: > On Thu, 9 Aug 2012, Junio C Hamano wrote: >> Jay Soffian writes: >> >> > When gitweb is used as a DirectoryIndex, it attempts to strip >> > PATH_INFO on its own, as $cgi->url() fails to do so. >> > >> > However, it fails to account for the fact that PATH_INFO has >> > a

Re: Feature request - discard hunk in add --patch mode

2012-08-15 Thread Junio C Hamano
Junio C Hamano writes: > Thomas Rast writes: > >> This has come up before, and actually led to the introduction of >> 'checkout -p' and 'reset -p': >> >> http://thread.gmane.org/gmane.comp.version-control.git/123854 > > That is a blast from the past. > > Why is saying "git checkout ." too much

Re: [PATCH 2/4] revisions passed to cherry-pick should be in "default" order

2012-08-15 Thread Junio C Hamano
Martin von Zweigbergk writes: > Makes sense, I'll try to implement it that way. I was afraid that > we would need to call prepare_revision_walk() once first and then > if we afterwards find out that we should not walk, we would need > to call it again without the reverse option. > But after look

Re: Your branch and 'origin/master' have diverged

2012-08-15 Thread Holger Hellmuth (IKS)
Am 15.08.2012 19:30, schrieb Junio C Hamano: The current rule is very simple and understandable. You either say from the command line exactly what should happen (refspec without colon is the same as the refspec with colon at the end, meaning "do not track"; if you want to track, you write what t

Re: [PATCH] gitweb: URL-decode $my_url/$my_uri when stripping PATH_INFO

2012-08-15 Thread Jakub Narebski
On Thu, 9 Aug 2012, Junio C Hamano wrote: > Jay Soffian writes: > > > When gitweb is used as a DirectoryIndex, it attempts to strip > > PATH_INFO on its own, as $cgi->url() fails to do so. > > > > However, it fails to account for the fact that PATH_INFO has > > already been URL-decoded by the web

Re: [PATCH 2/4] revisions passed to cherry-pick should be in "default" order

2012-08-15 Thread Martin von Zweigbergk
On Wed, Aug 15, 2012 at 10:16 AM, Junio C Hamano wrote: > Martin von Zweigbergk writes: > >> So all of the above case give the right result in the end as long >> as the timestamps are chronological, and case 1) gives the right >> result regardless. The other two cases only works in most cases >>

Re: Feature request - discard hunk in add --patch mode

2012-08-15 Thread Junio C Hamano
Thomas Rast writes: > Mina Almasry writes: > >> I frequently stage files using git add --patch command and I almost >> always come across debug code I want to discard, but there is no option >> for that in the prompt. The result is that I have to run an extra >> command after the dialogue end

Re: [PATCH v2] add some bash style we prefer

2012-08-15 Thread Junio C Hamano
Heiko Voigt writes: > During discussion of other patches these preferences have been revealed. > Lets add them to the guidelines. > > Signed-off-by: Heiko Voigt > --- > Here an updated version of the patch. Thanks. > > On Tue, Aug 14, 2012 at 02:09:35PM -0700, Junio C Hamano wrote: >> Heiko V

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Junio C Hamano
Heiko Voigt writes: > On Mon, Aug 13, 2012 at 10:48:14AM -0700, Junio C Hamano wrote: >> Heiko Voigt writes: >> > What do you think? >> >> Does having the "stat()" help on Windows in any way? Does it ever >> return an executable bit by itself? > > No, AFAIK it does not return anything about ex

Re: [PATCH/RFC v3 04/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability.

2012-08-15 Thread Junio C Hamano
Florian Achleitner writes: >> The updated code frees argv[] immediately after start_command() >> returns, and it may happen to be safe to do so with the current >> implementation of start_command() and friends, but I think it is a >> bad taste to free argv[] (or env[] for that matter) before call

Re: Your branch and 'origin/master' have diverged

2012-08-15 Thread Junio C Hamano
Thomas Rast writes: > Junio C Hamano writes: > >> Thomas Rast writes: >> >>> In some sense this is a really bad case of wrong UI design, because we >>> (this happens on #git a lot) have to teach users not to use the command >>> so they won't trip over this problem. It would be better to fix th

Re: [PATCH 2/4] revisions passed to cherry-pick should be in "default" order

2012-08-15 Thread Junio C Hamano
Martin von Zweigbergk writes: > So all of the above case give the right result in the end as long > as the timestamps are chronological, and case 1) gives the right > result regardless. The other two cases only works in most cases > because the unexpcted sorting when no-walk is in effect > counte

[PATCH v2] add some bash style we prefer

2012-08-15 Thread Heiko Voigt
During discussion of other patches these preferences have been revealed. Lets add them to the guidelines. Signed-off-by: Heiko Voigt --- Here an updated version of the patch. On Tue, Aug 14, 2012 at 02:09:35PM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > @@ -97,6 +102,7 @@ For shell s

Re: [PATCH] help: correct behavior for is_executable on Windows

2012-08-15 Thread Heiko Voigt
Hi Junio, On Mon, Aug 13, 2012 at 10:48:14AM -0700, Junio C Hamano wrote: > Heiko Voigt writes: > > What do you think? > > Does having the "stat()" help on Windows in any way? Does it ever > return an executable bit by itself? No, AFAIK it does not return anything about executability. But I th

Re: [PATCH] daemon: --access-hook option

2012-08-15 Thread Shawn Pearce
On Tue, Aug 14, 2012 at 10:12 PM, Junio C Hamano wrote: > The --access-hook option to "git daemon" specifies an external > command to be run every time a client connects, with > > - service name (e.g. "upload-pack", etc.), > - path to the repository, > - hostname (%H), > - canonical hostname (

Re: [PATCH/RFC v3 04/16] Connect fast-import to the remote-helper via pipe, adding 'bidi-import' capability.

2012-08-15 Thread Florian Achleitner
On Tuesday 14 August 2012 13:40:20 Junio C Hamano wrote: > Florian Achleitner writes: > > The fast-import commands 'cat-blob' and 'ls' can be used by remote-helpers > > to retrieve information about blobs and trees that already exist in > > fast-import's memory. This requires a channel from fast-i

Re: [PATCH/RFC v3 01/16] Implement a remote helper for svn in C.

2012-08-15 Thread Florian Achleitner
On Tuesday 14 August 2012 13:07:32 Junio C Hamano wrote: > Florian Achleitner writes: > > Enable basic fetching from subversion repositories. When processing remote > > URLs starting with svn::, git invokes this remote-helper. > > It starts svnrdump to extract revisions from the subversion reposit

Re: [PATCH/RFC v3 16/16] Add a test script for remote-svn.

2012-08-15 Thread Florian Achleitner
Forget this patch! It contains some unwanted content. Something with rebasing went wrong.. On Tuesday 14 August 2012 21:13:18 Florian Achleitner wrote: > Use svnrdump_sim.py to emulate svnrdump without an svn server. > Tests fetching, incremental fetching, fetching from file://, > and the regener

Re: Feature request - discard hunk in add --patch mode

2012-08-15 Thread Thomas Rast
Mina Almasry writes: > I frequently stage files using git add --patch command and I almost > always come across debug code I want to discard, but there is no option > for that in the prompt. The result is that I have to run an extra > command after the dialogue ends. > > I would like to add a

Re: [PATCH/RFC v3 07/16] Add a symlink 'git-remote-svn' in base dir.

2012-08-15 Thread Florian Achleitner
On Tuesday 14 August 2012 13:46:43 Junio C Hamano wrote: > Florian Achleitner writes: > > Allow execution of git-remote-svn even if the binary > > currently is located in contrib/svn-fe/. > > > > Signed-off-by: Florian Achleitner > > --- > > > > git-remote-svn |1 + > > 1 file changed, 1 i

Re: [PATCH/RFC v3 02/16] Integrate remote-svn into svn-fe/Makefile.

2012-08-15 Thread Florian Achleitner
On Tuesday 14 August 2012 13:14:12 Junio C Hamano wrote: > Florian Achleitner writes: > > Requires some sha.h to be used and the libraries > > to be linked, this is currently hardcoded. > > > > Signed-off-by: Florian Achleitner > > --- > > > > contrib/svn-fe/Makefile | 16 ++-- >

Feature request - discard hunk in add --patch mode

2012-08-15 Thread Mina Almasry
Hi, I frequently stage files using git add --patch command and I almost always come across debug code I want to discard, but there is no option for that in the prompt. The result is that I have to run an extra command after the dialogue ends. I would like to add a feature to allow users to d