What can cause empty GIT_AUTHOR_NAME for 'git filter-branch --tree-filter' on Solaris?

2012-10-16 Thread Ilya Basin
The filter-branch command, the contents of ~/.gitconfig and the tree are the same. The command succeeds on cygwin, but fails on Solaris due to unset GIT_AUTHOR_NAME and GIT_COMMITTER_NAME : $ git filter-branch --tree-filter "env | grep GIT_ ; $CMD" b416b9bfc5e71531f2f05af4c396bb0ba7560741..HEAD R

Re: [PATCH] notes: mention --notes in more places

2012-10-16 Thread Junio C Hamano
Jeff King wrote: >It may also make sense to show notes differently when outputting the >"email" format as format-patch does. E.g., using a triple-dash would >keep them separate from the commit message when using "git am". Like: > > your commit message > > Signed-off-by: You > --- > your notes

Re: [PATCH] notes: mention --notes in more places

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 09:19:35PM -0600, Eric Blake wrote: > Every so often, I search 'git send-email --help' to remember some > option I've used in the past, only to discover that the option is > documented instead in 'git format-patch --help'. Worse, even that > command didn't document the opt

Re: [PATCH v4] git-cvsimport: allow author-specific timezones

2012-10-16 Thread Junio C Hamano
Chris Rorvick writes: > CVS patchsets are imported with timestamps having an offset of + > (UTC). The cvs-authors file is already used to translate the CVS > username to full name and email in the corresponding commit. Extend > this file to support an optional timezone for calculating a use

Re: [PATCH] notes: mention --notes in more places

2012-10-16 Thread Junio C Hamano
Eric Blake writes: > * git-notes.txt: Mention that --notes option exists in many > commands to override defaults. > * git-format-patch.txt: Include pretty-options, for things like > --notes. > * git-send-email.txt: Mention that revision lists forwarded to > format-patch can also include options.

Re: git rebase -p and patch equivalent commits

2012-10-16 Thread Martin von Zweigbergk
On Tue, Oct 16, 2012 at 12:58 PM, Damien Robert wrote: > Now feature is rebased against master. How would you rebase the branches > patch1, patch2 and build so that they keep the same layout? > > I tried to rebase patch1 and patch2, hoping that rebase -p build would use > the rebased commits for t

[PATCH v4] git-cvsimport: allow author-specific timezones

2012-10-16 Thread Chris Rorvick
CVS patchsets are imported with timestamps having an offset of + (UTC). The cvs-authors file is already used to translate the CVS username to full name and email in the corresponding commit. Extend this file to support an optional timezone for calculating a user- specific timestamp offset. S

[PATCH] notes: mention --notes in more places

2012-10-16 Thread Eric Blake
Every so often, I search 'git send-email --help' to remember some option I've used in the past, only to discover that the option is documented instead in 'git format-patch --help'. Worse, even that command didn't document the option I was looking for today, which was how to include 'git notes' in

Please pull git-l10n updates for Swedish and Vietnamese

2012-10-16 Thread Jiang Xin
Hi, Junio The following changes since commit d25c58ce43f45734ef74595b1e6fba1199651699: Documentation/RelNotes: remove "updated up to this revision" markers (2012-10-16 15:35:00 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes u

Re: feature request

2012-10-16 Thread Andrew Ardill
On 17 October 2012 04:27, Angelo Borsotti wrote: > Hi Andrew, > > one nice thing is to warn a developer that wants to modify a source > file, that there is somebody else changing it beforehand. It is nicer > than discovering that at push time. > Take into account that there are changes in files th

Re: feature request

2012-10-16 Thread Sitaram Chamarty
On Tue, Oct 16, 2012 at 10:57 PM, Angelo Borsotti wrote: > Hi Andrew, > > one nice thing is to warn a developer that wants to modify a source > file, that there is somebody else changing it beforehand. It is nicer > than discovering that at push time. Andrew: also see http://sitaramc.github.com/

git submodule sync --recursive

2012-10-16 Thread Phil Hord
I noticed that this is not supported: git submodule sync --recursive I do not see any discussion in the relevant commits about why it cannot or should not be supported. Is it just an itch no one has scratched? Phil -- To unsubscribe from this list: send the line "unsubscribe git" in the bo

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Andrew Ardill
On 17 October 2012 04:23, Junio C Hamano wrote: > 乙酸鋰 writes: > >> I would like to suggest 2 merge options >> --dictator use all my changes >> --humble use all their changes >> >> These allows to produce a fast-forward commit, without resolving any >> conflicts. >> Sometimes, someone did som

Re: [Patch v3 0/8] Create single PDF for all HTML files

2012-10-16 Thread Junio C Hamano
Thomas Ackermann writes: > this is v3 of my patch series for creating a single PDF for all > git documentation files. > > There are only 2 changes since v2 (thanks to Junio for pointing me at these > issues) : > - The over-long lines in git-bisect-lk2009.txt where shortened by > abbreviating th

Re: [PATCH 3/3] Change colors to be based on git status -sb in color mode

2012-10-16 Thread Junio C Hamano
Junio C Hamano writes: > Simon Oosthoek writes: > >> Hi >> >> Fixed the mistakes of the last one, and I'm now using the symbolic names >> "ok_color" and "bad_color". >> The test for headless state is now more direct, and I hope it is still >> correct. >> >> /Simon > > Will apply with a bit mor

Re: [PATCH 3/3] Change colors to be based on git status -sb in color mode

2012-10-16 Thread Junio C Hamano
Simon Oosthoek writes: > Hi > > Fixed the mistakes of the last one, and I'm now using the symbolic names > "ok_color" and "bad_color". > The test for headless state is now more direct, and I hope it is still > correct. > > /Simon Will apply with a bit more readable log message. I think it wou

Re: error: git-fast-import died of signal 11

2012-10-16 Thread Andrew Wong
On Tue, Oct 16, 2012 at 3:41 PM, Uri Moszkowicz wrote: > I can do that if it still fails tomorrow. How do I build a debug version of > git? > > On Tue, Oct 16, 2012 at 2:35 PM, Andrew Wong wrote: >> Yea, it's a difficult problem to diagnose. It'd be really helpful if >> you can run a debug versi

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread Junio C Hamano
Jeff King writes: > A much bigger problem is the other places we reference sha1s. The > obvious place is trees, which have no room for backup pointers (either > in headers, or with a NUL trick). This is a tangent (as I do not have anything particularly worth adding on top of what have already be

git rebase -p and patch equivalent commits

2012-10-16 Thread Damien Robert
Hi all, I was wondering if you had any tips on the following workflow: I work on an experimental feature branch of a project. I have some patches that I implement in branch patch1 and patch2 on top of the feature branch. I test if they both work together by merging patch1 and patch2 into a build br

Re: [RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Junio C Hamano
Johannes Sixt writes: > Am 16.10.2012 17:07, schrieb Michael J Gruber: >> Some test want to use the time command (not the shell builtin) and test >> for its availability at /usr/bin/time. >> >> Provide a lazy prereq TIME_COMMAND which tests for $TEST_COMMAND_PATH, >> which can be set from config

[PATCH 3/3] Change colors to be based on git status -sb in color mode

2012-10-16 Thread Simon Oosthoek
Hi Fixed the mistakes of the last one, and I'm now using the symbolic names "ok_color" and "bad_color". The test for headless state is now more direct, and I hope it is still correct. /Simon this patch is an additional patch to the previous series of two. It also corrects the missing S and so

Re: error: git-fast-import died of signal 11

2012-10-16 Thread Uri Moszkowicz
I'm using Git 1.8.0-rc2 and cvs2git version 2.5.0-dev (trunk). The repository is almost 20 years old and should consist of mostly smallish plain text files. We've been tagging every commit, in addition to for releases and development branches, so there's a lot of tags and branches. I didn't see the

Re: [PATCH 00/20] git-cvsserver: add support for cvs "-r" refs

2012-10-16 Thread Junio C Hamano
Matthew Ogilvie writes: > I don't actually intend to use any of this myself. > > I started it a few years ago under the theory that a more accurate > emulation of CVS would make it easier to convince the team at $DAYJOB > to switch to git, but we eventually switched without using > git-cvsserver

Re: [RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Johannes Sixt
Am 16.10.2012 17:07, schrieb Michael J Gruber: > Some test want to use the time command (not the shell builtin) and test > for its availability at /usr/bin/time. > > Provide a lazy prereq TIME_COMMAND which tests for $TEST_COMMAND_PATH, > which can be set from config.mak. It defaults to /usr/bin/t

Re: push race

2012-10-16 Thread Junio C Hamano
Jeff King writes: > But still...the complexity is ugly, and we do not even have a measured > problem in the real world. This is not worth thinking about. :) Yup. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 11:32:38AM -0700, da...@lang.hm wrote: > >I don't see much point in it. If we want to add new backup pointers to > >commit objects, it is very easy to do so by adding new header fields. > > > >A much bigger problem is the other places we reference sha1s. The > >obvious plac

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread david
On Tue, 16 Oct 2012, Jeff King wrote: On Tue, Oct 16, 2012 at 01:58:06PM -0400, Theodore Ts'o wrote: I seem to recall that there was at least some discussion at one point about adding some extra fields to the commit object in a backwards compatible way by adding it after the trailing NUL. We

Re: [PATCH] status: add --long for default format

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 01:22:04PM -0400, Jeff King wrote: > 2. When an output format is given to "git commit", we > default to "--dry-run". This behavior would now kick in > when "--long" is given, too. I forgot to mention in my previous message: your patch should probably add "--lon

Re: [RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Stefano Lattarini
Hi Andreas. I hope you don't mind my nitpickiness, but ... On 10/16/2012 06:28 PM, Andreas Schwab wrote: > Michael J Gruber writes: > >> Some test want to use the time command (not the shell builtin) and test >> for its availability at /usr/bin/time. > > An alternative way to suppress the buil

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 01:58:06PM -0400, Theodore Ts'o wrote: > I seem to recall that there was at least some discussion at one point > about adding some extra fields to the commit object in a backwards > compatible way by adding it after the trailing NUL. We didn't end up > doing it, but I coul

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread Theodore Ts'o
I seem to recall that there was at least some discussion at one point about adding some extra fields to the commit object in a backwards compatible way by adding it after the trailing NUL. We didn't end up doing it, but I could see it being a useful thing nonetheless (for example, we could potenti

[PATCH] Cache stat_tracking_info() for faster status and branch -v

2012-10-16 Thread Nguyễn Thái Ngọc Duy
stat_tracking_info() is used to calculated how many commits ahead or behind for a branch. Rev walking can be slow especially when the branch is way behind its remote end. By caching the results, we won't have to rev walk every time we need these information. stat_tracking_info() cost can be greatly

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 01:34:41PM +0200, René Scharfe wrote: > FWIW, I couldn't measure a performance difference for git log with and > without the following patch, which catches commits created with your > hash collision trick, but might be too strict: > > diff --git a/commit.c b/commit.c > ind

[Patch v3 8/8] Wire everything into Makefile and Documentation/Makefile

2012-10-16 Thread Thomas Ackermann
- target "html" creates html for all files in Documentation/howto and Documentation/technical - new target "relnoteshtml" creates html for all release notes - new target "fullpdf" creates "git-doc.pdf" and uses targets "html", "relnoteshtml" and "pdf" - "html" does not use "relnoteshtml" Signed

Re: feature request

2012-10-16 Thread Angelo Borsotti
Hi Andrew, one nice thing is to warn a developer that wants to modify a source file, that there is somebody else changing it beforehand. It is nicer than discovering that at push time. Take into account that there are changes in files that may be incompatible to each other, or that can be amenable

[Patch v3 7/8] Create pdf from all html files

2012-10-16 Thread Thomas Ackermann
- use wkhtmltopdf ("patched QT" version) to combine all html files into a single pdf file "git-doc.pdf" - insert page breaks to separate major sections Signed-off-by: Thomas Ackermann --- Documentation/.gitignore | 1 + Documentation/footerend.txt | 4 Documentation/footerstart.t

[Patch v3 6/8] Prerequisites for creating nice html for all files in Documentation/RelNotes

2012-10-16 Thread Thomas Ackermann
- remove left-over shell-script fragments from some files Signed-off-by: Thomas Ackermann --- Documentation/RelNotes/1.5.2.1.txt | 6 -- Documentation/RelNotes/1.6.0.2.txt | 6 -- Documentation/RelNotes/1.6.1.3.txt | 4 Documentation/RelNotes/1.6.1.4.txt | 3 --- Documentation/RelN

[Patch v3 5/8] Prerequisites for creating nice html for all files in Documentation/howto

2012-10-16 Thread Thomas Ackermann
- create headlines with asciidoc markup - asciidoc box markup for mail replies in recover-corrupted-blob-object.txt - pretty-print shell script in update-hook-example.txt - correct indendation for allowed-users example in update-hook-example.txt - headline of every howto document starts with "How

Re: push race

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 10:21:02AM -0700, Junio C Hamano wrote: > > I suppose we could do the way unpack-objects does: prefer present > > objects and drop the new identical ones, no memcmp. Objects that are > > not bases, or are ref-delta bases, can be safely dropped. ofs-delta > > bases may lead

[Patch v3 4/8] Prerequisites for creating nice html for all files in Documentation/technical

2012-10-16 Thread Thomas Ackermann
- fix wrong asciidoc sectioning markup in index-format.txt, pack-format.txt and pack-protocol.txt - split an over-long line in pack-protocol.txt into several lines - add a markup box for definition part in shallow.txt - fix table markup in trivial-merge.txt Signed-off-by: Thomas Ackermann ---

[Patch v3 3/8] Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt

2012-10-16 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann --- Documentation/technical/send-pack-pipeline.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/technical/send-pack-pipeline.txt b/Documentation/technical/send-pack-pipeline.txt index 681efe4..9b5a0bc 100644 --- a/Document

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Junio C Hamano
乙酸鋰 writes: > I would like to suggest 2 merge options > --dictator use all my changes > --humble use all their changes > > These allows to produce a fast-forward commit, without resolving any > conflicts. > Sometimes, someone did something completely wrong, so the commit needs > to be ignore

Re: [PATCH] status: add --long for default format

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 11:22:49PM +0700, Nguyen Thai Ngoc Duy wrote: > This could be useful when the user sets an alias to "status --short" > and wants to get back the default format temporarily. Makes sense, but... > diff --git a/builtin/commit.c b/builtin/commit.c > index a17a5df..5adab33 100

[Patch v3 2/8] Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1

2012-10-16 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann --- Documentation/git-bisect-lk2009.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index 8a2ba37..ec4497e 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b

Re: push race

2012-10-16 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Tue, Oct 16, 2012 at 12:37 PM, Jeff King wrote: >> I suspect a site that is heavy on alternates is invoking the index-pack >> code path more frequently than necessary (e.g., history gets pushed to >> one forked repo, then when it goes to the next one, we may not

[Patch v3 1/8] Split over-long synopsis in git-fetch-pack.txt into several lines

2012-10-16 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann --- Documentation/git-fetch-pack.txt | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 474fa30..12cd8a2 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentatio

[Patch v3 0/8] Create single PDF for all HTML files

2012-10-16 Thread Thomas Ackermann
Hi, this is v3 of my patch series for creating a single PDF for all git documentation files. There are only 2 changes since v2 (thanks to Junio for pointing me at these issues) : - The over-long lines in git-bisect-lk2009.txt where shortened by abbreviating the SHA1s. - Pretty-printing the shel

Re: push race

2012-10-16 Thread Jeff King
On Tue, Oct 16, 2012 at 05:45:12PM +0700, Nguyen Thai Ngoc Duy wrote: > On Tue, Oct 16, 2012 at 12:37 PM, Jeff King wrote: > > I suspect a site that is heavy on alternates is invoking the index-pack > > code path more frequently than necessary (e.g., history gets pushed to > > one forked repo, th

Re: [PATCH 0/5] Fixing problem with deleting symrefs

2012-10-16 Thread Junio C Hamano
Johan Herland writes: > I see that Rene Scharfe has also worked on the same issue, while I was > preparing these patches... > > On Mon, Oct 15, 2012 at 11:29 AM, Junio C Hamano wrote: >> Even though update-ref deferences a symref when it updates one to point at a >> new object, I personally don'

Re: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Junio C Hamano
Michael J Gruber writes: > Some test want to use the time command (not the shell builtin) and test > for its availability at /usr/bin/time. As we have t/perf these days, I suspect that we should aim to remove these uses of /usr/bin/time in the main testsuite instead. The one in 3419 was "run th

Re: [PATCH 1/4] t3419-rebase-patch-id: heed USR_BIN_TIME prereq

2012-10-16 Thread Junio C Hamano
Michael J Gruber writes: > t3419 sets the t3419-rebase-patch-id.sh prereq based on the availability > of /usr/bin/time but calls the binary unconditionally (in debug mode). > > Make it run the timing only when the prereq is matched. > > Signed-off-by: Michael J Gruber I do not think we should s

Re: [RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Andreas Schwab
Michael J Gruber writes: > Some test want to use the time command (not the shell builtin) and test > for its availability at /usr/bin/time. An alternative way to suppress the builtin meaning is to quote it, like \time. Andreas. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58

[PATCH] status: add --long for default format

2012-10-16 Thread Nguyễn Thái Ngọc Duy
This could be useful when the user sets an alias to "status --short" and wants to get back the default format temporarily. Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-status.txt | 3 +++ builtin/commit.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Documentati

Re: [PATCH 2/4] test-lib: allow variable export from lazy prereq tests

2012-10-16 Thread Junio C Hamano
Michael J Gruber writes: > I don't think this has any adverse side effects, but I'm begging for > another set of eyeballs to have a look. (Test suite passes, of course.) The lazy prereqs are designed to be used lazily, in any test that he who wrote lazy-prereq did not anticipate. It is run insi

Re: [PATCH 12/12] Add git-check-ignore sub-command

2012-10-16 Thread Junio C Hamano
Adam Spiers writes: > On Mon, Oct 15, 2012 at 3:31 PM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> +For each pathname given via the command-line or from a file via >>> +`--stdin`, this command will list the first exclude pattern found (if >>> +any) which explicitly excludes or

Re: BUG when trying to delete symbolic refs

2012-10-16 Thread Junio C Hamano
René Scharfe writes: > Am 15.10.2012 10:50, schrieb Johan Herland: >> Basically, there is a "master" branch, and an "alias" symref to >> "master". When we naively try to delete the symref with "git branch -d >> alias", it ends up: >> >> - NOT deleting the "alias" symref >> - DELETING the "ma

Re: [PATCH 3/3] Change colors to be based on git status -sb in color mode

2012-10-16 Thread Junio C Hamano
Simon Oosthoek writes: > this patch is an additional patch to the previous series of two. > @@ -325,35 +323,45 @@ __git_ps1 () > > local f="$w$i$s$u" > if [ $pcmode = yes ]; then > + if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then >

Merge option suggestion (dictator, humble)

2012-10-16 Thread 乙酸鋰
Hi, I would like to suggest 2 merge options --dictator use all my changes --humble use all their changes These allows to produce a fast-forward commit, without resolving any conflicts. Sometimes, someone did something completely wrong, so the commit needs to be ignored. I cannot tell everyone

Re: [PATCH] git-cvsimport: allow author-specific timezones

2012-10-16 Thread Junio C Hamano
Jeff King writes: > On Mon, Oct 15, 2012 at 08:50:21PM -0700, Junio C Hamano wrote: > >> Chris Rorvick writes: >> >> > It occurred to me that the success of the unit test depends on the >> > host platform's zoneinfo database. I think this problem is inherent >> > with this functionality. Shou

RE: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Joachim Schmitz
> From: Michael J Gruber [mailto:g...@drmicha.warpmail.net] > Sent: Tuesday, October 16, 2012 5:07 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org; 'Junio C Hamano' > Subject: Re: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq > > Joachim Schmitz venit, vidit, dixit 16.10.2012 16:13

Re: [PATCH 12/12] Add git-check-ignore sub-command

2012-10-16 Thread Nguyen Thai Ngoc Duy
On Tue, Oct 16, 2012 at 9:09 PM, Adam Spiers wrote: > I was *intending* to finish it off soon, but I have been really busy > with work and other commitments recently, which has prevented this. I > don't currently have any unpublished changes which would conflict with > your recent work, and I'm a

[RFC/PATCH 3/4v2] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Some test want to use the time command (not the shell builtin) and test for its availability at /usr/bin/time. Provide a lazy prereq TIME_COMMAND which tests for $TEST_COMMAND_PATH, which can be set from config.mak. It defaults to /usr/bin/time. Signed-off-by: Michael J Gruber --- Here's what th

Re: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Joachim Schmitz venit, vidit, dixit 16.10.2012 16:13: >> From: Michael J Gruber [mailto:g...@drmicha.warpmail.net] >> Sent: Tuesday, October 16, 2012 1:40 PM >> To: git@vger.kernel.org >> Cc: Joachim Schmitz; Junio C Hamano >> Subject: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq >> >

RE: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Joachim Schmitz
> From: Michael J Gruber [mailto:g...@drmicha.warpmail.net] > Sent: Tuesday, October 16, 2012 1:40 PM > To: git@vger.kernel.org > Cc: Joachim Schmitz; Junio C Hamano > Subject: [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq > > Some test want to use the time command (not the shell buil

Re: [PATCH 12/12] Add git-check-ignore sub-command

2012-10-16 Thread Adam Spiers
On Mon, Oct 15, 2012 at 3:31 PM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> +For each pathname given via the command-line or from a file via >> +`--stdin`, this command will list the first exclude pattern found (if >> +any) which explicitly excludes or includes that pathname. Not

Re: [PATCH 12/12] Add git-check-ignore sub-command

2012-10-16 Thread Adam Spiers
Hi again, Firstly thanks very much for your recent work on this series! On Tue, Oct 16, 2012 at 4:08 AM, Nguyen Thai Ngoc Duy wrote: > Adam, do you have time to continue this series? I can help polish it > for inclusion, but I don't want to step in your way if you are quietly > updating it. I w

[PATCH 3/5] delete_ref(): Remove the correct reflog when deleting symrefs

2012-10-16 Thread Johan Herland
When deleting a symref (e.g. HEAD), we would incorrectly remove the reflog of the dereferenced ref (e.g. .git/logs/refs/heads/master), insted of the symref's reflog (e.g. .git/logs/HEAD). This patch ensures that we remove the reflog that corresponds to the removed (sym)ref. Signed-off-by: Johan H

[PATCH 5/5] branch -d: Fix failure to remove branch aliases (symrefs)

2012-10-16 Thread Johan Herland
With refs/heads/alias set up as a symref to refs/heads/master, 'git branch -d alias' should remove refs/heads/alias and not refs/heads/master. Signed-off-by: Johan Herland --- builtin/branch.c| 2 +- t/t3220-symbolic-ref-as-branch-alias.sh | 2 +- 2 files changed, 2 inser

[PATCH 4/5] Add tests for using symbolic refs as branch name aliases.

2012-10-16 Thread Johan Herland
A branch name alias is an alternative name for a branch, that is in most respects equivalent to using the proper branch name. It is implemented as a symbolic ref from the alias to the proper branch name. Currently branch aliases work well up to the point where you try to delete them (with "git bra

[PATCH 2/5] delete_ref(): Fix deletion of refs through symbolic refs

2012-10-16 Thread Johan Herland
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD' to delete refs/heads/master), the packed version of that ref would not be deleted, because delete_ref() would pass the symref name (as opposed to the dereferenced ref name) to repack_without_ref(). This patch revamps the log

[PATCH 1/5] t1400-update-ref: Add test verifying bug with symrefs in delete_ref()

2012-10-16 Thread Johan Herland
When deleting a ref through a symref (e.g. using 'git update-ref -d HEAD' to delete refs/heads/master), we currently fail to remove the packed version of that ref. This testcase demonstrates the bug. Signed-off-by: Johan Herland --- t/t1400-update-ref.sh | 18 ++ 1 file changed,

[PATCH 0/5] Fixing problem with deleting symrefs

2012-10-16 Thread Johan Herland
I see that Rene Scharfe has also worked on the same issue, while I was preparing these patches... On Mon, Oct 15, 2012 at 11:29 AM, Junio C Hamano wrote: > Even though update-ref deferences a symref when it updates one to point at a > new object, I personally don't think update-ref -d that derefs

Re: feature request

2012-10-16 Thread Christian Thaeter
Am Tue, 16 Oct 2012 13:36:04 +0200 schrieb Angelo Borsotti : > Hello, > > some VCS, e.g. ClearCase, allow to control the fetching of files so as > to warn, or > disallow parallel changes to the same files. > As of today, there is no way to implement the same kind of workflow > with git because th

Re: [PATCH] Add --unannotate option to git-subtree

2012-10-16 Thread James Nylen
On Tue, Oct 9, 2012 at 4:26 PM, James Nylen wrote: > This new option does the reverse of --annotate, which is more useful > when contributing back to a library which is also included in the > repository for a larger project, and perhaps in other situations as > well. > > Rather than adding a marke

[PATCH 4/4] t3302,t3419: use the TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Use the TIME_COMMAND prereq in both tests so that time from several paths can be used. Signed-off-by: Michael J Gruber --- t/t3302-notes-index-expensive.sh | 5 ++--- t/t3419-rebase-patch-id.sh | 7 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/t/t3302-notes-index-

[RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq

2012-10-16 Thread Michael J Gruber
Some test want to use the time command (not the shell builtin) and test for its availability at /usr/bin/time. Provide a lazy prereq TIME_COMMAND which tests for /usr/bin/time and /bin/time. If any is found, set TEST_COMMAND_PATH to the first match. Signed-off-by: Michael J Gruber --- Rather tha

[PATCH 2/4] test-lib: allow variable export from lazy prereq tests

2012-10-16 Thread Michael J Gruber
Currently, lazy prereq tests are run in a subshell which communicates only the exit code to the outer world. Run it as a subcommand so that variables can be exported to the test environment. Signed-off-by: Michael J Gruber --- I don't think this has any adverse side effects, but I'm begging for

[PATCH 1/4] t3419-rebase-patch-id: heed USR_BIN_TIME prereq

2012-10-16 Thread Michael J Gruber
t3419 sets the t3419-rebase-patch-id.sh prereq based on the availability of /usr/bin/time but calls the binary unconditionally (in debug mode). Make it run the timing only when the prereq is matched. Signed-off-by: Michael J Gruber --- t/t3419-rebase-patch-id.sh | 4 ++-- 1 file changed, 2 inse

[PATCH 0/4] Allow different time commands

2012-10-16 Thread Michael J Gruber
This mini series enables the use of the lazy prereq framework for tests which need a (non-builtin) time command. 1/4 is a bugfix 2/4 allows lazy prereq test scripts to set variables for later use 3/4 implements the prereq 4/4 uses it This should solve the problem reported by Joachim Schmitz. 3/4

Re: When Will We See Collisions for SHA-1? (An interesting analysis by Bruce Schneier)

2012-10-16 Thread René Scharfe
Am 15.10.2012 20:34, schrieb Jeff King: > On Mon, Oct 15, 2012 at 07:47:09PM +0200, Ævar Arnfjörð Bjarmason wrote: > >> On Mon, Oct 15, 2012 at 6:42 PM, Elia Pinto wrote: >>> Very clear analysis. Well written. Perhaps is it the time to update >>> http://git-scm.com/book/ch6-1.html (A SHORT NOTE A

Re: [PATCH UI experiment] diffstat: annotate/highlight new or removed files

2012-10-16 Thread Nguyen Thai Ngoc Duy
On Tue, Oct 16, 2012 at 4:03 AM, Junio C Hamano wrote: >> Coloring is to me an improvement over --summary. Probably the main >> point. Without it, perhaps it's not worth putting extra text to >> diffstat. > > It is kind of surprising that you did not choose to paint new in > green and gone in red,

Re: [PATCH 12/12] Add git-check-ignore sub-command

2012-10-16 Thread Nguyen Thai Ngoc Duy
Adam, do you have time to continue this series? I can help polish it for inclusion, but I don't want to step in your way if you are quietly updating it. On Tue, Oct 16, 2012 at 5:31 AM, Junio C Hamano wrote: >> + >> +If `-z` is specified, the output is a series of lines of the form: >> + > > Hmph

[PATCH] refs: lock symref that is to be deleted, not its target

2012-10-16 Thread René Scharfe
When delete_ref is called on a symref then it locks its target and then either deletes the target or the symref, depending on whether the flag REF_NODEREF was set in the parameter delopt. Instead, simply pass the flag to lock_ref_sha1_basic, which will then either lock the target or the symref, an

Re: BUG when trying to delete symbolic refs

2012-10-16 Thread René Scharfe
Am 15.10.2012 10:50, schrieb Johan Herland: > Basically, there is a "master" branch, and an "alias" symref to > "master". When we naively try to delete the symref with "git branch -d > alias", it ends up: > > - NOT deleting the "alias" symref > - DELETING the "master" loose ref > - NOT delet

Re: build deps

2012-10-16 Thread Michael J Gruber
David Aguilar venit, vidit, dixit 16.10.2012 03:39: > On Mon, Oct 15, 2012 at 1:53 PM, Junio C Hamano wrote: >> Michael J Gruber writes: >> grep.c:451:16: warning: comparison of unsigned enum expression < 0 is always false [-Wtautological-compare] if (p->field < 0 |

Re: error: git-fast-import died of signal 11

2012-10-16 Thread Michael Haggerty
On 10/15/2012 05:53 PM, Uri Moszkowicz wrote: > I'm trying to convert a CVS repository to Git using cvs2git. I was able to > generate the dump file without problem but am unable to get Git to > fast-import it. The dump file is 328GB and I ran git fast-import on a > machine with 512GB of RAM. > > f