Re: [PATCH v8 1/2] Add xpread()

2014-04-10 Thread Junio C Hamano
(2). Update the caller in the builtin/index-pack.c and the mmap emulation in compat/. Signed-off-by: Yiannis Marangos yiannis.maran...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- builtin/index-pack.c | 2 +- compat/mmap.c| 4 +--- git-compat-util.h| 1 + wrapper.c

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-10 Thread Junio C Hamano
sure that the index hasn't changed since step 4. Signed-off-by: Yiannis Marangos yiannis.maran...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- cache.h | 3 +++ read-cache.c | 47 ++- wrapper.c| 20 3 files

Re: [PATCH 0/4] Make update_refs more atomic V2

2014-04-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: CC'ing Michael who has been active in this area as an area expert. Ronnie, please make it a habit to run something like $ git shortlog --no-merges --since=18.months affected paths... to help you decide who your series may want to be reviewed

Re: [PATCH v2 0/9] Introduce publish tracking branch

2014-04-10 Thread Junio C Hamano
A handful of minimum tweaks [*1*] here and there were necessary in order to queue the series on 'pu', but to me, the feature looked like quite a straight-forward addition. I'd be dropping the jk/branch-at-publish-rebased from 'pu', at least tentatively, as that one was primarily Peff giving Ram a

Re: [PATCH] test: fix t7001 cp to use POSIX options

2014-04-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Apr 11, 2014 at 01:24:02AM -0700, Kyle J. McKay wrote: Since 11502468 and 04c1ee57 (both first appearing in v1.8.5), the t7001-mv test has used cp -a to perform a copy in several of the tests. However, the -a option is not required for a POSIX cp

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-11 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Fri, Apr 11, 2014 at 2:28 AM, Junio C Hamano gits...@pobox.com wrote: Yiannis Marangos yiannis.maran...@gmail.com writes: + n = xpread(fd, sha1, 20, st.st_size - 20); + if (n != 20) + goto out; I think it is possible for pread(2

Re: [PATCH v2 6/9] branch: display publish branch

2014-04-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: For instance, it looks like your @{publish} requires config like: [branch master] pushremote = foo push = refs/heads/bar to operate. Setting pushremote affects what git push does; it will go to the foo remote. OK, and the same thing would happen if

Re: Our official home page and logo for the Git project

2014-04-11 Thread Junio C Hamano
Jeff King p...@peff.net writes: The git-scm.com page is mostly targeted at end users: what is it, how do I get it, where is the documentation. Things like a logo repository, or developer information is spread across various wikis and other sites. If there's interest, we can make

Re: [PATCH v3 2/8] Add concept of 'publish' branch

2014-04-11 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: The publish branch is the branch the user wants to push to, akin to the upstream branch, which is the branch the user wants to use as a baseline. It overrides other configurations, such as push.default, and remote.name.push. The upstream

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-11 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Yeah, I was hoping that the real write codepath (as opposed to this is read only and we read the index without holding a lock---now we noticed that the index needs refreshing, and we know how the resulting refreshed index should look like, perhaps we

Re: [PATCH 3/3] test: fix t5560 on FreeBSD

2014-04-11 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: Instead, we can use the [...] construct to defeat the special meaning of the '?' character and match it exactly in a way that works for the FreeBSD /bin/sh as well as other POSIX /bin/sh implementations. Changing the example like so:

Re: [PATCH v3 2/3] refs.c: split delete_ref_loose() into a separate flag-for-deletion and commit phase

2014-04-11 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: int commit_ref_lock(struct ref_lock *lock) { + if (lock-delete_ref) { + int flag = lock-delete_flag; + + if (!(flag REF_ISPACKED) || flag REF_ISSYMREF) { + /* loose */ + int

What's cooking in git.git (Apr 2014, #03; Fri, 11)

2014-04-11 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The number of topics cooking in 'next' has been shrinking, and the cycle is getting long. Hopefully we will have -rc0 late next week to close

Re: [PATCH v3 0/3] Make update refs more atomic

2014-04-11 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: refs.c:ref_transaction_commit() intermingles doing updates and checks with actually applying changes to the refs in loops that abort on error. This is done one ref at a time and means that if an error is detected that will fail the operation partway

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-11 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sat, Apr 12, 2014 at 3:43 AM, Junio C Hamano gits...@pobox.com wrote: Having said that, nobody sane would be running two simultaneous operations that are clearly write-oriented competing with each other against the same index file. When it comes

Re: What's cooking in git.git (Apr 2014, #03; Fri, 11)

2014-04-12 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: * fc/complete-aliased-push (2014-04-09) 1 commit - completion: fix completing args of aliased push, fetch, etc. Will merge to 'next'. * fc/remote-helper-fixes (2014-04-09) 4 commits - remote-bzr: include

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-12 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: What is the race under discussion about? It is about the index, which corresponds one-to-one to the working tree, so in order for the race to matter, you need to be racing against another process that is not cooperating with you (e.g. a continuous

Re: [PATCH v3 2/2] commit: add --ignore-submodules[=when] parameter

2014-04-14 Thread Junio C Hamano
Ronald Weiss weiss.ron...@gmail.com writes: On 8. 4. 2014 20:43, Jens Lehmann wrote: Useful when values for commit are 'all' (default) or 'none'. The others ('dirty' and 'untracked') have same effect as 'none', as commit is only interested in whether the submodule's HEAD differs from what is

Re: [PATCH v7 2/2] Verify index file before we opportunistically update it

2014-04-14 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sat, Apr 12, 2014 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote: In the spectrum between useful and insane, there is a point where we should just tell the insane: don't do it then. ... A process' dying is a way of telling people this is insane

Re: [PATCH] git-rebase: Print name of rev when using shorthand

2014-04-14 Thread Junio C Hamano
Brian Gesiak modoca...@gmail.com writes: The output from a successful invocation of the shorthand command git rebase - is something like Fast-forwarded HEAD to @{-1}, which includes a relative reference to a revision. Other commands that use the shorthand -, such as git checkout -, typically

Re: [PATCH 5/5] completion: fix completion of certain aliases

2014-04-14 Thread Junio C Hamano
Gábor Szeder sze...@ira.uka.de writes: words[] is just fine, we never modify it after it is filled by _get_comp_words_by_ref() at the very beginning. Hmph. I would have understood if the latter were we never look at it (to decide what to do). we never modify it does not sound like an enough

Re: [PATCH 1/2] Makefile: use curl-config to determine curl flags

2014-04-14 Thread Junio C Hamano
Dave Borowitz dborow...@google.com writes: curl-config should always be installed alongside a curl distribution, and its purpose is to provide flags for building against libcurl, so use it instead of guessing flags and dependent libraries. Allow overriding CURL_CONFIG to a custom path to

Re: [PATCH v4 0/3] Make update refs more atomic

2014-04-14 Thread Junio C Hamano
Thanks; will queue. -- 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] prompt: fix missing file errors in zsh

2014-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: zsh seems to have a bug while redirecting the stderr of the 'read' command: % read foo 2 /dev/null foo zsh: no such file or directory: foo Which causes errors to be displayed when certain files are missing. Let's add a convenience

Re: [PATCH v9 0/6] transport-helper: fixes

2014-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: These patches add support for remote helpers --force, --dry-run, and reporting forced update. Changes since v8: --- a/transport-helper.c +++ b/transport-helper.c @@ -734,7 +734,7 @@ static int push_update_ref_status(struct strbuf *buf,

Re: [PATCH 4/5] transport-helper: trivial cleanup

2014-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: It's simpler to store the file names directly, and form the fast-export arguments only when needed, and re-use the same strbuf with a format. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- transport-helper.c | 23

Re: [PATCH v3 2/2] commit: add --ignore-submodules[=when] parameter

2014-04-14 Thread Junio C Hamano
Ronald Weiss weiss.ron...@gmail.com writes: On 14. 4. 2014 20:30, Junio C Hamano wrote: Ronald Weiss weiss.ron...@gmail.com writes: On 8. 4. 2014 20:43, Jens Lehmann wrote: Useful when values for commit are 'all' (default) or 'none'. The others ('dirty' and 'untracked') have same effect

Re: [PATCH v3 19/27] refs: add a concept of a reference transaction

2014-04-14 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I forgot to confirm that the callers *do* verify that they don't pass incorrect values to ref_transaction_create() and ref_transaction_delete(). But if they wouldn't, then die(BUG:) would not be appropriate either, would it? It would have to be

Re: [PATCH 5/5] transport-helper: fix sync issue on crashes

2014-04-14 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: When a remote helper crashes while pushing we should revert back to the state before the push, however, it's possible that `git fast-export` already finished its job, and therefore has exported the marks already. This creates a

Re: On interpret-trailers standalone tool

2014-04-14 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: However, I am wondering if the current everything on the command line is instruction to the command is too limiting to allow the use of the tool both as a filter and as a tool that can work on one or more files named on the command line. If we

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-14 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Kyle J. McKay mack...@gmail.com writes: So I suggest that in the interest of fixing rebase on FreeBSD in an expeditious fashion, patches 1/3 and 2/3 get picked up (see note below) now and that the follow-on patch below, after being

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-14 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: For convenience, here are the diffs using -w: |--- a/git-rebase--am.sh |+++ b/git-rebase--am.sh |@@ -4,6 +4,7 @@ # Copyright (c) 2010 Junio C Hamano. # +git_rebase__am() { case $action in continue) git am --resolved

Re: [PATCH v3 19/27] refs: add a concept of a reference transaction

2014-04-15 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: In retrospect, you might have been objecting more to the misleading docstring than to the behavior as implemented at the time. Yeah, I was reacting to the comment that said create can delete ;-) The docstring implied that create could actually

Re: What's cooking in git.git (Apr 2014, #03; Fri, 11)

2014-04-15 Thread Junio C Hamano
Ramsay Jones ram...@ramsay1.demon.co.uk writes: On 11/04/14 23:22, Junio C Hamano wrote: [...] [New Topics] * nd/index-pack-one-fd-per-thread (2014-04-09) 1 commit - index-pack: work around thread-unsafe pread() Enable threaded index-pack on platforms without thread-unsafe pread

Re: [PATCH 1/2] Makefile: use curl-config to determine curl flags

2014-04-15 Thread Junio C Hamano
Dave Borowitz dborow...@google.com writes: My end goal is to statically link git on Mac OS X (10.9) against a newer version of libcurl than ships with the OS. The normal CURLDIR approach should work with system libcurl: $ /usr/bin/curl-config --libs -lcurl But it gets a bit more

Re* [PATCH] send-email: recognize absolute path on Windows

2014-04-15 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: Here's a patch that we've been running with a variation of in Git for Windows for a while. That version wasn't quite palatable, as it recognized DOS drive-prefixes on all platforms. Did you consider patching msysgit's lib/perl5/5.8.8/File/Spec.pm by

Re: Re* [PATCH] send-email: recognize absolute path on Windows

2014-04-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Thanks, both. I'd expect another round then? -- 8 -- From: Erik Faye-Lund kusmab...@googlemail.com On Windows, absolute paths might start with a DOS drive prefix, which these checks fail to recognize. Use file_name_is_absolute from File::Spec

Re: Re* [PATCH] send-email: recognize absolute path on Windows

2014-04-15 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: ... But, ugh. Modifying File::Spec into thinking msys is Win32 doesn't seems to work, OK, I'll drop the tentative version and wait for a proper reroll. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: wrong handling of text git attribute leading to files incorrectly reported as modified

2014-04-15 Thread Junio C Hamano
Brandon McCaig bamcc...@gmail.com writes: That is for your benefit, and for easily sharing that configuration with collaborators. Git only cares that the file exists in your working tree at run-time. It is a lot more than for sharing. If you made .gitignore only effective after it gets

Re: [PATCH v9 0/6] transport-helper: fixes

2014-04-15 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Felipe Contreras felipe.contre...@gmail.com writes: These patches add support for remote helpers --force, --dry-run, and reporting forced update. Changes since v8: --- a/transport-helper.c +++ b/transport-helper.c @@ -734,7 +734,7 @@ static int

Re: [PATCH 0/5] transport-helper: serious crash fix

2014-04-15 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: One of the most serious recurring issues[1][2][3] with remote helpers is that marks get out of sync. The way to analize and reproduce these wasn't trivial, but the culprit seems to be a crash while doing `git push`. It has been known already

What's cooking in git.git (Apr 2014, #04; Tue, 15)

2014-04-15 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The number of topics cooking in 'next' has been shrinking, and the cycle is getting long. Hopefully we will have -rc0 late this week to close

Re: [PATCH] git-gui: show staged submodules regardless of ignore config

2014-04-15 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Currently setting submodule.name.ignore and/or diff.ignoreSubmodules to all suppresses all output of submodule changes for git-gui. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it

Re: [PATCH] gitk: show staged submodules regardless of ignore config

2014-04-15 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Currently setting submodule.name.ignore and/or diff.ignoreSubmodules to all suppresses all output of submodule changes for gitk. This is really confusing, as even when the user chooses to record a new commit for an ignored submodule by adding it

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-16 Thread Junio C Hamano
Kyle J. McKay mack...@gmail.com writes: On Apr 14, 2014, at 15:51, Junio C Hamano wrote: I think we would want to see the actual change formatted this way (without needing to pass -w to git show), as it will make it clear that this artificial extra level of define the whole thing inside

Re: wrong handling of text git attribute leading to files incorrectly reported as modified

2014-04-16 Thread Junio C Hamano
Frank Ammeter g...@ammeter.ch writes: Am 15.04.2014 um 23:23 schrieb Junio C Hamano gits...@pobox.com: Brandon McCaig bamcc...@gmail.com writes: That is for your benefit, and for easily sharing that configuration with collaborators. Git only cares that the file exists in your working tree

Re: [PATCH] config.c: mark die_bad_number as NORETURN

2014-04-16 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Apr 16, 2014 at 06:38:19PM +0200, Torsten Bögershausen wrote: Does that also silence the warning? This works under gcc 4.2.1 Mac OS: the warning is away. Thanks. I couldn't test myself, as I could not get gcc to generate the warning in the first

Re: gitignore vs. exclude vs assume-unchanged?

2014-04-16 Thread Junio C Hamano
a...@bellandwhistle.net writes: Any clarification on the differences much appreciated: http://stackoverflow.com/questions/23097368/git-ignore-vs-exclude-vs-assume-unchanged/23097509 Please don't force people to refer to external site. The .gitignore and .git/info/exclude are the two UIs to

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Kyle J. McKay mack...@gmail.com writes: If I'm the only one getting a wrong meaning from the comments, then no reason to change them. I agree that the description does not read well with the work-around already there. I am not sure what would

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: By the way, you have this in your log message: ... the git-rebase--*.sh scripts have used a return to return from the dot command that runs them. While this is allowed by POSIX,... Is it this is allowed, or is it this should be the way

Re: On interpret-trailers standalone tool

2014-04-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: ... I am looking at this more from the angle of obtaining a useful building block, while you seem to be thinking of this as a specialized tool for a narrow set of specifkc tasks. By the way, I am speaking with a bitter experience of designing

Re: On interpret-trailers standalone tool

2014-04-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: ... I am being cautious here because I do not see us making the same mistake. s/do not/ want to/ Sorry for the noise. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH] git-rebase: Print name of rev when using shorthand

2014-04-16 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Furthermore, were we to translate @{-1}, does that mean we should also translate @{-2} or prior? Surely, why not. If a user is so forgetful to need help remembering where s/he was immediately before, wouldn't it be more helpful to give here is where

Re: [PATCH] Update SVN.pm

2014-04-16 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: From: RomanBelinsky belinsky.ro...@gmail.com Date: Tue, 11 Feb 2014 18:23:02 +0200 fix parsing error for dates like: 2014-01-07T5:58:36.048176Z previous regex can parse only: 2014-01-07T05:58:36.048176Z reproduced in my svn repository during conversion.

Re: [PATCH v4 0/3] Make update refs more atomic

2014-04-16 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: Currently any locking of refs in a transaction only happens during the commit phase. I think it would be useful to have a mechanism where you could optionally take out locks for the involved refs early during the transaction. So that simple callers

Re: [PATCH v4 0/3] Make update refs more atomic

2014-04-16 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: I am not sure if that is the right way to go, or instead change all create/update/delete to take locks without adding a new primitive. ack. Hmph. When I say I am not sure, I dunno, etc., I do mean it. Did you mean by Ack I do not know, either, or

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-16 Thread Junio C Hamano
Luis R. Rodriguez mcg...@do-not-panic.com writes: From: Luis R. Rodriguez mcg...@suse.com Upstream Linux kernel commit c5905afb was introduced on v3.4 but git describe --contains yields v3.5 Actually, describe --contains should yield v3.5-rc1~120^3~76^2, not v3.5. And you are right that the

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-17 Thread Junio C Hamano
Luis R. Rodriguez mcg...@do-not-panic.com writes: And between v3.4 and v3.5-rc1, the latter is a closer anchor point for that commit (v3.5-rc1 only needs about 200 hops to reach the commit, while from v3.4 you would need close to 500 hops), Ah! Thanks for explaining this mysterious puzzle to

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-17 Thread Junio C Hamano
Andreas Schwab sch...@suse.de writes: Junio C Hamano gits...@pobox.com writes: And you are right that the commit is contained in v3.4, so we also should be able to describe it as v3.4~479^2~9^2 as well. IMHO it should be described as v3.4-rc1~192^2~9^2, which is what git describe

Re: [PATCH 1/3] rebase: avoid non-function use of return on FreeBSD

2014-04-17 Thread Junio C Hamano
own function and then calling that as the last line in the script. Signed-off-by: Kyle J. McKay mack...@gmail.com Acked-by: Matthieu Moy matthieu@imag.fr Signed-off-by: Junio C Hamano gits...@pobox.com --- git-rebase--am.sh | 15 +++ git-rebase--interactive.sh | 15

Re: [PATCH] Update SVN.pm

2014-04-17 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: On Wed, Apr 16, 2014 at 12:13:21PM -0700, Junio C Hamano wrote: Interesting. What other strange forms can they record in their repositories, I have to wonder. Can they do 2014-01-07T5:8:6.048176Z for example? Roman Belinsky, the author of this fix

Re: What's cooking in git.git (Apr 2014, #03; Fri, 11)

2014-04-17 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: On Fri, Apr 11, 2014 at 03:22:58PM -0700, Junio C Hamano wrote: * jl/submodule-recursive-checkout (2013-12-26) 5 commits - Teach checkout to recursively checkout submodules - submodule: teach unpack_trees() to update submodules - submodule: teach

Re: [PATCH] Update SVN.pm

2014-04-17 Thread Junio C Hamano
Stepan Kasal ka...@ucw.cz writes: From: RomanBelinsky belinsky.ro...@gmail.com Date: Tue, 11 Feb 2014 18:23:02 +0200 fix parsing error for dates like: 2014-01-07T5:58:36.048176Z previous regex can parse only: 2014-01-07T05:58:36.048176Z reproduced in my svn repository during conversion.

Re: [PATCH 2/3] i18n: Only extract comments marked by special tag

2014-04-17 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: When extract l10n messages, we use --add-comments option to keep comments right above the l10n messages for references. But sometimes irrelevant comments are also extracted. For example in the following code block, the comment in line 2 will be

Re: [PATCH 0/3] extract proper comments for l10n translators

2014-04-17 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: 2014-04-17 13:37 GMT+08:00 Jiang Xin worldhello@gmail.com: When generate git.pot, many irrelevant comments are extracted as references for translators, but one useful comment is lost. This series patches will fix this issue. Brief changes of

Re: [PATCH 001/14] howto-index.sh: use the $( ... ) construct for command substitution

2014-04-17 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Elia Pinto gitter.spi...@gmail.com writes: The Git CodingGuidelines prefer the $(...) construct for command substitution instead of using the backquotes `...`. For patches 1 to 14: Reviewed-by: Matthieu Moy matthieu@imag.fr (reviewed

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-17 Thread Junio C Hamano
Andreas Schwab sch...@suse.de writes: Junio C Hamano gits...@pobox.com writes: ... When your project does not mind basing the description on rc tags, between v3.4-rc1~192^2~9^2 and v3.5-rc1~120^3~76^2, I am not sure if we would want to say that the former is not so longer than the latter

Re: [RFC/PATCH 2/4] Submodules: Add the lib-submodule-update.sh test library

2014-04-17 Thread Junio C Hamano
W. Trevor King wk...@tremily.us writes: There have been a number of submodule series in flight recently, and I'm having trouble keeping track of them all ;). Unfortunately I share that same feeling X-. Could you guys collectively summarize what issues each of these in-flight topics try to

Re: [RFC] Speed up git status by caching untracked file info

2014-04-17 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: first run second (cached) run gentoo-x86500 ms 71.6 ms wine 140 ms 9.72 ms webkit125 ms 6.88 ms linux-2.6 106 ms 16.2 ms Basically untracked time is cut

What's cooking in git.git (Apr 2014, #05; Thu, 17)

2014-04-17 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. Hopefully we can merge a few more topics slated for 'master' before cutting an early preview release -rc0 tomorrow. Many of the topics that

Re: [PATCH v2 2/2] commit.c: check for lock error and return early

2014-04-17 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 04/16/2014 08:56 PM, Ronnie Sahlberg wrote: Move the check for the lock failure to happen immediately after lock_any_ref_for_update(). Previously the lock and the check-if-lock-failed was separated by a handful of string manipulation

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: ---A---B---C-D---E---F (maint, v3.4) \ \ / \ ---G-H---I (master, v4.0) \ / / --J--- The fix is J, and it got merged up to maint at D, and to master at H. v4.0 does not contain v3.4. What's the best

Re: [PATCH 2/3] i18n: Only extract comments marked by special tag

2014-04-18 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: I am not very happy with this change, as it would force us to special case Translators comment to follow a non-standard multi-line comment formatting convention. Is there a way to tell xgettext to accept both of these forms? /*

Re: [PATCH] blame: add correct paddings in time_buf for align

2014-04-18 Thread Junio C Hamano
25ed3412 builtin/blame.c (Bo Yang 1 年 1 个月之前 24) #include line-range.h 58dbfa2e builtin/blame.c (Eric Sunshine 9 个月之前 25) #include line-log.h cee7f245 builtin-pickaxe.c (Junio C Hamano 8 年前

Re: Project idea: strbuf allocation modes

2014-04-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The Idea I would like to see strbuf enhanced to allow it to use memory that it doesn't own (for example, stack-allocated memory), while (optionally) allowing it to switch over to using allocated memory if the string grows past the size

Re: Store refreshed stat info in a separate file?

2014-04-18 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: The major cost of writing an index is the SHA-1 hashing. The bigger the written part is, the higher cost we pay. So what if we write stat-only data to a separate file? Think of it as an index extension, only it stays outside the index. On webkit with 182k

Re: [PATCH 2/3] i18n: Only extract comments marked by special tag

2014-04-18 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Documentation/CodingGuidelines may want to have a sentence of two to explain this, though. After re-reading what I sent out, I realized that the way I singled out multi-line comments was misleading. Here is an updated version. -- 8 -- Subject: [PATCH

[ANNOUNCE] Git v2.0.0-rc0

2014-04-18 Thread Junio C Hamano
-hashmap is a generated file test-hashmap.c: drop unnecessary #includes Junio C Hamano (35): git add pathspec... defaults to -A git add: -u/-A now affects the entire working tree core.statinfo: remove as promised in Git 2.0 push: switch default from matching to simple

What's cooking in git.git (Apr 2014, #06; Fri, 18)

2014-04-18 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of the 'master' branch is at v2.0.0-rc0, an early preview release. There are a handful of topics still in 'next' (and a few that are

Re: [PATCH] tag: add -i and --introduced modifier for --contains

2014-04-18 Thread Junio C Hamano
Luis R. Rodriguez mcg...@do-not-panic.com writes: I think ultimately this reveals that given that tags *can* be arbitrary and subjective,... Yes; see the part at the bottom. Commit A can be described in terms of both v3.4 and v9.0, And in the real example case, why *would* c5905afb' be be

Re: Project idea: strbuf allocation modes

2014-04-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 04/18/2014 07:21 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: The Idea I would like to see strbuf enhanced to allow it to use memory that it doesn't own (for example, stack-allocated memory), while

Re: Refactoring hardcoded SHA-1 constants

2014-04-18 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sat, Apr 19, 2014 at 7:06 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Let the brainstorming (and bikeshedding) begin! 1. GIT_OID_RAWSZ / GIT_OID_HEXSZ 2. OID_RAWSZ / OID_HEXSZ 3. OID_BINARY_LEN / OID_ASCII_LEN 4. BINARY_OID_LEN /

Re: [PATCH v9 0/6] transport-helper: fixes

2014-04-18 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: These patches add support for remote helpers --force, --dry-run, and reporting forced update. Changes since v8: --- a/transport-helper.c +++ b

[PATCH 0/5] fc/transport-helper-sync-error-fix rebased

2014-04-19 Thread Junio C Hamano
As I have said in the recent What's cooking reports, the original posted here were based on older codebase and needed to be rebased, but it had some conflicts and I wanted to see the result double checked by the original author before we can merge it to 'next', cooked there and hopefully merged to

[PATCH 5/5] transport-helper: fix sync issue on crashes

2014-04-19 Thread Junio C Hamano
successfully, move to the final destination. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t5801-remote-helpers.sh | 20 +++- transport-helper.c| 13 +++-- 2 files changed, 30 insertions(+), 3 deletions

[PATCH 3/5] transport-helper: propagate recvline() error pushing

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's cleaner, and will allow us to do something sensible on errors later. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 18 +++--- 1 file changed

[PATCH 4/5] transport-helper: trivial cleanup

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's simpler to store the file names directly, and form the fast-export arguments only when needed, and re-use the same strbuf with a format. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits

[PATCH 1/5] transport-helper: remove barely used xchgline()

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com It's only used once, we can just call the two functions inside directly. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 9 ++--- 1 file changed, 2

[PATCH 2/5] remote-helpers: make recvline return an error

2014-04-19 Thread Junio C Hamano
From: Felipe Contreras felipe.contre...@gmail.com Instead of exiting directly, make it the duty of the caller to do so. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Junio C Hamano gits...@pobox.com --- transport-helper.c | 21 ++--- 1 file changed

Re: [ANNOUNCE] Git v2.0.0-rc0

2014-04-19 Thread Junio C Hamano
Johan Herland jo...@herland.net writes: On Fri, Apr 18, 2014 at 9:37 PM, Junio C Hamano gits...@pobox.com wrote: An early preview release Git v2.0.0-rc0 is now available for testing at the usual places. This is supposed to have _all_ the v2.0 topics, correct? I'm unable to find the commit

Re: [PATCH v2 2/2] blame: use different blame_date_width for different locale

2014-04-20 Thread Junio C Hamano
Jiang Xin worldhello@gmail.com writes: When show date in relative date format for `git blame`, the max display width of datetime is set as the length of the string Thu Oct 19 16:00:04 2006 -0700 (30 characters long). But actually the max width for C locale is only 22 (the length of

Re: [PATCH 0/5] fc/transport-helper-sync-error-fix rebased

2014-04-20 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: Felipe Contreras felipe.contre...@gmail.com writes: Junio C Hamano wrote: As I have said in the recent What's cooking reports, the original posted here were based on older codebase and needed to be rebased

Re: the .git folder

2014-04-20 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Sun, Apr 20, 2014 at 4:13 PM, Miller, Hugh hughmil...@chevron.com wrote: Dear Community, Is there any way to use .git (e.g., a different set of client commands) that allows the .git folder to be placed in a location away from the actual files being

Re: [PATCH] t5801 (remote-helpers): cleanup environment sets

2014-04-20 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Commit 512477b (tests: use env to run commands with temporary env-var settings) missed some variables in the remote-helpers test. Also standardize these. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Good. I was wondering

Re: [PATCH v3 2/2] blame: use a helper to get suitable blame_date_width

2014-04-21 Thread Junio C Hamano
-by: Junio C Hamano gits...@pobox.com Signed-off-by: Jiang Xin worldhello@gmail.com --- builtin/blame.c | 64 - 1 file changed, 63 insertions(+), 1 deletion(-) That does not seem to have the helper in date.c immediately next

Re: [PATCH 0/2] remote-helpers: graduate

2014-04-21 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: There doesn't seem to be any reason to keep these remote-helpers in the contrib area. Yay. I wouldn't phrase it doesn't seem to be any reason, though. The decision to include is not done due to lack of negatives, but because adding them

Re: [PATCH 2/2] remote-helpers: move tests out of contrib

2014-04-21 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: They should be tested by default. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com --- contrib/remote-helpers/Makefile| 14 -- t/Makefile

Re: [PATCH v3 2/2] blame: use a helper to get suitable blame_date_width

2014-04-21 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: What I am wondering is if we can do something like this: ... Nah, that is a lot more stupid than just doing In code: blame_date_width = strtoul(_(4 years, 11 months ago), NULL, 10) + 1; In git.pot: #. This string is used

Re: [PATCH 2/2] remote-helpers: move tests out of contrib

2014-04-21 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: This step needs a bit more work, I am afraid, to at least have these three test scripts follow the same numbering scheme. Especially given that there were recent discussions on allowing a range of tests to be run (or omitted) via notations

Re: What is missing from Git v2.0

2014-04-21 Thread Junio C Hamano
Sebastian Schuberth sschube...@gmail.com writes: Every argument against default aliases was basically refuted, yet my patches went nowhere. And the users still expect these aliases. +1 about having default aliases in general, and I'd also add these: I think it might be OK to implement them

<    7   8   9   10   11   12   13   14   15   16   >