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

2012-10-16 Thread Jeff King
On Mon, Oct 15, 2012 at 08:50:21PM -0700, Junio C Hamano wrote: Chris Rorvick ch...@rorvick.com 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

Re: push race

2012-10-16 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.html

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

2012-10-16 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 from

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. fatal:

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 gits...@pobox.com wrote: Michael J Gruber g...@drmicha.warpmail.net writes: grep.c:451:16: warning: comparison of unsigned enum expression 0 is always false [-Wtautological-compare]

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 deleting the master

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

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 gits...@pobox.com wrote: + +If `-z` is specified, the output is a series of lines of the form:

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 gits...@pobox.com 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

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 gitter.spi...@gmail.com wrote: Very clear analysis. Well written. Perhaps is it the time to update http://git-scm.com/book/ch6-1.html

[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 g...@drmicha.warpmail.net --- t/t3419-rebase-patch-id.sh | 4

[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 g...@drmicha.warpmail.net --- I don't think this has any adverse side

[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

[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 g...@drmicha.warpmail.net --- t/t3302-notes-index-expensive.sh | 5 ++--- t/t3419-rebase-patch-id.sh | 7 +++ 2 files changed, 5 insertions(+), 7 deletions(-) diff

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 jny...@gmail.com 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

Re: feature request

2012-10-16 Thread Christian Thaeter
Am Tue, 16 Oct 2012 13:36:04 +0200 schrieb Angelo Borsotti angelo.borso...@gmail.com: 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

[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 jch2...@gmail.com wrote: Even though update-ref deferences a symref when it updates one to point at a new object, I personally don't think

[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 jo...@herland.net --- t/t1400-update-ref.sh | 18 ++

[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

[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

[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 jo...@herland.net --- builtin/branch.c| 2 +- t/t3220-symbolic-ref-as-branch-alias.sh | 2 +- 2

[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

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 pclo...@gmail.com 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

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 gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com 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: [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 builtin)

[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

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 g...@adamspiers.org 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

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] git-cvsimport: allow author-specific timezones

2012-10-16 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Oct 15, 2012 at 08:50:21PM -0700, Junio C Hamano wrote: Chris Rorvick ch...@rorvick.com 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

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

Re: BUG when trying to delete symbolic refs

2012-10-16 Thread Junio C Hamano
René Scharfe rene.scha...@lsrfire.ath.cx 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

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

2012-10-16 Thread Junio C Hamano
Adam Spiers g...@adamspiers.org writes: On Mon, Oct 15, 2012 at 3:31 PM, Junio C Hamano gits...@pobox.com wrote: Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: +For each pathname given via the command-line or from a file via +`--stdin`, this command will list the first exclude pattern found

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

2012-10-16 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net 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

[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 pclo...@gmail.com --- Documentation/git-status.txt | 3 +++ builtin/commit.c | 2 ++ 2 files changed, 5 insertions(+) diff

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

2012-10-16 Thread Andreas Schwab
Michael J Gruber g...@drmicha.warpmail.net 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

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

2012-10-16 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net 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

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

2012-10-16 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net 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

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

2012-10-16 Thread Junio C Hamano
Johan Herland jo...@herland.net 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 jch2...@gmail.com wrote: Even though update-ref deferences a symref when it updates one to point at a

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 p...@peff.net 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

[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

[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 th.ac...@arcor.de --- 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

Re: push race

2012-10-16 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: On Tue, Oct 16, 2012 at 12:37 PM, Jeff King p...@peff.net 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

[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 th.ac...@arcor.de --- 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 ---

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 100644

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Junio C Hamano
乙酸鋰 ch3co...@gmail.com 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

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 to

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

[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-off-by: Thomas

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 index

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

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 g...@drmicha.warpmail.net 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

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 --long to

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: 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 place is

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

2012-10-16 Thread Junio C Hamano
Matthew Ogilvie mmogilvi_...@miniinfo.net 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

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

[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 some

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

2012-10-16 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org 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

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

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

2012-10-16 Thread Junio C Hamano
Jeff King p...@peff.net 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

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 u...@4refs.com 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 andrew.k...@gmail.com wrote: Yea, it's a difficult problem to diagnose. It'd be really helpful

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 s.oosth...@xs4all.nl 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

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 gits...@pobox.com writes: Simon Oosthoek s.oosth...@xs4all.nl 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

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

2012-10-16 Thread Junio C Hamano
Thomas Ackermann th.acke...@arcor.de 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

Re: Merge option suggestion (dictator, humble)

2012-10-16 Thread Andrew Ardill
On 17 October 2012 04:23, Junio C Hamano gits...@pobox.com wrote: 乙酸鋰 ch3co...@gmail.com 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.

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

Re: feature request

2012-10-16 Thread Sitaram Chamarty
On Tue, Oct 16, 2012 at 10:57 PM, Angelo Borsotti angelo.borso...@gmail.com 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

Re: feature request

2012-10-16 Thread Andrew Ardill
On 17 October 2012 04:27, Angelo Borsotti angelo.borso...@gmail.com 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

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 up

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

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 damien.olivier.robert+gm...@gmail.com 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

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

2012-10-16 Thread Junio C Hamano
Eric Blake ebl...@redhat.com 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

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

2012-10-16 Thread Junio C Hamano
Chris Rorvick ch...@rorvick.com 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

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 option