Re: [PATCH v3 1/3] patch-id: make it stable against hunk reordering

2014-03-31 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: + memcpy(ctx, header_ctx, sizeof ctx); + } else { + /* Save header ctx for next hunk. */ +

Re: [PATCH v5 4/4] Fix misuses of nor outside comments and in tests

2014-03-31 Thread Junio C Hamano
Justin Lebar jle...@google.com writes: diff --git a/builtin/clean.c b/builtin/clean.c index 5502957..977a068 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -903,11 +903,11 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!interactive !dry_run !force)

Re: [PATCH v2 06/27] update_refs(): Fix constness

2014-03-31 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 03/31/2014 11:40 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: Since full const correctness is beyond the ability of C's type system, just put the const where it doesn't do any harm. A (struct ref_update **) can

Re: [PATCH v4 0/3] Take four on fixing OPT_SET_PTR issues

2014-03-31 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Mon, Mar 31, 2014 at 10:23:44AM -0700, Junio C Hamano wrote: SET_PTR() may not be used, but are there places where SET_INT() is abused with a cast-to-pointer for the same effect? I didn't check, but if there are such places, converting them to use SET_PTR

Re: [PATCH v5 1/4] Documentation: Fix misuses of nor

2014-03-31 Thread Junio C Hamano
Four patches queued on 'pu' as-is (but retitled). I didn't read everything very carefully, though. Thanks. -- 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

What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-03-31 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'. More topics merged to 'master', some of which are fallouts from GSoC microprojects, some are updates to docs. C/C++ funcname pattern update is

Re: fast-import deltas

2014-04-01 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: On Tue, Apr 01, 2014 at 09:15:12AM -0400, Jeff King wrote: It seems to me fast-import keeps a kind of human readable format for its protocol, i wonder if xdelta format would fit the bill. That being said, I also wonder if i shouldn't just try to write

Re: [PATCH v5 1/4] Documentation: Fix misuses of nor

2014-04-01 Thread Junio C Hamano
Justin Lebar jle...@google.com writes: [administrivia: please do not top-post] On Mon, Mar 31, 2014 at 4:19 PM, Junio C Hamano gits...@pobox.com wrote: Four patches queued on 'pu' as-is (but retitled). I didn't read everything very carefully, though. Thanks. It's unclear to me: Are we

Re: [PATCH] t4212: handle systems with post-apocalyptic gmtime

2014-04-01 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Mar 28, 2014 at 12:30:02PM -0700, Junio C Hamano wrote: Let's just deal with a simple known cases (like FreeBSD) in the real code that everybody exercises at runtime, and have the new test only check we do not segfault on a value we used to segfault

Re: [PATCH 1/2] date: recognize bogus FreeBSD gmtime output

2014-04-01 Thread Junio C Hamano
René Scharfe l@web.de writes: Am 01.04.2014 09:42, schrieb Jeff King: diff --git a/compat/gmtime.c b/compat/gmtime.c new file mode 100644 index 000..ffcabf4 --- /dev/null +++ b/compat/gmtime.c @@ -0,0 +1,26 @@ +#include ../git-compat-util.h +#undef gmtime +#undef gmtime_r +

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-01 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: The basic support is there. Some bells and whistles (e.g. listing checkouts) are not, but we can add them when we see the needs. Eric and Torsten helped review but no, there hasn't much discussion about it, which may be because it's already perfect, or

Re: [PATCH v2 24/27] ref_transaction_commit(): Introduce temporary variables

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Use temporary variables in the for-loop blocks to simplify expressions in the rest of the loop. Shouldn't the summary of the change simplify expressions? Use of temporary variables is a means to the end. If you have enough room to say achieve X

Re: [PATCH v2 19/27] refs: Add a concept of a reference transaction

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Build out the API for dealing with a bunch of reference checks and changes within a transaction. Define an opaque ref_transaction type that is managed entirely within refs.c. Introduce functions for beginning a transaction, adding updates to a

Re: [PATCH v2 20/27] update-ref --stdin: Reimplement using reference transactions

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This change is mostly clerical: the parse_cmd_*() functions need to use local variables rather than a struct ref_update to collect the arguments needed for each update, and then call ref_transaction_*() to queue the change rather than building up

Re: [PATCH v2 21/27] refs: Remove API function update_refs()

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: It has been superseded by reference transactions. This also means that struct ref_update can become private. Good. -- 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 v2 22/27] struct ref_update: Rename field ref_name to refname

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This is consistent with the usual nomenclature. I am of two minds. Looking for \(\.\|-\)ref_name used to ignore refname fields of other structures and let us focus on the ref_update structure. Yes, there is the ref_lock structure that shares

Re: [PATCH v2 23/27] struct ref_update: Store refname as a FLEX_ARRAY.

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- refs.c | 15 ++- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/refs.c b/refs.c index d72d0ab..2b80f6d 100644 --- a/refs.c +++ b/refs.c @@ -3274,11 +3274,11

Re: [PATCH v2 26/27] struct ref_update: Add type field

2014-04-01 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This is temporary space for ref_transaction_commit(). Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- I was about to complain to *Add* type that does not say what it is used for at all, with Please do not add something for unknown

Re: git-status -- trying to understand all possible states

2014-04-01 Thread Junio C Hamano
Michael Toy mich...@toyland.org writes: Of the 24 possibilities (not counting ignored) in git-status, there are 7 that I can't figure out how to generate. As the post [*1*] that triggered e92e9cd3 (Documentation improvements for the description of short format., 2010-04-23), which is where the

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-01 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I haven't reverted the merge of that submodule update topic yet; I should do that soonish. ... Sigh... This is giving me a lot of headache. As 23d25e48 (submodule: explicit local branch creation in module_clone, 2014-01-26) has been in 'master' since

Re: fast-import deltas

2014-04-01 Thread Junio C Hamano
Mike Hommey m...@glandium.org writes: On Tue, Apr 01, 2014 at 10:14:02AM -0700, Junio C Hamano wrote: ... Unless you already have your change in the xdelta on hand, or the format your foreign change is in gives sufficient information to produce a corresponding xdelta without looking

Re: [PATCH v9 08/11] trailer: add tests for git interpret-trailers

2014-04-01 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Christian Couder chrisc...@tuxfamily.org writes: +test_expect_success '--trim-empty without config' ' +cat expected -\EOF +ack: Peff +Acked-by: Johan +EOF +git interpret-trailers --trim-empty ack = Peff Reviewed

Re: [PATCH v9 08/11] trailer: add tests for git interpret-trailers

2014-04-01 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: +test_expect_success '--trim-empty without config' ' + cat expected -\EOF + ack: Peff + Acked-by: Johan + EOF + git interpret-trailers --trim-empty ack = Peff Reviewed-by Acked-by: Johan sob: actual +

Re: [PATCH v2 18/27] update-ref --stdin: Harmonize error messages

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Junio, I incorporated your feedback (which so far has only affected commit messages). I also rebased the patch series to the current master. I pushed the result to GitHub [1]. I'll refrain from spamming the list with v3 yet. Thanks; let us

Re: [PATCH 02/22] try_merge_strategy(): remove redundant lock_file allocation

2014-04-02 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Apr 01, 2014 at 05:58:10PM +0200, Michael Haggerty wrote: By the time the if block is entered, the lock_file instance from the main function block is no longer in use, so re-use that one instead of allocating a second one. Note that the lock

Re: [PATCH 04/22] rollback_lock_file(): set fd to -1

2014-04-02 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Apr 01, 2014 at 05:58:12PM +0200, Michael Haggerty wrote: When rolling back the lockfile, call close_lock_file() so that the lock_file's fd field gets set back to -1. This could help prevent confusion in the face of hypothetical future programming

Re: [PATCH 07/22] lock_file(): always add lock_file object to lock_file_list

2014-04-02 Thread Junio C Hamano
Jeff King p...@peff.net writes: So for a moment, lk-filename contains the name of the valuable file we are locking. If we get a signal at that moment, do we accidentally delete it in remove_lock_file? I think the answer is no, because we check lk-owner before deleting, which will not match

Re: [PATCH 14/22] lockfile: use strbufs when handling (most) paths

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Change struct lock_file's filename field from a fixed-length buffer into a strbuf. Good. As I allued to in a review on an unrelated patch, I do not think it is a good idea to name the lock filename field lock_filename in a structure that is about

Re: [PATCH 18/22] lockfile: also keep track of the filename of the file being locked

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: This reduces the amount of string editing gyrations and makes it unnecessary for callers to know how to derive the filename from the lock_filename. Hmph. Is it worth duplicating the whole thing? If you are planning to break the invariant

Re: [PATCH 22/22] lockfile: allow new file contents to be written while retaining lock

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: +static int open_staging_file(struct lock_file *lk) +{ + strbuf_setlen(lk-staging_filename, lk-filename.len); + strbuf_addstr(lk-staging_filename, .new); + lk-fd = open(lk-staging_filename.buf, O_RDWR | O_CREAT | O_EXCL, 0666); +

Re: [PATCH 11/22] lockfile: define a constant LOCK_SUFFIX_LEN

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- lockfile.c | 11 +++ 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lockfile.c b/lockfile.c index 4a9ceda..4e3ada8 100644 --- a/lockfile.c +++ b/lockfile.c @@

Re: [PATCH 13/22] config: change write_error() to take a (struct lock_file *) argument

2014-04-02 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Reduce the amount of code that has to know about the lock_file's filename field. Signed-off-by: Michael Haggerty mhag...@alum.mit.edu --- config.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config.c

Re: [PATCH] rev-parse: fix typo in example on manpage

2014-04-02 Thread Junio C Hamano
René Scharfe l@web.de writes: --- Documentation/git-rev-parse.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Thanks; I'll forge your Sign-off ;-) diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index e05e6b3..377d9d7 100644 ---

Re: [PATCH] pack-objects: do not reuse packfiles without --delta-base-offset

2014-04-02 Thread Junio C Hamano
Jeff King p...@peff.net writes: When we are sending a packfile to a remote, we currently try to reuse a whole chunk of packfile without bothering to look at the individual objects. This can make things like initial clones much lighter on the server, as we can just dump the packfile bytes.

Re: [PATCH v2 26/27] struct ref_update: Add type field

2014-04-02 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I wonder if ref-transaction-commit can shrink its parameter list by accepting a single pointer to one ref_update? Disregard this one. I was fooled into thinking that the function is called with parameters such as update-old_sha1, update_flags, update

Re: Git feature request: Option to force Git to abort a checkout if working directory is dirty (i.e. disregarding the check for conflicts)

2014-04-02 Thread Junio C Hamano
Jonas Bang em...@jonasbang.dk writes: ... The default behaviour would cover their use case so your proposal would not hurt them, but I wonder if there are things you could do to help them as well, perhaps by allowing this new configuration to express something like local changes in

Re: [PATCH] ls-files: do not trust stat info if lstat() fails

2014-04-02 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: If 'err' is non-zero, lstat() has failed. Consider the entry modified without passing the (unreliable) stat info to ce_modified() in this case. Noticed-by: Eric Sunshine sunsh...@sunshineco.com Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v3 2/3] patch-id: document new behaviour

2014-04-02 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: On Mon, Mar 31, 2014 at 12:54:46PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: The hash used is mostly an internal implementation detail, isn't it? Yes, but that does not mean we can break people who keep an external

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-02 Thread Junio C Hamano
David Kastrup d...@gnu.org writes: Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: I haven't reverted the merge of that submodule update topic yet; I should do that soonish. ... Sigh... This is giving me a lot of headache. As 23d25e48 (submodule

Re: [PATCH v3 2/3] patch-id: document new behaviour

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: So I think I prefer using an option and not a heuristic if you are fine with that. Sure. Changing behaviour only by explicit user request (command line or configuration) is much safer than heuristics that does not work reliably. -- To unsubscribe from

Re: [PATCH v2 20/27] update-ref --stdin: Reimplement using reference transactions

2014-04-03 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I assumed that rolling back a non-consummated transaction in the case of early program death should be the responsibility of the library, not of the caller. If I'm correct, the caller(s) won't have to be modified when the atexit facility is

Re: [PATCH] ls-files: do not trust stat info if lstat() fails

2014-04-03 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Thu, Apr 3, 2014 at 1:15 AM, Junio C Hamano gits...@pobox.com wrote: I am guessing that, even though this was discovered during the development of list-files, is a fix applicable outside the context of that series. I do think the patched result

Re: What's cooking in git.git (Mar 2014, #08; Mon, 31)

2014-04-03 Thread Junio C Hamano
Heiko Voigt hvo...@hvoigt.net writes: On Mon, Mar 31, 2014 at 05:29:03PM -0700, Junio C Hamano wrote: * hv/submodule-ignore-fix (2013-12-06) 4 commits - disable complete ignorance of submodules for index - HEAD diff - always show committed submodules in summary after commit - teach add -f

Re: Bug in git-diff output

2014-04-03 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: rocketscienc01100101 . rocketscienc01100...@gmail.com writes: http://i.imgur.com/BoJSjm9.png Here's a screenshot that shows the problem. (better cut-and-paste the text than sending a PNG image) There's always a misplaced line in the

Re: [PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Allow extracting To/Cc addresses from cover letter. Please say what you are doing with what you extract, which is the more important part of the objective. Extracting is merely a step to achieve that. s/.$/, to be used as To/Cc addresses of the

Re: [PATCH v2 2/2] test/send-email: add to-cover test

2014-04-03 Thread Junio C Hamano
Michael S. Tsirkin m...@redhat.com writes: Does it work? I am not sure. Then why was it sent here? diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 3119c8c..3b17884 100755 --- a/t/t9001-send-email.sh +++ b/t/t9001-send-email.sh @@ -1334,6 +1334,22 @@ test_expect_success

Re: socket_perror() bug?

2014-04-03 Thread Junio C Hamano
Thiago Farina tfrans...@gmail.com writes: On Mon, Mar 31, 2014 at 5:50 PM, Junio C Hamano gits...@pobox.com wrote: Thiago Farina tfrans...@gmail.com writes: In imap-send.c:socket_perror() we pass |func| as a parameter, which I think it is the name of the function that called socket_perror

Re: [PATCH 06/10] log: --function-name pickaxe

2014-04-03 Thread Junio C Hamano
René Scharfe l@web.de writes: With that approach you depend on the hunk header and apparently need to add XDL_EMIT_MOREFUNCNAMES and XDL_EMIT_MOREHUNKHEADS to improve the results. This approach feels fragile. Would it perhaps be more robust to not base the implementation on diff and

Re: [PATCH v2 18/19] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

2014-04-04 Thread Junio C Hamano
Kirill Smelkov k...@navytux.spb.ru writes: +extern +struct combine_diff_path *diff_tree_paths( These two on the same line, please. + struct combine_diff_path *p, const unsigned char *sha1, + const unsigned char **parent_sha1, int nparent, + struct strbuf *base, struct

Re: [PATCH 06/10] log: --function-name pickaxe

2014-04-04 Thread Junio C Hamano
Jakub Narębski jna...@gmail.com writes: W dniu 2014-04-03 23:44, Junio C Hamano pisze: René Scharfe l@web.de writes: With that approach you depend on the hunk header and apparently need to add XDL_EMIT_MOREFUNCNAMES and XDL_EMIT_MOREHUNKHEADS to improve the results. This approach feels

Re: [PATCH] MSVC: allow using ExtUtils::MakeMaker

2014-04-04 Thread Junio C Hamano
Marat Radchenko ma...@slonopotamus.org writes: Drop NO_PERL_MAKEMAKER from config.mak.uname for the MSVC platform. MakeMaker is available on Windows Perl implementations and installs modules to correct location, unlike NO_PERL_MAKEMAKER Makefile. Signed-off-by: Marat Radchenko

Re: Patch Series v3 for use the $( ... ) construct for command substitution

2014-04-04 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: 140 patches worth of churn once every couple of years is not terrible, but I really don't want to see this becoming a pattern. :/ Likewise. And I don't see how the upside in this example warrants it. Paraphrasing

What's cooking in git.git (Apr 2014, #01; Fri, 4)

2014-04-04 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'. More topics merged to 'master', some of which are fallouts from GSoC microprojects, some are updates to docs. C/C++ funcname pattern update is

Re: [PATCH] pack-objects: do not reuse packfiles without --delta-base-offset

2014-04-04 Thread Junio C Hamano
Jeff King p...@peff.net writes: We could convert OFS_DELTA to REF_DELTA on the fly. That _may_ have a performance impact. Right now, we are basically doing the equivalent of sendfile(), and conversion would involve iterating through each object and examining the header. I think that's

Re: [PATCH v9 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-04-04 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: The following features are planned but not yet implemented: - add more tests related to commands - add examples in documentation - integration with git commit I was planning to merge the series to 'next', but perhaps

Re: [PATCH v9 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-04-04 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Christian Couder christian.cou...@gmail.com writes: ... Why support both '=' and ':'? Using just one would make it easier to grep through scripts to see who is adding signoffs. That was already discussed previously. I do recall it was discussed

Re: [PATCH 04/22] rollback_lock_file(): set fd to -1

2014-04-07 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: The first use of a lock_file object necessarily passes through lock_file(). The only precondition for that function is that the on_list field is zero, which is satisfied by a xcalloc()ed object. Subsequent uses of a lock_file object must *not*

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

2014-04-07 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Am 04.04.2014 22:58, schrieb Junio C Hamano: * sz/mingw-index-pack-threaded (2014-03-19) 1 commit - Enable index-pack threading in msysgit. What is the status of this topic? A failure report exists ($gmane/245170), and I am aware of Duy's $gmane

Re: [PATCH v9 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-04-07 Thread Junio C Hamano
Christian Couder christian.cou...@gmail.com writes: On Sat, Apr 5, 2014 at 12:42 AM, Junio C Hamano gits...@pobox.com wrote: Junio C Hamano gits...@pobox.com writes: Christian Couder christian.cou...@gmail.com writes: The following features are planned but not yet implemented: - add

Re: [PATCH] ls-files: do not trust stat info if lstat() fails

2014-04-07 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: Or even better to show an error message when the error code is unexpected? The unkown tag '!' says there are problems but if it shows up sort of permanently, '!' won't help much, I think. I am OK with that approach, but then one question remains: should

Re: [PATCH] pack-objects: do not reuse packfiles without --delta-base-offset

2014-04-07 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Apr 04, 2014 at 03:28:48PM -0700, Junio C Hamano wrote: ... OK, together with the fact that only ancient versions of fetcher would trigger this do not reuse codepath, I agree that we should go the simplest route this patch takes. By the way, we may

Re: [PATCH v2 18/19] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

2014-04-07 Thread Junio C Hamano
Kirill Smelkov k...@navytux.spb.ru writes: The following ... maybe looks a bit simpler, but calls tree_entry_pathcmp twice more times. Besides for important nparent=1 case we were not calling tree_entry_pathcmp at all and here we'll call it once, which would slow execution down a bit, as

Re: [PATCH v2 18/19] tree-diff: rework diff_tree() to generate diffs for multiparent cases as well

2014-04-07 Thread Junio C Hamano
Kirill Smelkov k...@navytux.spb.ru writes: + if (!DIFF_OPT_TST(opt, FIND_COPIES_HARDER)) { + for (i = 0; i nparent; ++i) + if (tp[i].entry.mode S_IFXMIN_NEQ) + goto

Re: The fetch command should always honor remote.name.fetch

2014-04-07 Thread Junio C Hamano
Lewis Diamond g...@lewisdiamond.com writes: 'git fetch foo develop' would result in: fatal: Couldn't find remote ref test2 //Not OK, (case 1) I have no idea where the test2 comes from, as it does not appear anywhere in the above write-up, and it could be a bug. 'git fetch foo master' would

Re: [PATCH] git-multimail: update to version 1.0.0

2014-04-07 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: ... Contributions-by: Raphaël Hertzog hert...@debian.org Contributions-by: Eric Berberich eric.berber...@gmail.com Contributions-by: Michiel Holtkamp g...@elfstone.nl Contributions-by: Malte Swart msw...@devtation.de Signed-off-by: Michael

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

2014-04-07 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: +void ref_transaction_create(struct ref_transaction *transaction, + const char *refname, + unsigned char *new_sha1, + int flags) +{ + struct ref_update *update =

Re: [PATCH v9 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-04-07 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: I do not see these two as valid arguments to make the command line more complex to the end users I don't think that it makes the command more complex to the end users. ---who now need to know that only this command treats its command line in

Re: notes.rewriteRef doesn't apply to rebases that skip the commit

2014-04-07 Thread Junio C Hamano
Kevin Ballard ke...@sb.org writes: I’ve started using notes recently, and I have notes.rewriteRef set so that when I rebase, my notes will be kept. Unfortunately, it turns out that if a rebase deletes my local commit because it already exists in upstream, it doesn’t copy the note to the

Re: [PATCH v10 12/12] trailer: add blank line before the trailers if needed

2014-04-07 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- Hmph, this is more fixing a mistake made earlier in the series at the end than adding a new feature or something. Can you start from a version that does not have the mistake from the

Re: [PATCH v9 11/11] Documentation: add documentation for 'git interpret-trailers'

2014-04-07 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: From: Junio C Hamano gits...@pobox.com A different way to sell a colon, e.g. Consider the instruction sed takes on its command line. (e.g. sed 's/frotz/nitfol/' xyzzy). In the most general form, you would always give

What's cooking in git.git (Apr 2014, #02; Mon, 7)

2014-04-07 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'. You can find the changes described here in the integration branches of the repositories listed at

Re: [PATCH] git-p4: explicitly specify that HEAD is a revision

2014-04-07 Thread Junio C Hamano
Pete Wyckoff p...@padd.com writes: vdog...@ixiacom.com wrote on Mon, 07 Apr 2014 16:19 +0300: 'git p4 rebase' fails with the following message if there is a file named HEAD in the current directory: fatal: ambiguous argument 'HEAD': both revision and filename Use '--' to separate

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

2014-04-08 Thread Junio C Hamano
Johannes Sixt j...@kdbg.org writes: Am 08.04.2014 02:39, schrieb Duy Nguyen: On Tue, Apr 8, 2014 at 1:35 AM, Johannes Sixt j...@kdbg.org wrote: Am 05.04.2014 11:19, schrieb Johannes Sixt: Am 04.04.2014 22:58, schrieb Junio C Hamano: * sz/mingw-index-pack-threaded (2014-03-19) 1 commit

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

2014-04-08 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Sorry for reappearing in this thread after such a long absence. I wanted to see what is coming up (I think this interpret-trailers command will be handy!) so I read this documentation patch carefully, and added some questions and suggestions

Our official home page and logo for the Git project

2014-04-08 Thread Junio C Hamano
Recently, somebody approached Software Freedom Conservancy, wishing to obtain our blessing for using the Git logo on some trinket they are planning to make. We joined Conservancy earlier, primarily so that we have a legal entity that can receive and pool the GSoC mentor stipend, and because we

Re: What's cooking in git.git (Apr 2014, #02; Mon, 7)

2014-04-08 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 08.04.2014 00:19, schrieb Junio C Hamano: * jl/status-added-submodule-is-never-ignored (2014-04-07) 2 commits - commit -m: commit staged submodules regardless of ignore config - status/commit: show staged submodules regardless of ignore config I

Re: git log for only certain branches

2014-04-08 Thread Junio C Hamano
Robert Dailey rcdailey.li...@gmail.com writes: I have more details about my inquiry on StackOverflow: http://stackoverflow.com/questions/22823768/view-git-log-with-merges-for-only-certain-branches Basically I'd like to know if it is possible to show the graph for ONLY branches that I list.

What's cooking for today

2014-04-08 Thread Junio C Hamano
As I do not want to send the full what's cooking report back to back, here is just a highlight of updates. A handful of topics are now in 'master', including: - Fix for mis-used nor, by Justin Lebar. - MSVC port fixes, by Marat Radchenko. - Portability fixes for gmtime sanity checking, by

Re: [PATCH v10 11/12] Documentation: add documentation for 'git interpret-trailers'

2014-04-08 Thread Junio C Hamano
Christian Couder chrisc...@tuxfamily.org writes: +Help add RFC 822-like headers, called 'trailers', at the end of the +otherwise free-form part of a commit message. I think it is somewhat misleading to use the word headers like that. 'trailers' look similar to RFC-822-headers but they come at

Re: [PATCH] Remove redundant close_ref function

2014-04-08 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: List, This is a trivial patch that removes the function close_ref() from refs.c. This function was only called from two codepaths and can be removed since both codepaths shortly afterwards both call unlock_ref() which implicitely closes the file

Re: [PATCH] Remove the close_ref function.

2014-04-08 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: @@ -2824,8 +2816,7 @@ int write_ref_sha1(struct ref_lock *lock, return -1; } if (write_in_full(lock-lock_fd, sha1_to_hex(sha1), 40) != 40 || - write_in_full(lock-lock_fd, term, 1) != 1 - ||

Re: [PATCH] Unicode: update of combining code points

2014-04-08 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Torsten Bögershausen wrote: Unicode 6.3 defines the following code as combining or accents, git_wcwidth() should return 0. Earlier unicode standards had defined these code point as reserved: Thanks for the update. Could the commit message also

Re: Race condition with git-status and git-rebase

2014-04-08 Thread Junio C Hamano
Yiannis Marangos yiannis.maran...@gmail.com writes: process A calls git-rebase process A applies the 1st commit process B calls git-status process B calls read_cache() process A applies the 2nd commit process B holds the index.lock process B writes back the old index (the one that was read

Re: The fetch command should always honor remote.name.fetch

2014-04-08 Thread Junio C Hamano
Lewis Diamond m...@lewisdiamond.com writes: 'git fetch foo master' would result in (FETCH_HEAD omitted): [new ref] refs/heads/master - foo/master //OK, but missing another ref! (case 2) //It should also fetch refs/users/bob/heads/master - foo/bob/master This is an incorrect expectation.

Re: [PATCH] git-multimail: update to version 1.0.0

2014-04-09 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: In the longer term, I have a feeling that we may be better off to make the git core tree not be the batteris included convenience tree, though ... Tell me if/when you want to transition to omitting git-multimail (and presumably

Re: [PATCH] Unicode: update of combining code points

2014-04-09 Thread Junio C Hamano
. Only the range 0..U+07FF has been checked to see which codepoints need to be marked as 0-width while preparing for this commit; more updates may be needed. Signed-off-by: Torsten Bögershausen tbo...@web.de Signed-off-by: Junio C Hamano gits...@pobox.com

Re: [PATCH 3/3] Change update_refs to run a single commit loop once all work is finished.

2014-04-09 Thread Junio C Hamano
Hopefully Michael would respond with more in-depth reviews as he has been touching this area heavily recently, but a few comments. Subject: Re: [PATCH 3/3] Change update_refs to run a single commit loop once all work is fi The project convention is to prefix with the area, colon, SP, a

Re: The fetch command should always honor remote.name.fetch

2014-04-09 Thread Junio C Hamano
Lewis Diamond g...@lewisdiamond.com writes: ... Yes, I agree that the abbreviation expansion works as designed (using the rev_parse_rules), I am not fundamentally opposed if you want to add a new command line option to git fetch so that the shortened what to fetch are dwimmed differently, but

Re: [PATCH] add missing accent grave in git-http-backend.txt

2014-04-09 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/git-http-backend.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index

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

2014-04-09 Thread Junio C Hamano
Felipe Contreras felipe.contre...@gmail.com writes: Some commands need the first word to determine the actual action that is being executed, however, the command is wrong when we use an alias, for example 'alias.p=push', if we try to complete 'git p origin ', the result would be wrong because

On interpret-trailers standalone tool

2014-04-09 Thread Junio C Hamano
So far I've mostly been ignoring how the command line would look like, because the intermediate goal to my mind was to have it as a hook that are added by people better versed with Git than an average end-user, and if the command line interface had to change then they are capable of updating it,

[ANNOUNCE] Git v1.9.2

2014-04-09 Thread Junio C Hamano
Junio C Hamano (8): stash pop: mention we did not drop the stash upon failing to apply wt-status: make full label string to be subject to l10n wt-status: lift the artificual at least 20 columns floor index-pack: report error using the correct variable diff-no-index

Re: [PATCH v2] Verify index file before we opportunistically update it

2014-04-09 Thread Junio C Hamano
Yiannis Marangos yiannis.maran...@gmail.com writes: Before we proceed to opportunistic update we must verify that the current index file is the same as the one that we read before. There is a possible race if we don't do this: Please somehow make it clear that the race is in general, and use

Re: [PATCH v5] Verify index file before we opportunistically update it

2014-04-10 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: verify_hdr() is a bit expensive because you need to digest the whole index file (could big as big as 14MB on webkit). Could we get away without it? I mean, is it enough that we pick the last 20 bytes and compare it with istate-sha1? If we only need 20

Re: [PATCH] Add support for commit attributes

2014-04-10 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: If the problem is polluting human eyes, wouldn't it be better to make git-log to filter it out? For example, we could tell git that all fields (in the message body) that start with X- are rubbish, so instead of showing X-something: base64 stuff..., it

Re: [PATCH] Add support for commit attributes

2014-04-10 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I actually think this recording information about commits is exactly the use-case notes were invented to address, and if it is found cumbersome to use, the reason why it is cumbersome needs to be discovered and use of notes needs to be improved. Hooks

Re: [PATCH 17/19] Portable alloca for Git

2014-04-10 Thread Junio C Hamano
Erik Faye-Lund kusmab...@gmail.com writes: Subject: [PATCH] mingw: activate alloca Both MSVC and MINGW have alloca(3) definitions in malloc.h, so by moving win32-compat alloca.h from compat/vcbuild/include/ to compat/win32/ , which is included by both MSVC and MINGW CFLAGS, we can make

Re: [PATCH v7 1/2] Add xpread() and xpwrite()

2014-04-10 Thread Junio C Hamano
Yiannis Marangos yiannis.maran...@gmail.com writes: xpread() and xpwrite() pay attention to EAGAIN/EINTR, so they will resume automatically on interrupted call. We do not even use pwrite(); please don't add anything unnecessary and unexercised, like xpwrite(), as potential bugs in it will go

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

2014-04-10 Thread Junio C Hamano
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 by, before sending them. Thanks. Ronnie

Re: [PATCH 4/4] refs.c: sort the refs by new_sha1 and merge the two update/delete loops into one

2014-04-10 Thread Junio C Hamano
Ronnie Sahlberg sahlb...@google.com writes: We want to make sure that we update all refs before we delete any refs so that there is no point in time where the tips may not be reachable from any ref in the system. We currently acheive this by first looping over all updates and applying them

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