Re: [RFC/PATCH 0/3] protocol v2

2015-03-24 Thread Stefan Beller
On Tue, Mar 3, 2015 at 9:13 AM, Junio C Hamano gits...@pobox.com wrote: Duy Nguyen pclo...@gmail.com writes: Junio pointed out in private that I didn't address the packet length limit (64k). I thought I could get away with a new capability (i.e. not worry about it now) but I finally admit

Re: Re* [PATCH 10/15] commit.c: fix a memory leak

2015-03-24 Thread Stefan Beller
On Tue, Mar 24, 2015 at 2:17 PM, Junio C Hamano gits...@pobox.com wrote: Move it to dir.c where match_pathspec() is defined. Signed-off-by: Junio C Hamano gits...@pobox.com Reviewed-by: Stefan Beller sbel...@google.com -- To unsubscribe from this list: send the line unsubscribe git

Re:

2015-03-18 Thread Stefan Beller
On Wed, Mar 18, 2015 at 2:33 PM, Junio C Hamano gits...@pobox.com wrote: What does the Icon^M try to catch, exactly? Is it a file? Is it a directory? Is it anything that begins with Icon^M? It seems to be a special hidden file on Macs for UI convenience. On Apr 25, 2005, at 6:21 AM, Peter N.

Re:

2015-03-18 Thread Stefan Beller
On Wed, Mar 18, 2015 at 1:45 PM, Junio C Hamano gits...@pobox.com wrote: On Wed, Mar 18, 2015 at 1:33 PM, Alessandro Zanardi pensierinmus...@gmail.com wrote: Here are other sources describing the issue: http://stackoverflow.com/questions/21109672/git-ignoring-icon-files-because-of-icon-rule

[PATCH] update-index: Don't copy memory around

2015-03-23 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- On Fri, Mar 20, 2015 at 8:40 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: `old` is not used outside the loop and would get lost once we reach the goto. Signed-off-by: Stefan Beller sbel...@google.com

Re: [PATCH] format-patch: print format-patch usage if there are no arguments

2015-01-13 Thread Stefan Beller
On Tue, Jan 13, 2015 at 2:45 PM, Jeff King p...@peff.net wrote: On Tue, Jan 13, 2015 at 02:28:13PM -0800, Junio C Hamano wrote: On the other hand, I am forked from building on this one done with checkout -t is an explicit mark the user leaves, so it would serve as a better hint to base the

Re: [PATCH] receive-pack.c: don't miss exporting unsolicited push certificates

2015-01-13 Thread Stefan Beller
On Mon, Jan 12, 2015 at 11:07 AM, Junio C Hamano gits...@pobox.com wrote: yes that's what I was trying to hint at. The hook would just see it is unsolicited instead of not having the state available. OK. That makes sort of sense. So if we: 1) did not apply either patch (i.e. we accept

Re: [PATCH] apply: refuse touching a file beyond symlink

2015-01-29 Thread Stefan Beller
On Thu, Jan 29, 2015 at 12:45 PM, Junio C Hamano gits...@pobox.com wrote: + +test_expect_success SYMLINKS 'do not follow symbolic link (same input)' ' + + # same input creates a confusihng symbolic link s/confusihng/confusing/ -- To unsubscribe from this list: send the line unsubscribe

[PATCH] builtin/apply.c: fix a memleak (Fixup, squashable)

2015-03-23 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- By the way, aren't the following also leaking here?  - the strbuf newlines that starts out as size  - line[] arrays of preimage and postimage yes :( I think a viable replacement may be below. That way the returned value of the function

Re: [PATCH 01/15] read-cache: fix memleak

2015-03-23 Thread Stefan Beller
On Fri, Mar 20, 2015 at 8:26 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: `ce` is allocated in make_cache_entry and should be freed if it is not used any more. refresh_cache_entry as a wrapper around refresh_cache_ent will either return `ce` or a new

[PATCH 1/2] read-cache: fix memleak

2015-03-23 Thread Stefan Beller
Hamano gits...@pobox.com Signed-off-by: Stefan Beller sbel...@google.com --- read-cache.c | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/read-cache.c b/read-cache.c index 60abec6..a102565 100644 --- a/read-cache.c +++ b/read-cache.c @@ -746,12 +746,9 @@ struct cache_entry

[PATCH 2/2] read-cache.c: fix a memleak in add_to_index

2015-03-23 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- I have reread your remarks from the weekend, and I agree this looks more intuitive. Thanks for pointing out the subtle details to make programming an art! read-cache.c | 12 1 file changed, 8 insertions(+), 4 deletions

Re: [PATCH] protocol upload-pack-v2

2015-04-02 Thread Stefan Beller
On Thu, Apr 2, 2015 at 3:18 PM, Martin Fick mf...@codeaurora.org wrote: The current protocol has the following problems that limit us: - It is not easy to make it resumable, because we recompute every time. This is especially problematic for the initial fetch aka clone as we will be

Re: [PATCH] protocol upload-pack-v2

2015-04-02 Thread Stefan Beller
After looking at $gmane/264000 again, maybe the client should talk first stating all the relevant information it wants to get, though I realize this is not part of capabilities so maybe it could even before, such as: Client: All I want to do is an ls-remote, so only Phase 2, no transmission of

Re: [PATCH 1/7] path.c: implement xdg_config_home()

2015-04-13 Thread Stefan Beller
, the series is Reviewed-by: Matthieu Moy matthieu@imag.fr and Reviewed-by: Stefan Beller sbel...@google.com -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- 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 0/3] Another approach to large transactions

2015-04-20 Thread Stefan Beller
On Mon, Apr 20, 2015 at 3:51 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: The problem comes from guessing the number of fds we're allowed to use. At first I thought it was a fundamental issue with the code being broken, but it turns out we just need

[PATCH] refs.c: enable large transactions

2015-04-20 Thread Stefan Beller
for such a feature. Signed-off-by: Stefan Beller sbel...@google.com --- This replaces the latest patch on origin/sb/remove-fd-from-ref-lock The test suite passes now refs.c| 13 + t/t1400-update-ref.sh | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff

Re: [PATCH 0/3] Another approach to large transactions

2015-04-20 Thread Stefan Beller
On Mon, Apr 20, 2015 at 4:07 PM, Stefan Beller sbel...@google.com wrote: On Mon, Apr 20, 2015 at 3:51 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: The problem comes from guessing the number of fds we're allowed to use. At first I thought

Re: [PATCH 0/3] Another approach to large transactions

2015-04-20 Thread Stefan Beller
On Fri, Apr 17, 2015 at 4:31 PM, Stefan Beller sbel...@google.com wrote: On Fri, Apr 17, 2015 at 3:17 PM, Stefan Beller sbel...@google.com wrote: On Fri, Apr 17, 2015 at 3:12 PM, Junio C Hamano gits...@pobox.com wrote: This is now pushed out and sitting at the tip of 'pu'. It seems to break

[PATCHv2] refs.c: enable large transactions

2015-04-21 Thread Stefan Beller
for such a feature. Signed-off-by: Stefan Beller sbel...@google.com --- * Removed unneeded braces in the condition to check if we want to close the lock file. * made the counter for the remaining fds an unsigned int. That is what get_max_fd_limit() returns, so there are no concerns

Re: [PATCH] refs.c: enable large transactions

2015-04-21 Thread Stefan Beller
On Tue, Apr 21, 2015 at 10:16 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: + /* + * We may want to open many files in a large transaction, so come up with + * a reasonable maximum, keep some spares for stdin/out and other open

Re: [PATCH 0/3] Another approach to large transactions

2015-04-21 Thread Stefan Beller
On Tue, Apr 21, 2015 at 10:19 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Mon, Apr 20, 2015 at 3:51 PM, Junio C Hamano gits...@pobox.com wrote: On the core management side, xmalloc() and friends retry upon failure, after attempting to free

Re: Regular Rebase Failure

2015-04-21 Thread Stefan Beller
[+mailing list] On Tue, Apr 21, 2015 at 11:20 AM, Adam adamgst...@gmail.com wrote: I'm using git version 2.3.2 (Apple Git-55). We should loop in the maintainers of the Apple Git version, they'd know what changed in git about two weeks ago. I have no idea who that is though. That explains why

Re: Regular Rebase Failure

2015-04-21 Thread Stefan Beller
On Tue, Apr 21, 2015 at 10:16 AM, Adam adamgst...@gmail.com wrote: About two weeks ago I started getting a regular rebase failure. I get this error several times a day and at least once a day I lose work to it. Which git version are you using? --- fatal: Unable to create

Re: [PATCH v2 02/16] refs: convert for_each_tag_ref to struct object_id

2015-04-23 Thread Stefan Beller
On Wed, Apr 22, 2015 at 4:24 PM, brian m. carlson sand...@crustytoothpaste.net wrote: To allow piecemeal conversion of the for_each_*_ref functions, introduce an additional typedef for a callback function that takes struct object_id * instead of unsigned char *. Provide an extra field in

Re: [PATCHv2] refs.c: enable large transactions

2015-04-21 Thread Stefan Beller
* Removed unneeded braces in the condition to check if we want to close the lock file. * made the counter for the remaining fds an unsigned int. That is what get_max_fd_limit() returns, so there are no concerns for an overflow. Also it cannot go below 0 any more. * moved the

[PATCH] RFC/Add documentation for version protocol 2

2015-04-21 Thread Stefan Beller
This adds the design document for protocol version 2. It's better to rewrite the design document instead of trying to squash it into the existing pack-protocol.txt and then differentiating between version 1 and 2 all the time. Signed-off-by: Stefan Beller sbel...@google.com --- As we

Re: [PATCHv2] refs.c: enable large transactions

2015-04-22 Thread Stefan Beller
On Wed, Apr 22, 2015 at 7:11 AM, Michael Haggerty mhag...@alum.mit.edu wrote: + if (lock-lk-fd == -1) + reopen_lock_file(lock-lk); You should check that reopen_lock_file() was successful. ok @@ -3762,6 +3779,10 @@ int ref_transaction_commit(struct ref_transaction

Re: [PATCH 0/3] Another approach to large transactions

2015-04-22 Thread Stefan Beller
On Tue, Apr 21, 2015 at 4:21 PM, Jeff King p...@peff.net wrote: On Mon, Apr 20, 2015 at 05:31:11PM -0700, Stefan Beller wrote: When running the test locally, i.e. not in the test suite, but typing the commands myself into the shell, Git is fine with having just 5 file descriptors left

Re: [PATCH] RFC/Add documentation for version protocol 2

2015-04-22 Thread Stefan Beller
On Wed, Apr 22, 2015 at 12:19 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: This adds the design document for protocol version 2. It's better to rewrite the design document instead of trying to squash it into the existing pack-protocol.txt

Re: About my git workflow; maybe it's useful for others

2015-04-22 Thread Stefan Beller
On Wed, Apr 22, 2015 at 12:38 PM, Thiago Farina tfrans...@gmail.com wrote: IMO, sending email is the easiest part. The hard begins when you have to edit your patch and resend with the reviewers' feedback incorporated. For me that is the most tricky and hard part to get right, specially when

Re: [PATCHv3] refs.c: enable large transactions

2015-04-24 Thread Stefan Beller
On Fri, Apr 24, 2015 at 11:12 AM, Jonathan Nieder jrnie...@gmail.com wrote: Stefan Beller wrote: I understood that you were talking about Could being capitalized. Though it's distributed 30/70 which hints to me we do not care in enough to explain the capitalized letters as slip-throughs

Re: [PATCHv3] refs.c: enable large transactions

2015-04-24 Thread Stefan Beller
On Thu, Apr 23, 2015 at 6:37 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com wrote: + int save_errno = errno; + error(Couldn't reopen %s, lock-lk-filename.buf

Re: [PATCH v2 01/16] refs: convert struct ref_entry to use struct object_id

2015-04-22 Thread Stefan Beller
-u.value.oid.hash); strcpy(n-name, entry-name); n-next = cb-ref_to_prune; cb-ref_to_prune = n; -- 2.3.5 The patch is Reviewed-by: Stefan Beller sbel...@google.com -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: About my git workflow; maybe it's useful for others

2015-04-22 Thread Stefan Beller
On Wed, Apr 22, 2015 at 12:57 PM, Thiago Farina tfrans...@gmail.com wrote: On Wed, Apr 22, 2015 at 4:50 PM, Stefan Beller sbel...@google.com wrote: On Wed, Apr 22, 2015 at 12:38 PM, Thiago Farina tfrans...@gmail.com wrote: IMO, sending email is the easiest part. The hard begins when you have

[PATCHv3] refs.c: enable large transactions

2015-04-22 Thread Stefan Beller
for such a feature. Signed-off-by: Stefan Beller sbel...@google.com --- Notes: * Added error checking when reopening the lock * Only call close_lock_file when needed. (This makes the code a bit harder to read, but might be worth it nevertheless. close_lock_file would

Re: [PATCH] RFC/Add documentation for version protocol 2

2015-04-23 Thread Stefan Beller
On Wed, Apr 22, 2015 at 4:30 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: +action = noop / ls-remote / fetch / push / fetch-shallow ... If we are going in this in-protocol message switches the service route, we should also support archive

Re: [PATCH 0/5] Avoid file descriptor exhaustion in ref_transaction_commit()

2015-04-24 Thread Stefan Beller
On Fri, Apr 24, 2015 at 10:26 AM, Jeff King p...@peff.net wrote: On Fri, Apr 24, 2015 at 01:35:44PM +0200, Michael Haggerty wrote: In ref_transaction_commit(), close the reference lockfiles immediately to avoid keeping too many file descriptors open at a time. This is pretty easy, because in

Re: [PATCHv3] refs.c: enable large transactions

2015-04-23 Thread Stefan Beller
On Thu, Apr 23, 2015 at 10:56 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: diff --git a/refs.c b/refs.c index 4f495bd..7ce7b97 100644 --- a/refs.c +++ b/refs.c @@ -3041,6 +3041,13 @@ static int write_ref_sha1(struct ref_lock *lock

Re: Regular Rebase Failure

2015-04-27 Thread Stefan Beller
. --- Any ideas? Adam On Tue, Apr 21, 2015 at 12:34 PM, Stefan Beller sbel...@google.com wrote: [+mailing list] On Tue, Apr 21, 2015 at 11:20 AM, Adam adamgst...@gmail.com wrote: I'm using git version 2.3.2 (Apple Git-55). We should loop in the maintainers of the Apple Git version, they'd know

Re: [PATCH 2/2] lock_packed_refs(): allow retries when acquiring the packed-refs lock

2015-05-04 Thread Stefan Beller
On Fri, May 1, 2015 at 10:19 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 05/01/2015 08:22 PM, Jeff King wrote: On Fri, May 01, 2015 at 10:51:47AM -0700, Stefan Beller wrote: diff --git a/refs.c b/refs.c index 47e4e53..3f8ac63 100644 --- a/refs.c +++ b/refs.c @@ -2413,9 +2413,19

Re: Patch that modifies git usage message

2015-05-01 Thread Stefan Beller
On Fri, May 1, 2015 at 9:38 AM, Alangi Derick alangider...@gmail.com wrote: Can't i change the cannot to Cannot? Or is there a problem with that one too? Well maybe you can make a strong argument for changing it like you'd find it inconsistencies in different spots. If you're in the game just

Re: Ensimag students contributing to git

2015-05-18 Thread Stefan Beller
On Mon, May 18, 2015 at 4:23 PM, Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr wrote: Hello Git community, We are a team of five students from the ENSIMAG (a french school of engineering and computer science) who are going to contribute to git during a month at least and after if

[PATCH 2/3] Move get_max_fd_limit(void) to git_compat_util.h

2015-04-16 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- git-compat-util.h | 1 + sha1_file.c | 41 - wrapper.c | 41 + 3 files changed, 42 insertions(+), 41 deletions(-) diff --git a/git-compat-util.h b

[PATCH 0/3] Another approach to large transactions

2015-04-16 Thread Stefan Beller
of the last patch of that tip, being the first patch in this series) * another approach would be to move the fd counting into the lock file api, I think that's not worth it for now. Stefan Beller (3): refs.c: remove lock_fd from struct ref_lock Move unsigned int get_max_fd_limit(void

[PATCH 3/3] refs.c: enable large transactions

2015-04-16 Thread Stefan Beller
for such a feature. Signed-off-by: Stefan Beller sbel...@google.com --- refs.c| 13 + t/t1400-update-ref.sh | 4 ++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index 4f495bd..44e0b15 100644 --- a/refs.c +++ b/refs.c @@ -3041,6 +3041,8

[PATCH 1/3] refs.c: remove lock_fd from struct ref_lock

2015-04-16 Thread Stefan Beller
The 'lock_fd' is the same as 'lk-fd'. No need to store it twice so remove it. No functional changes intended. Signed-off-by: Stefan Beller sbel...@google.com Reviewed-by: Michael Haggerty mhag...@alum.mit.edu Signed-off-by: Junio C Hamano gits...@pobox.com --- refs.c | 15 +-- 1

Re: [PATCH 0/3] Another approach to large transactions

2015-04-17 Thread Stefan Beller
On Fri, Apr 17, 2015 at 3:12 PM, Junio C Hamano gits...@pobox.com wrote: This is now pushed out and sitting at the tip of 'pu'. It seems to break one of the tests in 1400 when merged to 'next', but I didn't look it closely. Thanks. ok, I'll look more closely. -- To unsubscribe from this

Re: [PATCH 0/3] Another approach to large transactions

2015-04-17 Thread Stefan Beller
On Fri, Apr 17, 2015 at 3:17 PM, Stefan Beller sbel...@google.com wrote: On Fri, Apr 17, 2015 at 3:12 PM, Junio C Hamano gits...@pobox.com wrote: This is now pushed out and sitting at the tip of 'pu'. It seems to break one of the tests in 1400 when merged to 'next', but I didn't look

[PATCH 2/3] t7004: rename ULIMIT test prerequisite to ULIMIT_STACK_SIZE

2015-04-14 Thread Stefan Beller
During creation of the patch series our discussion we could have a more descriptive name for the prerequisite for the test so it stays unique when other limits of ulimit are introduced. Signed-off-by: Stefan Beller sbel...@google.com Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t7004

[PATCH 0/3] Large transactions in git

2015-04-14 Thread Stefan Beller
struct ref_lock which was duplicate information. That said, this series is not fixing the actual issue, but I'd guess having these patches is step forward actually. Thanks, Stefan Stefan Beller (3): update-ref: test handling large transactions properly t7004: rename ULIMIT test prerequisite

[PATCH 3/3] refs.c: remove lock_fd from struct ref_lock

2015-04-14 Thread Stefan Beller
The 'lock_fd' is the same as 'lk-fd'. No need to store it twice so remove it. You may argue this introduces more coupling as we need to know more about the internals of the lock file mechanism, but this will be solved in a later patch. No functional changes intended. Signed-off-by: Stefan Beller

[PATCH 1/3] update-ref: test handling large transactions properly

2015-04-14 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com Signed-off-by: Junio C Hamano gits...@pobox.com --- t/t1400-update-ref.sh | 28 1 file changed, 28 insertions(+) diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 7b4707b..47d2fe9 100755 --- a/t/t1400

Re: [PATCH 1/7] path.c: implement xdg_config_home()

2015-04-14 Thread Stefan Beller
On Tue, Apr 14, 2015 at 1:39 PM, Junio C Hamano gits...@pobox.com wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: diff --git a/cache.h b/cache.h index 3d3244b..7f9bab0 100644 --- a/cache.h +++ b/cache.h @@ -836,6 +836,13 @@ char *strip_path_suffix(const char *path, const char

Re: [PATCH 1/7] path.c: implement xdg_config_home()

2015-04-14 Thread Stefan Beller
I need to learn to read the whole sentence. :( Apologies. On Tue, Apr 14, 2015 at 3:30 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Tue, Apr 14, 2015 at 1:39 PM, Junio C Hamano gits...@pobox.com wrote: It is OK to omit the name in the extern

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-04-06 Thread Stefan Beller
I am interested in discussing the git pack protocol v2. (I have been thinking about that for a while now, though not sharing a lot on the mailing list, so feedback is somewhat limited. :( ) On Mon, Apr 6, 2015 at 12:08 PM, Christian Couder christian.cou...@gmail.com wrote: On Mon, Apr 6, 2015

Re: GSoC 2015: students proposals submitted, selection started

2015-04-03 Thread Stefan Beller
On Wed, Apr 1, 2015 at 9:19 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Hi, Latest news from the google summer of code: students have completed their proposals. We have 2 proposals for convert scripts to builtins, and 4 for unify git branch, git tag and git for-each-ref (plus some

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

2015-04-07 Thread Stefan Beller
On Tue, Apr 7, 2015 at 6:55 AM, Ævar Arnfjörð Bjarmason ava...@gmail.com wrote: On Mon, Apr 6, 2015 at 10:28 PM, Stefan Beller sbel...@google.com wrote: I am interested in discussing the git pack protocol v2. (I have been thinking about that for a while now, though not sharing a lot

Re: [PUB]corrupt repos does not return error with `git fsck`

2015-05-20 Thread Stefan Beller
$ git clone https://github.com/fmitha/SICL cd SICL $ git show 280c12ab49223c64c6f914944287a7d049cf4dd0 fatal: bad object 280c12ab49223c64c6f914944287a7d049cf4dd0 $ git show 12323213123 # just to be sure to have a different error message for non existing objects. fatal: ambiguous argument

Re: [PUB]corrupt repos does not return error with `git fsck`

2015-05-20 Thread Stefan Beller
On Wed, May 20, 2015 at 1:39 PM, Junio C Hamano gits...@pobox.com wrote: So... maybe we need a command: Given this SHA1, tell me anything you know about it, Is it a {blob,tree,commit,tag}? Is it referenced from anywhere else in this repository and if so, which type? And if it is not

Re: [PUB]corrupt repos does not return error with `git fsck`

2015-05-20 Thread Stefan Beller
On Wed, May 20, 2015 at 2:06 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: On Wed, May 20, 2015 at 1:39 PM, Junio C Hamano gits...@pobox.com wrote: So... maybe we need a command: Given this SHA1, tell me anything you know about it, Is it a {blob

Re: [PATCH v9 3/5] generate-cmdlist: parse common group commands

2015-05-20 Thread Stefan Beller
On Wed, May 20, 2015 at 12:27 PM, Sébastien Guimmara sebastien.guimm...@gmail.com wrote: On 05/20/2015 09:22 PM, Sébastien Guimmara wrote: From: Eric Sunshine sunsh...@sunshineco.com It looks like 'git send-email' got confused with the CC field. I'm sorry for that. It's to keep

Re: [PUB]corrupt repos does not return error with `git fsck`

2015-05-20 Thread Stefan Beller
On Wed, May 20, 2015 at 11:24 AM, Faheem Mitha fah...@faheem.info wrote: So, is the repos corrupt or not? Also, I don't understand why you say There is no file 28/0c... however. Why would you expect there to be? I don't see it mentioned in that list. Each object is stored at

[PATCH] submodule documentation: Reorder introductory paragraphs

2015-05-20 Thread Stefan Beller
think this may confuse readers, specially newcomers though. Signed-off-by: Stefan Beller sbel...@google.com --- Documentation/git-submodule.txt | 54 - 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/Documentation/git-submodule.txt b

Re: [RFC] send-email aliases when editing patches or using --xx-cmd

2015-06-04 Thread Stefan Beller
On Thu, Jun 4, 2015 at 1:17 PM, Remi LESPINET remi.lespi...@ensimag.grenoble-inp.fr wrote: Hi, Working on git-send-email, I've seen that there's no aliases support when manually adding a recipient in a 'To' or 'Cc' field in a patch and for the --to-cmd and --cc-cmd. I would like to add

Re: [RFC] git-am: handling unborn branches

2015-06-04 Thread Stefan Beller
On Thu, Jun 4, 2015 at 3:34 AM, Paul Tan pyoka...@gmail.com wrote: Hi, git-am generally supports applying patches to unborn branches. However, there are 2 cases where git-am does not handle unborn branches which I would like to address before the git-am rewrite to C: 1. am --skip For git

Re: [PATCH 01/13] delete_ref(): move declaration to refs.h

2015-06-08 Thread Stefan Beller
for valid and invalid sha1's? That said, do we want to add another sentence to the doc here saying non-NULL and not NULL_SHA1 are treated the same or is it clear enough? With or without this question addressed: Reviewed-by: Stefan Beller sbel...@google.com flags is passed

Re: [PATCH 07/13] prune_remote(): use delete_refs()

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: This will result in errors being emitted for references that can't be deleted, but that is a good thing. This sounds a bit like hand-waving to me. Trust me, I'm an engineer!. Signed-off-by: Michael Haggerty

Re: [PATCH 00/13] Improve refs module encapsulation

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Add functions to the reference API to * Delete a bunch of references at once, but *without* failing the whole transaction if one of the deletions fails. This functionality is used by `git remote remove` and `git

Re: [PATCH 5/5] am: teach mercurial patch parser how to read from stdin

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 8:48 AM, Paul Tan pyoka...@gmail.com wrote: git-mailsplit, which splits mbox patches, will read the patch from stdin when the filename is - or there are no files listed on the command-line. To be consistent with this behavior, teach the mercurial patch parser to read

Re: [PATCH 06/13] delete_refs(): convert error message to lower case

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: This string is going to have to be re-internationalized anyway because of the previous commit. So while we're at it, we might as well convert it to lower case as per our usual practice. Although the previous patch and

Re: [PATCH 03/13] delete_ref(): handle special case more explicitly

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: delete_ref() uses a different convention for its old_sha1 parameter than, say, ref_transaction_delete(): NULL_SHA1 means not to check the old value. Make this fact a little bit clearer in the code by handling it in

Re: [PATCH 0/6] am --skip/--abort: improve index/worktree cleanup

2015-06-08 Thread Stefan Beller
On Sat, Jun 6, 2015 at 4:46 AM, Paul Tan pyoka...@gmail.com wrote: Currently git-am attempts to clean up the index/worktree when skipping or aborting, but does not do it very well: * While it discards conflicted index entries, it does not remove any other modifications made to the index due

Re: [PATCH 02/13] remove_branches(): remove temporary

2015-06-08 Thread Stefan Beller
On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Signed-off-by: Michael Haggerty mhag...@alum.mit.edu Found-to-be-Obviously-Correct-by: Stefan Beller sbel...@google.com ;) --- builtin/remote.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git

Re: git mergetool: create temporary files in different sub-folders but with same filenames

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:48 AM, Andre Bossert an...@anbos.de wrote: Hello, we are moving from ClearCase to Git (MSYS 1.9.5 at Win7x64) and trying to configure one special merge tool DiffMerge for IBM Rhapsody files. So we've added our merge tool (script) to gitconfig. The merge script calls

Re: [RFCv2 01/16] stringlist: add from_space_separated_string

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 8:10 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Tue, Jun 2, 2015 at 5:42 AM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote: diff --git a/string-list.h b/string-list.h index d3809a1..88c18e9 100644

Re: [RFCv2 10/16] transport: connect_setup appends protocol version number

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 2:58 AM, Duy Nguyen pclo...@gmail.com wrote: On Tue, Jun 2, 2015 at 7:02 AM, Stefan Beller sbel...@google.com wrote: Signed-off-by: Stefan Beller sbel...@google.com --- Notes: name it to_free transport.c | 17 +++-- 1 file changed, 15 insertions

Re: [PATCH v2 08/19] pull: pass git-fetch's options to git-fetch

2015-06-03 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:48 PM, Paul Tan pyoka...@gmail.com wrote: Since eb2a8d9 (pull: handle git-fetch's options as well, 2015-06-02), git-pull knows about and handles git-fetch's options, passing them to git-fetch. Re-implement this behavior. Since 29609e6 (pull: do nothing on --dry-run,

Re: [PATCH v2 02/19] parse-options-cb: implement parse_opt_pass_argv_array()

2015-06-03 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:48 PM, Paul Tan pyoka...@gmail.com wrote: Certain git commands, such as git-pull, are simply wrappers around other git commands like git-fetch, git-merge and git-rebase. As such, these wrapper commands will typically need to pass through command-line options of the

Re: [RFCv2 06/16] remote.h: add new struct for options

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 2:18 PM, Junio C Hamano gits...@pobox.com wrote: Why? To have all options required for selecting the capabilities together in one struct. Currently there are independent variables used in a few places for this (fetchpack.c: lines 296 - 309, which is where I also got the

Re: [RFCv2 12/16] transport: get_refs_via_connect exchanges capabilities before refs.

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 2:55 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Signed-off-by: Stefan Beller sbel...@google.com --- Notes: A minor issue I am unsure about here is the line transport-smart_options-transport_version) which

Re: [RFCv2 10/16] transport: connect_setup appends protocol version number

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 2:37 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Signed-off-by: Stefan Beller sbel...@google.com --- Notes: name it to_free transport.c | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff

Re: [RFCv2 05/16] remote.h: Change get_remote_heads return to void

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 2:17 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: No function uses the return value of get_remote_heads, so we don't want to confuse readers by it. Signed-off-by: Stefan Beller sbel...@google.com --- This is somewhat a sad

Re: [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack

2015-06-02 Thread Stefan Beller
On Tue, Jun 2, 2015 at 11:59 AM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Subject: [RFCv2 04/16] upload-pack-2: Implement the version 2 of upload-pack Nit; s/I/i/, to match others in the series, I think. In upload-pack-2 we send each capability in its

Re: [PATCH 01/13] delete_ref(): move declaration to refs.h

2015-06-09 Thread Stefan Beller
On Tue, Jun 9, 2015 at 3:10 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 06/08/2015 06:43 PM, Stefan Beller wrote: On Mon, Jun 8, 2015 at 4:45 AM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +/* + * Delete the specified reference. If old_sha1 is non-NULL and not + * NULL_SHA1

Re: On undoing a forced push

2015-06-09 Thread Stefan Beller
On Tue, Jun 9, 2015 at 9:29 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi, On 2015-06-09 16:06, Sitaram Chamarty wrote: On 06/09/2015 05:42 PM, Duy Nguyen wrote: From a thread on Hacker News. It seems that if a user does not have access to the remote's reflog and accidentally

git lock files (Was: GIT for Microsoft Access projects)

2015-06-09 Thread Stefan Beller
Just because Git allows distributed workflows, doesn't mean we should only focus on being distributed IMHO. The question for content not being mergable easily pops up all the time. (Game/Graphics designers, documents, all this binary stuff, where there is no good merge driver). I could imagine a

Re: git lock files (Was: GIT for Microsoft Access projects)

2015-06-09 Thread Stefan Beller
On Tue, Jun 9, 2015 at 11:21 AM, hack...@suddenlink.net wrote: Thanks folks, I am digesting all you have said. I did not intend to answer your original question, but to start a discussion on the feasibility of a dedicated git lock command. There are lots of things which are checked in

Re: [RFC/WIP PATCH 00/11] Protocol version 2, again!

2015-06-04 Thread Stefan Beller
On Thu, Jun 4, 2015 at 6:09 AM, Jeff King p...@peff.net wrote: On Mon, Jun 01, 2015 at 10:49:45AM -0700, Stefan Beller wrote: However the client side with builtin/fetch, builtin/fetch-pack, fetch-pack is a bit of a mystery to me, as I cannot fully grasp the difference between * connect.{h,c

Re: Submodules as first class citizens (was Re: Moving to subtrees for plugins?)

2015-06-07 Thread Stefan Beller
On 06.06.2015 12:53, Luca Milanesio wrote: Thank you Phil, you anticipated me :-) Luca. On 6 Jun 2015, at 18:49, Phil Hord phil.h...@gmail.com wrote: On Fri, Jun 5, 2015, 2:58 AM lucamilanesio luca.milane...@gmail.com wrote: Some devs of my Team complained that with submodules it is

Re: Dependency Management

2015-06-23 Thread Stefan Beller
On Tue, Jun 23, 2015 at 1:52 AM, Jean Audibert jaudib...@euronext.com wrote: Hi, Sorry to bother you with this question but I can't find any official answer or strong opinion from Git community. In my company we recently started to use Git and we wonder how to share code and manage

Re: RFC/Pull Request: Refs db backend

2015-06-23 Thread Stefan Beller
[+ronniesahlb...@gmail.com, FYI] On Mon, Jun 22, 2015 at 5:50 PM, David Turner dtur...@twopensource.com wrote: I've revived and modified Ronnie Sahlberg's work on the refs db backend. Awesome! The work is on top of be3c13e5564, Junio's First batch for 2.5 cycle. I recognize that there have

[PATCH] Enable core.fsyncObjectFiles by default

2015-06-23 Thread Stefan Beller
Andrew Morton kind of workload, although rebase a big patch-series does end up doing basically the same thing, and might be more common. This patch enables fsync_object_files by default. [1] https://plus.google.com/u/1/+JonathanCorbet/posts/JBxiKPe3VXa Signed-off-by: Stefan Beller sbel

Re: What's cooking in git.git (Jun 2015, #06; Wed, 24)

2015-06-24 Thread Stefan Beller
* pt/pull-builtin (2015-06-18) 19 commits - pull: remove redirection to git-pull.sh - pull --rebase: error on no merge candidate cases - pull --rebase: exit early when the working directory is dirty - pull: configure --rebase via branch.name.rebase or pull.rebase - pull: teach git pull

Re: [PATCH/WIP v3 04/31] am: implement patch queue mechanism

2015-06-18 Thread Stefan Beller
On Thu, Jun 18, 2015 at 4:25 AM, Paul Tan pyoka...@gmail.com wrote: +/** + * Reads the contents of `file`. The third argument can be used to give a hint I would avoid `third` here. (I needed to count twice to be sure which argument you were referring to, as I was confused.) Also how do you

[PATCH] p5310: Fix broken chain in performance test

2015-06-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- t/perf/p5310-pack-bitmaps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh index f8ed857..de2a224 100755 --- a/t/perf/p5310-pack-bitmaps.sh +++ b/t/perf

[PATCH] revision.c: Correctly dereference interesting_cache

2015-06-19 Thread Stefan Beller
referencing the address of a local variable, so `interesting_cache` can actually never be NULL and trigger a segmentation fault by dereferencing it a few lines before this. I think the right thing is to check for `*interesting_cache` as that can become NULL actually. Signed-off-by: Stefan Beller sbel

Re: [PATCH/WIP v3 01/31] wrapper: implement xopen()

2015-06-24 Thread Stefan Beller
On Wed, Jun 24, 2015 at 9:28 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Paul, On 2015-06-18 13:25, Paul Tan wrote: diff --git a/git-compat-util.h b/git-compat-util.h index 0cc7ae8..bc77d77 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -719,6 +719,7 @@ extern

[PATCH] revision.c: Remove unneeded check for NULL

2015-06-26 Thread Stefan Beller
The function is called only from one place, which makes sure to have `interesting_cache` not NULL. Additionally it is a dereferenced a few lines before unconditionally, which would result in a segmentation fault. Signed-off-by: Stefan Beller sbel...@google.com --- Notes: So I think

Re: Bug in 'git am' when applying a broken patch

2015-06-26 Thread Stefan Beller
On Mon, Jun 1, 2015 at 1:23 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: s/enw/new/ Heh, thanks; I wasn't planning to commit this one yet, but why not. Here is with an updated log message and a test. -- 8 -- Subject: [PATCH] apply: reject a

<    4   5   6   7   8   9   10   11   12   13   >