Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 18:54, schrieb Junio C Hamano: > Ideally, that earlier workaround > should have done a logica equivalent of: > ... > and did so not in-line at the calling site but in a compat/ wrapper > for fflush() to eliminate the need for the ifdef. Fair enough. >> But reverting the EINVAL check

Re: push race

2012-10-15 Thread Angelo Borsotti
Hi Jeff, it would be worth to put your description as comments in the code for future reference. Thanks -Angelo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htm

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

2012-10-15 Thread Jeff King
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. Should the unit test attempt to

Re: push race

2012-10-15 Thread Jeff King
On Tue, Oct 16, 2012 at 12:15:21PM +0700, Nguyen Thai Ngoc Duy wrote: > On Tue, Oct 16, 2012 at 11:51 AM, Jeff King wrote: > >> Its worth nothing that a SHA-1 collision can be identified at the > >> server because the server performs a byte-for-byte compare of both > >> copies of the object to ma

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

2012-10-15 Thread Simon Oosthoek
Hi this patch is an additional patch to the previous series of two. It also corrects the missing S and some minor details. The main point of this one is changing the used colors to be more close to the color output of "git status -sb" Mainly, the branchname stays green until it loses a HEAD, in d

Re: push race

2012-10-15 Thread Jeff King
On Mon, Oct 15, 2012 at 07:09:52PM -0700, Shawn O. Pearce wrote: > On Mon, Oct 15, 2012 at 11:56 AM, Jeff King wrote: > > Right. The only thing that needs locking is the refs, because the object > > database is add-only for normal operations, and by definition collisions > > mean you have the sam

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

2012-10-15 Thread Junio C Hamano
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. Should the unit test attempt to detect > support for the used timezones and short circuit if this fails? N

Re: Cloning tags from master

2012-10-15 Thread PJ Weisberg
On Mon, Oct 15, 2012 at 12:44 PM, dquince wrote: > I am trying to implement using tags in our build process, but am running into > an issue with pulling tags from master. My scenario is as follows > We decide on a release and I tag master with testtag which has commit > testtag-1-gf3b117e > When I

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

2012-10-15 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

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

2012-10-15 Thread Chris Rorvick
On Mon, Oct 15, 2012 at 12:40 PM, Junio C Hamano wrote: >> diff --git a/t/t9604-cvsimport-timestamps.sh >> b/t/t9604-cvsimport-timestamps.sh >> new file mode 100644 > > Huh? What happened to the executable bit we saw earlier? Uh, yeah. Sorry about that. >> +test_expect_success 'check timestam

Re: push race

2012-10-15 Thread Shawn Pearce
On Mon, Oct 15, 2012 at 11:56 AM, Jeff King wrote: > Right. The only thing that needs locking is the refs, because the object > database is add-only for normal operations, and by definition collisions > mean you have the same content (or are astronomically unlucky, but your > consolation prize is

Re: build deps

2012-10-15 Thread David Aguilar
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 || GREP_HEADER_FIELD_MAX <= p->field) >>>

Please pull git-l10n updates for git v1.8.0-rc2-4-g42e55

2012-10-15 Thread Jiang Xin
Hi, Junio The following changes since commit 42e55a5f5709642cb7a56ecad8b706341f0eb38a: Merge branch 'maint' (2012-10-13 23:05:54 -0700) are available in the git repository at: git://github.com/git-l10n/git-po master for you to fetch changes up to 9306b5b9a33185e7867202718162d8a38d5627ab:

[PATCH v2] completion: add format-patch options to send-email

2012-10-15 Thread Felipe Contreras
Signed-off-by: Felipe Contreras --- v2: Fix comments by SZEDER Gabor contrib/completion/git-completion.bash | 35 +- t/t9902-completion.sh | 5 + 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/contrib/completion/git-complet

Re: [PATCH] completion: add format-patch options to send-email

2012-10-15 Thread Felipe Contreras
On Tue, Oct 16, 2012 at 1:37 AM, Felipe Contreras wrote: > On Tue, Oct 16, 2012 at 12:48 AM, SZEDER Gábor wrote: >>> + cd test >> >> This 'cd' makes all subsequent tests to be executed in a different >> repository than previously, which breaks 'checkout completes ref >> names'. > > I don't k

Re: [PATCH] completion: add format-patch options to send-email

2012-10-15 Thread SZEDER Gábor
On Tue, Oct 16, 2012 at 01:37:35AM +0200, Felipe Contreras wrote: > On Tue, Oct 16, 2012 at 12:48 AM, SZEDER Gábor wrote: > > >> @@ -1559,11 +1559,12 @@ _git_send_email () > >> --signed-off-by-cc --smtp-pass --smtp-server > >> --smtp-server-port --smtp-

Re: [PATCH] completion: add format-patch options to send-email

2012-10-15 Thread Felipe Contreras
On Tue, Oct 16, 2012 at 12:48 AM, SZEDER Gábor wrote: >> @@ -1559,11 +1559,12 @@ _git_send_email () >> --signed-off-by-cc --smtp-pass --smtp-server >> --smtp-server-port --smtp-encryption= --smtp-user >> --subject --suppress-cc= --

Re: [PATCH] completion: add format-patch options to send-email

2012-10-15 Thread Junio C Hamano
SZEDER Gábor writes: >> +cd test > > This 'cd' makes all subsequent tests to be executed in a different > repository than previously, which breaks 'checkout completes ref > names'. Yeah, thanks for spotting and yelling at it ;-). We really need to be careful about tests that cd around. Eve

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

2012-10-15 Thread Andrew Wong
On 10/15/2012 05:28 PM, Uri Moszkowicz wrote: Thanks for the reply. Yes I am using a 64-bit build of Git. The report is too large to attach to email so I've uploaded it here (~6MB tar.xz file): http://www.tempfiles.net/download/201210/267447/fast_import_crash18192.html Hm, there are some blanks

Re: [PATCH] completion: add format-patch options to send-email

2012-10-15 Thread SZEDER Gábor
Hi, On Sun, Oct 14, 2012 at 06:14:03PM +0200, Felipe Contreras wrote: > Signed-off-by: Felipe Contreras > --- > contrib/completion/git-completion.bash | 35 > +- > t/t9902-completion.sh | 21 > 2 files changed, 39 insertions(

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

2012-10-15 Thread Junio C Hamano
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. Note that > +within any given exclude file, later patterns take p

Re: nd/attr-match-more-optim, nd/wildmatch and as/check-ignore

2012-10-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > These three series all touch the same code in dir.c and cause > a bunch of conflicts. So I rebase nd/wildmatch and as/check-ignore > on top of nd/attr-match-more-optim and resolve all conflicts. Thanks for working on this. Makes my life much easier. If not "my l

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

2012-10-15 Thread Uri Moszkowicz
Thanks for the reply. Yes I am using a 64-bit build of Git. The report is too large to attach to email so I've uploaded it here (~6MB tar.xz file): http://www.tempfiles.net/download/201210/267447/fast_import_crash18192.html On Mon, Oct 15, 2012 at 4:12 PM, Andrew Wong wrote: > On 10/15/2012 11:5

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

2012-10-15 Thread Andrew Wong
On 10/15/2012 11:53 AM, 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. Just taking

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

2012-10-15 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > diffstat does not show whether a file is added or deleted. I know > --summary does. But the problem with --summary is it makes me look for > information of a file in two places: diffstat and summary. And with a > commit that adds/removes a lot, showing both --stat

Re: build deps

2012-10-15 Thread Junio C Hamano
Michael J Gruber writes: >> grep.c:451:16: warning: comparison of unsigned enum expression < 0 is >> always false [-Wtautological-compare] >> if (p->field < 0 || GREP_HEADER_FIELD_MAX <= p->field) >> ^ ~ >> 1 warning generated. > > Right, that enum typ

Re: [Patch 3/5] Create html documents for all files in Documentation/RelNotes

2012-10-15 Thread Junio C Hamano
Michael J Gruber writes: > Junio C Hamano venit, vidit, dixit 07.10.2012 22:53: >> Jeff King writes: >> >>> [1] I would not be surprised if they do not actually format all that >>> well. Though they are written in an asciidoc-ish style, they have >>> not traditionally been formatted, an

Cloning tags from master

2012-10-15 Thread dquince
I am trying to implement using tags in our build process, but am running into an issue with pulling tags from master. My scenario is as follows We decide on a release and I tag master with testtag which has commit testtag-1-gf3b117e When I make another commit to master and check the tag, I see it a

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

2012-10-15 Thread Jeff King
On Mon, Oct 15, 2012 at 09:09:44PM +0200, Elia Pinto wrote: > Hem , sha-3 i suppose, keccak, no ? But really is not so urgent as you > have already told . It depends. Read what Schneier wrote right before they announced the SHA-3 winner: https://www.schneier.com/crypto-gram-1210.html#2 There'

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

2012-10-15 Thread Elia Pinto
Hem , sha-3 i suppose, keccak, no ? But really is not so urgent as you have already told . Best 2012/10/15, 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. Pe

Re: push race

2012-10-15 Thread Jeff King
On Mon, Oct 15, 2012 at 05:50:47PM +0200, Angelo Borsotti wrote: > correct, there will be no file overwriting because no files are > written on the work tree. > I tried to follow the actions of the program, but did not quite catch > the 6. you mention. It is the "oldval" parameter to refs.c:updat

Re: push race

2012-10-15 Thread Jeff King
On Mon, Oct 15, 2012 at 10:29:08AM -0400, Marc Branchaud wrote: > Here's a previous discussion of a race in concurrent updates to the same ref, > even when the updates are all identical: > > http://news.gmane.org/find-root.php?group=gmane.comp.version-control.git&article=164636 > > In that threa

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

2012-10-15 Thread 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 ABOUT SHA-1) ? > > > > Hope useful > > > > htt

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Junio C Hamano
Simon Oosthoek writes: > The point of the thread and the patch was to enable the possibility of > colors in the prompt without messing it up. > > The actual colors used are more or less how I'm used to it, but as you > said they may not be suitable to everyone. > > @Junio, is this patch something

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

2012-10-15 Thread Elia Pinto
2012/10/15 Ævar Arnfjörð Bjarmason : > 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 ABOUT SHA-1) ? >> >> Hope useful >> >> http://www.schneier.com/crypto-gram-1210.html

Re: build deps

2012-10-15 Thread Thiago Farina
On Mon, Oct 15, 2012 at 12:44 PM, Michael J Gruber wrote: >> clang reported this: >> combine-diff.c:1006:19: warning: adding 'int' to a string does not >> append to the string [-Wstring-plus-int] >> prefix = COLONS + offset; >> ~~~^~~~ >> combine-di

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

2012-10-15 Thread Ævar Arnfjörð Bjarmason
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 ABOUT SHA-1) ? > > Hope useful > > http://www.schneier.com/crypto-gram-1210.html This would be concerning if the Git security

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

2012-10-15 Thread Jeff King
On Mon, Oct 15, 2012 at 01:55:51PM +0200, Michael J Gruber wrote: > > I wonder if a more sane route is to drop HTML entirely, convert the > > asciidoc to docbook (which we already do for manpages), and then create > > a docbook document that is a collection of all elements, which can then > > Hmm

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

2012-10-15 Thread Junio C Hamano
Chris Rorvick writes: > From: 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 timez

Re: A design for subrepositories

2012-10-15 Thread Jens Lehmann
Am 15.10.2012 00:59, schrieb Lauri Alanko: >>> la@bq:~/tmp/super$ git mv sub movedsub >>> fatal: source directory is empty, source=sub, destination=movedsub >> >> This error here indicates that we didn't teach git to properly move >> a submodule yet. It is one of my next goals to make "git [submodu

Re: Planning to pass the baton to an interim maintainer

2012-10-15 Thread Junio C Hamano
Michael J Gruber writes: > Jeff King venit, vidit, dixit 15.10.2012 07:56: >> On Sun, Oct 14, 2012 at 11:23:07AM -0700, Junio C Hamano wrote: >> >>> I am planning to >>> >>> * tag 1.8.0 final on Oct 21st (Sun); >>> * go offline on Oct 22nd (Mon); and >>> * come back online on Nov 12th (Mon).

Re: [PATCH v2 2/2] grep: stop looking at random places for .gitattributes

2012-10-15 Thread Junio C Hamano
Johannes Sixt writes: > For fflush() (as in write_or_die.c), EINVAL is not even listed > as possible error code. Therefore, catching EINVAL wholesale should not be > a problem, IMO, at least not "on other systems". I see a disturbing gap between "EINVAL is not supposed to be even possible" and "

Re: [PATCH v5 0/3] completion: refactor and zsh wrapper

2012-10-15 Thread Matthieu Moy
Felipe Contreras writes: > Hi, > > Here's a bit of reorganition. I'm introducing a new __gitcompadd helper that > is > useful to wrapp all changes to COMPREPLY. 2nd and 3rd patches show how it's > useful. > > The zsh wrapper is now very very simple, but I haven't received much feedback > yet. I

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

2012-10-15 Thread Elia Pinto
Very clear analysis. Well written. Perhaps is it the time to update http://git-scm.com/book/ch6-1.html (A SHORT NOTE ABOUT SHA-1) ? Hope useful http://www.schneier.com/crypto-gram-1210.html Best Regards -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to

error: git-fast-import died of signal 11

2012-10-15 Thread Uri Moszkowicz
Hi, 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. fatal: Out of memory? mmap failed: Cannot allocate memo

Re: push race

2012-10-15 Thread Angelo Borsotti
Hi Marc, correct, there will be no file overwriting because no files are written on the work tree. I tried to follow the actions of the program, but did not quite catch the 6. you mention. -Angelo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord

Re: Planning to pass the baton to an interim maintainer

2012-10-15 Thread Michael J Gruber
Jeff King venit, vidit, dixit 15.10.2012 07:56: > On Sun, Oct 14, 2012 at 11:23:07AM -0700, Junio C Hamano wrote: > >> I am planning to >> >> * tag 1.8.0 final on Oct 21st (Sun); >> * go offline on Oct 22nd (Mon); and >> * come back online on Nov 12th (Mon). >> >> Peff, could you be the interim

Re: build deps

2012-10-15 Thread Michael J Gruber
Thiago Farina venit, vidit, dixit 12.10.2012 06:08: > On Thu, Oct 11, 2012 at 10:06 PM, Andrew Wong > wrote: >> On 10/11/12 16:54, Thiago Farina wrote: >>> Just setting CC to gcc works for me. But still, I'd like to be able to >>> build with clang (may be as you noted is just something with the +

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

2012-10-15 Thread Michael J Gruber
Jeff King venit, vidit, dixit 08.10.2012 00:52: > On Sun, Oct 07, 2012 at 10:14:28AM +0200, Thomas Ackermann wrote: > >> There are "patched QT" and "unpatched QT" versions of wkhtmltopdf >> (see http://code.google.com/p/wkhtmltopdf/). I am using V0.9.9 for Windows >> which is "patched QT". > > Th

Re: [Patch 3/5] Create html documents for all files in Documentation/RelNotes

2012-10-15 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 07.10.2012 22:53: > Jeff King writes: > >> [1] I would not be surprised if they do not actually format all that >> well. Though they are written in an asciidoc-ish style, they have >> not traditionally been formatted, and I suspect there are many small >

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Simon Oosthoek venit, vidit, dixit 15.10.2012 15:20: > Hi Michael, sorry for the duplicate, forgot to reply-all... > > On 10/15/2012 11:13 AM, Michael J Gruber wrote: > >> ...only because you don't know the color coding scheme. It's green >> because those changes are saved somewhere (in the index

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Simon Oosthoek
On 10/15/2012 11:39 AM, Junio C Hamano wrote: Thanks for bringing some sanity to the color of the bikeshed ;-) As I don't use colors very much, I didn't bother checking the color assignment in the patch in question, but everything you said in your response makes 100% sense, including the traffic

Re: push race

2012-10-15 Thread Marc Branchaud
On 12-10-15 10:09 AM, Ævar Arnfjörð Bjarmason wrote: > On Mon, Oct 15, 2012 at 11:14 AM, Angelo Borsotti > wrote: >> Hello, > > FWIW we have a lot of lemmings pushing to the same ref all the time at > $work, and while I've seen cases where: > > 1. Two clients try to push > 2. They both get the

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

2012-10-15 Thread Nguyễn Thái Ngọc Duy
diffstat does not show whether a file is added or deleted. I know --summary does. But the problem with --summary is it makes me look for information of a file in two places: diffstat and summary. And with a commit that adds/removes a lot, showing both --stat --summary can be long. This patch adds

Re: push race

2012-10-15 Thread demerphq
On 15 October 2012 16:09, Ævar Arnfjörð Bjarmason wrote: > On Mon, Oct 15, 2012 at 11:14 AM, Angelo Borsotti > wrote: >> Hello, > > FWIW we have a lot of lemmings pushing to the same ref all the time at > $work, and while I've seen cases where: > > 1. Two clients try to push > 2. They both get

Re: push race

2012-10-15 Thread Ævar Arnfjörð Bjarmason
On Mon, Oct 15, 2012 at 11:14 AM, Angelo Borsotti wrote: > Hello, FWIW we have a lot of lemmings pushing to the same ref all the time at $work, and while I've seen cases where: 1. Two clients try to push 2. They both get the initial lock 3. One of them fails to get the secondary lock (I think

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Simon Oosthoek
Hi Michael, sorry for the duplicate, forgot to reply-all... On 10/15/2012 11:13 AM, Michael J Gruber wrote: ...only because you don't know the color coding scheme. It's green because those changes are saved somewhere (in the index) and would even survice a branch switch. But git doesn't exac

RE: make test

2012-10-15 Thread Joachim Schmitz
> From: Andreas Schwab [mailto:sch...@linux-m68k.org] > Sent: Monday, October 15, 2012 2:35 PM > To: Johannes Sixt > Cc: Joachim Schmitz; git@vger.kernel.org > Subject: Re: make test > > Johannes Sixt writes: > > > Am 10/15/2012 13:58, schrieb Joachim Schmitz: > >> ++ mkdir failing-cleanup > >>

RE: make test

2012-10-15 Thread Joachim Schmitz
> From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Monday, October 15, 2012 2:10 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: make test > > Am 10/15/2012 13:58, schrieb Joachim Schmitz: > > ++ mkdir failing-cleanup > > ++ cd failing-cleanup > > ++ cat > > ++ chmod +x

Re: make test

2012-10-15 Thread Andreas Schwab
Johannes Sixt writes: > Am 10/15/2012 13:58, schrieb Joachim Schmitz: >> ++ mkdir failing-cleanup >> ++ cd failing-cleanup >> ++ cat >> ++ chmod +x failing-cleanup.sh >> ++ test_must_fail ./failing-cleanup.sh >> + eval_ret=1 > > I wonder why the log does not show the commands of function > test_m

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:58, schrieb Joachim Schmitz: > ++ mkdir failing-cleanup > ++ cd failing-cleanup > ++ cat > ++ chmod +x failing-cleanup.sh > ++ test_must_fail ./failing-cleanup.sh > + eval_ret=1 I wonder why the log does not show the commands of function test_must_fail. Is there a 'set +x' hidden

RE: make test

2012-10-15 Thread Joachim Schmitz
> -Original Message- > From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Monday, October 15, 2012 1:53 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: make test > > Am 10/15/2012 13:37, schrieb Joachim Schmitz: > > ... > > + eval ' > > find .git/objects

Re: push race

2012-10-15 Thread Nguyen Thai Ngoc Duy
On Mon, Oct 15, 2012 at 6:05 PM, Matthieu Moy wrote: > Angelo Borsotti writes: > >> the push command checks first if the tips of the branches match those >> of the remote references, and if it does uploads the snapshot. > > The update does two things: upload objects to the database, and then > up

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:37, schrieb Joachim Schmitz: > ... > + eval ' > find .git/objects -type f -print >should-be-empty && > test_line_count = 0 should-be-empty > ' > ++ find .git/objects -type f -print > ++ test_line_count = 0 should-be-empty > ++ test 3 '!=' 3 > +++ wc -l > ++ test 0 =

RE: make test

2012-10-15 Thread Joachim Schmitz
> From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Monday, October 15, 2012 1:18 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: make test > > Am 10/15/2012 13:00, schrieb Joachim Schmitz: > >> From: Johannes Sixt [mailto:j.s...@viscovery.net] > >> and if that does not g

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 13:00, schrieb Joachim Schmitz: >> From: Johannes Sixt [mailto:j.s...@viscovery.net] >> and if that does not give sufficient clues, >> >> $SHELL_PATH -x ./t-basic.sh -v -i > > not ok - 12 tests clean up even on failures > #... > + die > > Looks identical, except for the "die"

Re: push race

2012-10-15 Thread Matthieu Moy
Angelo Borsotti writes: > the push command checks first if the tips of the branches match those > of the remote references, and if it does uploads the snapshot. The update does two things: upload objects to the database, and then update the reference. Adding objects to the database does not chan

RE: make test

2012-10-15 Thread Joachim Schmitz
> From: Johannes Sixt [mailto:j.s...@viscovery.net] > Sent: Monday, October 15, 2012 12:53 PM > To: Joachim Schmitz > Cc: git@vger.kernel.org > Subject: Re: make test > > Am 10/15/2012 12:36, schrieb Joachim Schmitz: > > not ok 4 - pretend we have a known breakage # TODO known breakage > > > >

t3302-notes-index-expensive.sh and t3419-rebase-patch-id.sh need time in /usr/bin

2012-10-15 Thread Joachim Schmitz
Hi folks t3302-notes-index-expensive.sh and t3419-rebase-patch-id.sh need "time " to be in "/usr/bin", however on my system it is in "/bin". Can't this be checked for? Bye, Jojo -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

Re: make test

2012-10-15 Thread Johannes Sixt
Am 10/15/2012 12:36, schrieb Joachim Schmitz: > not ok 4 - pretend we have a known breakage # TODO known breakage > >This is expected, right? Right. >the next is not though? Why might it be failing, where to check? > > not ok - 12 tests clean up even on failures > # > # mk

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Simon Oosthoek
On 10/15/2012 11:13 AM, Michael J Gruber wrote: It really doesn't matter much what works for you, and it doesn't matter what works for me either. The point is: What works for most users? Obviously, that was my point as well ;-) I'm quite unfamiliar with the color coding of git (I hadn't enab

make test

2012-10-15 Thread Joachim Schmitz
Hi folks I'm trying to understand why certain tests in 'make test' fail. Here's the first one $ ../git --version git version 1.8.0.rc2.5.g6b89306 $ GIT_TEST_CMP_USE_COPIED_CONTEXT=true ./t-basic.sh # our diff doesn't understand -u ok 1 - .git/objects should be empty after git init in an

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Simon Oosthoek venit, vidit, dixit 15.10.2012 11:01: > On 10/15/2012 10:23 AM, Michael J Gruber wrote: >> Sorry for being late ($DAYJOB and such), but I just noticed this is on >> next already: >> >>> + if [ -n "${GIT_PS1_SHOWCOLORHINT-}" ]; then >> >> You're missing the "S" here

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Simon Oosthoek
On 10/15/2012 10:23 AM, Michael J Gruber wrote: Sorry for being late ($DAYJOB and such), but I just noticed this is on next already: + if [ -n "${GIT_PS1_SHOWCOLORHINT-}" ]; then You're missing the "S" here (HINTS). indeed, well spotted! My test setup was apparently co

BUG when trying to delete symbolic refs

2012-10-15 Thread Johan Herland
Hi, At $dayjob we renamed a branch, and for a grace period, we kept the old name as a symref/alias to the new name, to give our users a window for switching. This has worked well, until we tried to remove the symref/alias. The following script demonstrates what we discovered: $ git --version gi

Re: [PATCH 2/2] show color hints based on state of the git tree

2012-10-15 Thread Michael J Gruber
Sorry for being late ($DAYJOB and such), but I just noticed this is on next already: Simon Oosthoek venit, vidit, dixit 05.10.2012 23:10: > By setting GIT_PS1_SHOW_COLORHINTS when using __git_ps1 > as PROMPT_COMMAND, you will get color hints in addition to > a different character (*+% etc.) > > S