On Sat, Jul 12, 2014 at 10:47:03AM +0200, Tuncer Ayaz wrote:
Yes, Andi's patch works.
Any idea when ak/profile-feedback-build will land in master?
Junio posts updates in his What's Cooking messages (usually about
twice a week). Last Tuesday's listed it as will merge to next. Unless
anybody
On Sat, Jul 12, 2014 at 10:53:47AM +0200, Tuncer Ayaz wrote:
On Sat, Jul 12, 2014 at 6:56 AM, Jeff King wrote:
I think none of the regular devs uses PROFILE, and it bit-rotted
By the way, is there no build (CI) server for git.git to regularly
test branches on different platforms or at
When adding alternate object directories, we try not to add the
directory of the current repository to avoid cycles. Unfortunately,
that test was broken, since it compared an absolute with a relative
path.
Signed-off-by: Ephrim Khong dr.kh...@gmail.com
---
My first patch, so be harsh. I'm not
I'M SORRY I CANNOT GIVE YOU IMMEDIATE DETAILS ON THE ISSUE UNTIL I CONFIRM YOUR
INTEREST. BE ATTENTIVE TO THE SUBJECT LINE AND SEND YOUR REPLY ON SAME MAIL
TRAIL TO AID CONTINUITY. REGARDS, MR. PETER KREMER
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a
As discussed in [1], here's the first three patches of Duy's untracked
cache series, which fixes a segfault with long paths on Windows.
[1] http://article.gmane.org/gmane.comp.version-control.msysgit/20702
Nguyễn Thái Ngọc Duy (3):
dir.c: coding style fix
dir.h: move struct exclude
From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=
pclo...@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Karsten Blees bl...@dcon.de
---
dir.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dir.c b/dir.c
index
From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=
pclo...@gmail.com
There is no actual nested struct here. Move it out for clarity.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Karsten Blees bl...@dcon.de
---
dir.h | 42
From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=
pclo...@gmail.com
This fixes a segfault in git-status with long paths on Windows,
where PATH_MAX is only 260.
This also fixes the problem of silently ignoring .gitignore if the
full path exceeds PATH_MAX. Now
On Mon, Jul 14, 2014 at 12:40 PM, Jeff King p...@peff.net wrote:
As Junio and I discussed earlier in [1], this series makes the
prio_queue struct stable with respect to object insertion (which in turn
means we can use it to replace commit_list in more places).
I think everything here is
On Mon, Jul 14, 2014 at 4:02 PM, Ephrim Khong dr.kh...@gmail.com wrote:
When adding alternate object directories, we try not to add the
directory of the current repository to avoid cycles. Unfortunately,
that test was broken, since it compared an absolute with a relative
path.
Not blaming
Jeff King p...@peff.net writes:
As Junio and I discussed earlier in [1], this series makes the
prio_queue struct stable with respect to object insertion (which in turn
means we can use it to replace commit_list in more places).
I don't think that this makes sense in general since it assumes
On 14/07/14 06:57, Jeff King wrote:
On Sun, Jul 13, 2014 at 08:27:51PM +0100, Ramsay Jones wrote:
Thinking on this more, writing out the definitions is the only sane
thing to do here, now that alloc_commit_node does not use the macro.
Otherwise you are inviting people to modify the macro,
On Mon, Jul 14, 2014 at 11:45 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
fd = open(git_path(repos/%s/gitdir, id), O_RDONLY);
...
- while (path[len - 1] == '\n' || path[len - 1] == '\r')
+ while (len (path[len - 1] == '\n' ||
On Wed, Jul 9, 2014 at 10:00 PM, Eric Wong normalper...@yhbt.net wrote:
Torsten Bögershausen tbo...@web.de wrote:
(And why is it 0 and not 0777)
This is to preserve the uncommon sticky/sgid/suid bits. Probably not
needed, but better to keep as much intact as possible.
Can we avoid
When adding alternate object directories, we try not to add the
directory of the current repository to avoid cycles. Unfortunately,
that test was broken, since it compared an absolute with a relative
path.
Signed-off-by: Ephrim Khong dr.kh...@gmail.com
---
As proposed by Duy, v2 of the patch
On Mon, Jul 14, 2014 at 6:31 AM, Erik Faye-Lund kusmab...@gmail.com wrote:
On Wed, Jul 9, 2014 at 10:00 PM, Eric Wong normalper...@yhbt.net wrote:
Torsten Bögershausen tbo...@web.de wrote:
You're saying this as if Windows is a single-user system. It's not,
but it uses ACLs rather than POSIX
Still, git might like to know what ACLs to apply to files at checkout
time. That would be a vast new feature, I think, and probably not
worth it, particularly since that would require dealing with the
different types of ACLs: NTFS/NFSv4/ZFS on the one hand, POSIX Draft
on the other, plus AFS
On Tue, Jul 8, 2014 at 9:29 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:42 PM, Ronnie Sahlberg wrote:
This patch series can also be found at
https://github.com/rsahlberg/git/tree/ref-transactions
This patch series is based on current master and expands on the transaction
Duy Nguyen pclo...@gmail.com writes:
On Sat, Jul 12, 2014 at 11:44 AM, David Turner dtur...@twopensource.com
wrote:
@@ -342,6 +342,15 @@ static char *prepare_index(int argc, const char **argv,
const char *prefix,
discard_cache();
On Tue, Jul 8, 2014 at 11:48 AM, Junio C Hamano gits...@pobox.com wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Patches 01-19 -- ACK mhagger
Patches 20-42 -- I sent various comments, small to large, concerning
these patches
Patch 43 -- Needs more justification if it is to be
Duy Nguyen pclo...@gmail.com writes:
On Mon, Jul 14, 2014 at 11:45 AM, Junio C Hamano gits...@pobox.com wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
fd = open(git_path(repos/%s/gitdir, id), O_RDONLY);
...
- while (path[len - 1] == '\n' || path[len - 1] == '\r')
+
Jeff King p...@peff.net writes:
On Sun, Jul 13, 2014 at 01:33:56PM -0400, Jeff King wrote:
I realize that I am reinventing the error-reporting wheel on a sleepy
Sunday afternoon without having thought about it much, so there is
probably some gotcha or case that makes this ugly, or perhaps it
On 14/07/14 16:54, Junio C Hamano wrote:
Duy Nguyen pclo...@gmail.com writes:
On Sat, Jul 12, 2014 at 11:44 AM, David Turner dtur...@twopensource.com
wrote:
@@ -342,6 +342,15 @@ static char *prepare_index(int argc, const char
**argv, const char *prefix,
discard_cache();
Junio C Hamano gits...@pobox.com writes:
Duy Nguyen pclo...@gmail.com writes:
On Sat, Jul 12, 2014 at 11:44 AM, David Turner dtur...@twopensource.com
wrote:
@@ -342,6 +342,15 @@ static char *prepare_index(int argc, const char
**argv, const char *prefix,
discard_cache();
I have changed the comment. Thanks.
On Tue, Jul 8, 2014 at 4:48 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
I'm in my next attempt to get through your patch series. Sorry for the
long hiatus.
Patches 1-19 look OK aside from a minor typo that I just reported.
See below for a comment
Thanks. Fixed.
On Tue, Jul 8, 2014 at 4:53 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Add an err argument to _begin so that on non-fatal failures in future ref
backends we can report a nice error back to the caller.
While _begin can
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
that the merge commit 7608c87e fails. Looking at the details of the
merge resolution, made me think of Duy's split index work.
Yes, there is a deliberately dropped hunk from dt/cache-tree-repair
in that merge, because the topic relied on being
I updated the comments.
Status is used in a later series to track certain errno settings. This
used to be done here but was moved to a later series.
I removed the status field for now and will re add it later when we
start using it.
Thanks!
On Tue, Jul 8, 2014 at 5:00 AM, Michael Haggerty
On Tue, Jul 8, 2014 at 6:33 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Switch to using ref transactions in walker_fetch(). As part of the
refactoring
to use ref transactions we also fix a potential memory leak where in the
original code if
Am 14.07.2014 03:01, schrieb Junio C Hamano:
Jens Lehmann jens.lehm...@web.de writes:
Perhaps squashing this to 7e8e5af9 instead?
Yes please, this is much better than my first attempt.
One thing that I found troubling is the ../../../ three levels up
is hardcoded. Would it be always
On 14/07/14 18:51, Junio C Hamano wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
that the merge commit 7608c87e fails. Looking at the details of the
merge resolution, made me think of Duy's split index work.
Yes, there is a deliberately dropped hunk from dt/cache-tree-repair
in
On Tue, Jul 8, 2014 at 5:54 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Change the update_ref helper function to use a ref transaction internally.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Ronnie Sahlberg
On Tue, Jul 8, 2014 at 6:20 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Wrap all the ref updates inside a transaction.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
builtin/receive-pack.c | 96
Am 09.07.2014 22:00, schrieb Eric Wong:
Torsten Bögershausen tbo...@web.de wrote:
(And why is it 0 and not 0777)
This is to preserve the uncommon sticky/sgid/suid bits. Probably not
needed, but better to keep as much intact as possible.
Can we avoid the fchmod() all together ?
Hi, this is my first mail to this list (and I'm not a native English speaker),
so let me apologise from the start for any slips in following message.
Ok, so I think I've found a bug in git.
It concerns orphan checkouts breaking (gapping in non-traversable way) the HEAD
reflog display.
% git
In some code paths (e.g. giving add -i to prepare the contents to
be committed interactively inside commit -p) where a caller takes
a lock, writes the new content, give chance for others to use it
while still holding the lock, and then releases the lock when all is
done. As an extension, allow
On Tue, Jul 8, 2014 at 6:52 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Change delete_ref to use a ref transaction for the deletion. At the same time
since we no longer have any callers of repack_without_ref we can now delete
this function.
On Wed, Jul 09, 2014 at 03:04:50PM -0700, Junio C Hamano wrote:
Heiko Voigt hvo...@hvoigt.net writes:
On Tue, Jul 08, 2014 at 01:14:20PM -0700, Junio C Hamano wrote:
Heiko Voigt hvo...@hvoigt.net writes:
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 07cf555..03ea20d
ref_transaction_create|delete|update has no need to modify the sha1
arguments passed to it so it should use const unsigned char* instead
of unsigned char*.
Some functions, such as fast_forward_to(), already have its old/new
sha1 arguments as consts. This function will at some point need to
use
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
builtin/update-ref.c | 1 +
refs.c | 1 -
refs.h | 5 ++---
3 files changed, 3 insertions(+), 4 deletions(-)
diff
We do not yet need both a rollback and a free function for transactions.
Remove ref_transaction_rollback and use ref_transaction_free instead.
At a later stage we may reintroduce a rollback function if we want to start
adding reusable transactions and similar.
Reviewed-by: Jonathan Nieder
Making errno when returning from verify_lock() meaningful, which
should almost but not completely fix
* a bug in git fetch's s_update_ref, which trusts the result of an
errno == ENOTDIR check to detect D/F conflicts
ENOTDIR makes sense as a sign that a file was in the way of a
directory we
Allow ref_transaction_free(NULL) as a no-op. This makes ref_transaction_free
easier to use and more similar to plain 'free'.
In particular, it lets us rollback unconditionally as part of cleanup code
after setting 'transaction = NULL' if a transaction has been committed or
rolled back already.
Making errno when returning from remove_empty_directories() more
obviously meaningful, which should provide some peace of mind for
people auditing lock_ref_sha1_basic.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 5 -
1
Making errno when returning from commit_packed_refs() meaningful,
which should fix
* a bug in git clone where it prints strerror(errno) based on
errno, despite errno possibly being zero and potentially having
been clobbered by that point
* the same kind of bug in git pack-refs
and
Making errno when returning from log_ref_setup() meaningful,
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
---
refs.c | 27 +++
refs.h | 4 +++-
2 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/refs.c
Update repack_without_refs to take an err argument and update it if there
is a failure. Pass the err variable from ref_transaction_commit to this
function so that callers can print a meaningful error message if _commit
fails due to this function.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Making errno when returning from lock_file() meaningful, which should
fix
* an existing almost-bug in lock_ref_sha1_basic where it assumes
errno==ENOENT is meaningful and could waste some work on retries
* an existing bug in repack_without_refs where it prints
strerror(errno) and picks
Add a strbuf argument to _commit so that we can pass an error string back to
the caller. So that we can do error logging from the caller instead of from
_commit.
Longer term plan is to first convert all callers to use onerr==QUIET_ON_ERR
and craft any log messages from the callers themselves and
List, Jun
Here is a resend of the first part of the ref transactions patches.
This new series consists of the first 19 patches in the series and
have been reviewed by mhagger.
This series should be good to go now.
I will resend the remaining part of the series separately once I have addressed
Introducing a new unable_to_lock_message helper, which has nicer
semantics than unable_to_lock_error and cleans up lockfile.c a little.
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
---
cache.h| 2 ++
lockfile.c | 22
Update ref_transaction_update() do some basic error checking and return
non-zero on error. Update all callers to check ref_transaction_update() for
error. There are currently no conditions in _update that will return error but
there will be in the future. Add an err argument that will be updated
Making errno when returning from resolve_ref_unsafe() meaningful,
which should fix
* a bug in lock_ref_sha1_basic, where it assumes EISDIR
means it failed due to a directory being in the way
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
Call ref_transaction_commit with QUIET_ON_ERR and use the strbuf that is
returned to print a log message if/after the transaction fails.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
Since all callers now use QUIET_ON_ERR we no longer need to provide an onerr
argument any more. Remove the onerr argument from the ref_transaction_commit
signature.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Reviewed-by: Michael Haggerty mhag...@alum.mit.edu
Signed-off-by: Ronnie Sahlberg
Make ref_update_reject_duplicates return any error that occurs through a
new strbuf argument. This means that when a transaction commit fails in
this function we will now be able to pass a helpful error message back to the
caller.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Reviewed-by:
Making errno from write_ref_sha1() meaningful, which should fix
* a bug in git checkout -b where it prints strerror(errno)
despite errno possibly being zero or clobbered
* a bug in git fetch's s_update_ref, which trusts the result of an
errno == ENOTDIR check to detect D/F conflicts
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
We would need to start slowing down to prepare for -rc0 preview at
the end of next week and then feature freeze. Some topics that
joined
Karsten Blees karsten.bl...@gmail.com writes:
1.) Permissions of files in .git are controlled by the core.sharedRepository
setting, and your patch seems to break that (i.e. if someone accidentally
has made .git/config world readable, git-config no longer fixes that, even
if
Jens Lehmann jens.lehm...@web.de writes:
So what about adding Currently only submodules living in the
root directory of the superproject with the default name (same
as the path) are supported. to the comment above the function?
OK, done, and merged to 'next'.
Thanks.
--
To unsubscribe from
On Tue, Jul 8, 2014 at 5:35 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Update replace.c to use ref transactions for updates.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
-Original Message-
From: Jeff King [mailto:p...@peff.net]
Sent: Friday, July 11, 2014 10:57 PM
To: Keller, Jacob E
Cc: gits...@pobox.com; dr.kh...@gmail.com; git@vger.kernel.org
Subject: Re: [Bug] data loss with cyclic alternates
On Fri, Jul 11, 2014 at 06:01:46PM +, Keller,
-Original Message-
From: Junio C Hamano [mailto:gits...@pobox.com]
Sent: Sunday, July 13, 2014 10:01 AM
To: Jeff King
Cc: Keller, Jacob E; git@vger.kernel.org
Subject: Re: [PATCH 3/3 v5] tag: support configuring --sort via .gitconfig
Jeff King p...@peff.net writes:
On Fri,
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
On 14/07/14 18:51, Junio C Hamano wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
that the merge commit 7608c87e fails. Looking at the details of the
merge resolution, made me think of Duy's split index work.
Yes, there is a
On Tue, Jul 8, 2014 at 5:23 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 06/20/2014 04:43 PM, Ronnie Sahlberg wrote:
Change to use ref transactions for all updates to refs.
Reviewed-by: Jonathan Nieder jrnie...@gmail.com
Signed-off-by: Ronnie Sahlberg sahlb...@google.com
---
Karsten Blees karsten.bl...@gmail.com writes:
From: =?UTF-8?q?Nguy=E1=BB=85n=20Th=C3=A1i=20Ng=E1=BB=8Dc=20Duy?=
pclo...@gmail.com
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
Signed-off-by: Karsten Blees bl...@dcon.de
---
Thanks for forwarding. I'll fix-up the Yikes (see how
On Mon, 2014-07-14 at 15:16 -0700, Junio C Hamano wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
On 14/07/14 18:51, Junio C Hamano wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
that the merge commit 7608c87e fails. Looking at the details of the
merge resolution, made
Hi Stepan,
On Sat, 12 Jul 2014, Stepan Kasal wrote:
Am 10.07.2014 22:05, schrieb Johannes Sixt:
It looks like I totally missed the topic sk/mingw-unicode-spawn-args.
...
Am I doing something wrong? Does the topic depend on a particular
version of MSYS (or DLL)?
unfortunately, I
On Tue, Jul 15, 2014 at 5:16 AM, Junio C Hamano gits...@pobox.com wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
On 14/07/14 18:51, Junio C Hamano wrote:
Ramsay Jones ram...@ramsay1.demon.co.uk writes:
that the merge commit 7608c87e fails. Looking at the details of the
merge
Am 14.07.2014 14:53, schrieb Ephrim Khong:
diff --git a/t/t7702-repack-cyclic-alternate.sh
b/t/t7702-repack-cyclic-alternate.sh
new file mode 100755
index 000..3771613
--- /dev/null
+++ b/t/t7702-repack-cyclic-alternate.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Copyright (c) 2014 Ephrim
70 matches
Mail list logo
