On 01/16/2014 11:31 AM, Michael Haggerty wrote:
> On 12/16/2013 12:52 PM, Kirill Likhodedov wrote:
>> I received one more complaint for this issue, and now it appears in a public
>> repository https://github.com/spray/spray
>>
>> To reproduce:
>>
>> # git clone https://github.com/spray/spray
>>
On Thu, Jan 16, 2014 at 06:47:38PM -0800, Siddharth Agarwal wrote:
> On 01/16/2014 06:21 PM, Jeff King wrote:
> > On Thu, Jan 16, 2014 at 05:08:14PM -0800, Siddharth Agarwal wrote:
> >
> >> With git-next, where git pull --rebase can print out "fatal: No such
> >> ref: ''" if git pull --rebase is ru
On 01/16/2014 20:14, Jeff King wrote:
The second patch turns on "MORE=R" only for FreeBSD. Yuri, if you can
confirm that my patch works for you, that would be excellent. And if you
(or anyone) has access to NetBSD or OpenBSD to test the second patch on,
I'd welcome updates to config.mak.uname for
On 01/16/2014 10:03, Jeff King wrote:
We used to print "Reading from helper 'git-remote-https' failed" in this
instance. But in the majority of cases, remote-https has printed a
useful message already to stderr, and the extra line just confused
people. The downside, as you noticed, is that when t
This is getting in better shape. Still wondering if the design is
right, so documentation, tests and some error cases are still
neglected. I have not addressed Jonathan's and Jeff's comments in this
reroll, but I haven't forgotten them yet. The test suite seems to be
fine when file-watcher is force
If an entry is "watched", git lets an external program decide if the
entry is modified or not. It's more like --assume-unchanged, but
designed to be controlled by machine.
We are running out of on-disk ce_flags, so instead of extending
on-disk entry format again, "watched" flags are in-core only a
This will be used as signature to know if the index has changed.
Signed-off-by: Nguyễn Thái Ngọc Duy
---
cache.h | 1 +
read-cache.c | 7 ---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/cache.h b/cache.h
index 323481c..a09d622 100644
--- a/cache.h
+++ b/cache.h
@@ -27
Signed-off-by: Nguyễn Thái Ngọc Duy
---
Documentation/config.txt | 5 +
file-watcher-lib.c | 18 +++---
file-watcher-lib.h | 2 +-
file-watcher.c | 8 ++--
read-cache.c | 17 +++--
5 files changed, 42 insertions(+), 8 deletions(
A new command is added to file watcher to send back the list of
updated files to git. These entries will have CE_WATCHED removed. The
remaining CE_WATCHED entries will have CE_VALID set (i.e. no changes
and no lstat either).
The file watcher does not cache stat info and send back to git. Its
main
This can be used to force watcher on when running the test
suite.
git-file-watcher processes are not automatically cleaned up after each
test. So after running the test suite you'll be left with plenty
git-file-watcher processes that should all end after about a minute.
Signed-off-by: Nguyễn Thái
If $GIT_DIR/index.watcher or $GIT_DIR/index is gone, exit. We could
watch this path too, but we'll waste precious resources (at least with
inotify). And with inotify, it seems to miss the case when $GIT_DIR is
moved. Just check if the socket path still exists every minute.
As the last resort, if w
"git diff" on webkit:
no file watcher 1st run subsequent runs
real0m1.361s0m1.445s 0m0.691s
user0m0.889s0m0.940s 0m0.649s
sys 0m0.469s0m0.495s 0m0.040s
Signed-off-by: Nguyễn Thái Ngọc Duy
---
config.mak.uname | 1 +
file-watcher.c
This patch establishes a connection between a new file watcher daemon
and git. Each index file may have at most one file watcher attached to
it. The file watcher maintains a UNIX socket at
$GIT_DIR/index.watcher. Any process that has write access to $GIT_DIR
can talk to the file watcher.
A validat
We want to watch files that are never changed because lstat() on those
files is a wasted effort. So we sort unwatched files by date and start
adding them to the file watcher until it barfs (e.g. hits inotify
limit). Recently updated entries are also excluded from watch list.
CE_VALID is used in com
watch_entries() is a lot of computation and could trigger a lot more
lookups in file-watcher. Normally after the first set of watches are
in place, we do not need to update often. Moreover if the number of
entries is small, the overhead of file watcher may actually slow git
down.
This patch only a
Signed-off-by: Nguyễn Thái Ngọc Duy
---
file-watcher.c | 24 ++--
1 file changed, 22 insertions(+), 2 deletions(-)
diff --git a/file-watcher.c b/file-watcher.c
index 1b4ac0a..df06529 100644
--- a/file-watcher.c
+++ b/file-watcher.c
@@ -113,6 +113,8 @@ static int handle_comman
Nguyễn Thái Ngọc Duy writes:
> If an entry is "watched", git lets an external program decide if the
> entry is modified or not. It's more like --assume-unchanged, but
> designed to be controlled by machine.
>
> We are running out of on-disk ce_flags, so instead of extending
> on-disk entry format
2013/12/31 Roman Kagan :
> 2013/12/30 Junio C Hamano :
>> Roman Kagan writes:
>>> I'd like to note that it's IMO worth including in the 'maint' branch
>>> as it's a crasher. Especially so since the real fix has been merged
>>> in the subversion upstream and nominated for 1.8 branch, so the
>>> wo
Am 16.01.2014 22:14, schrieb Philip Oakley:
> From: "Stefan Näwe"
> [...]
>>
>> I'd really like to see 'git help relnotes' working as well...
>>
>> Stefan
>
> Stefan,
>
> Were you thinking that all the release notes would be quoted verbatim in
> the one long man page?
>
> Or that it would be a
Hello guys, im Gordon.
I have a question about workflow with git that i dont know if im doing
it right.
I have 1 repo with 2 branchs the first is the master of the project.
the second is a branch copy of the master but he need to have some
specifc code because is code for a client.
so, every time
Our xwrite wrapper already deals with a few potential hazards, and
are as such more robust. Prefer it instead of write to get the
robustness benefits everywhere.
Signed-off-by: Erik Faye-Lund
---
With this patch, we don't call write directly any more; all calls
goes via the xwrite-wrapper.
buil
Since 0b6806b9 ("xread, xwrite: limit size of IO to 8MB"), this
wrapper is no longer needed, as read and write are already split
into small chunks.
Signed-off-by: Erik Faye-Lund
---
compat/mingw.c | 17 -
compat/mingw.h | 3 ---
2 files changed, 20 deletions(-)
diff --git a/com
On 2014-01-17 10.47, Nguyễn Thái Ngọc Duy wrote:
[snip[
> diff --git a/file-watcher-lib.c b/file-watcher-lib.c
> +int connect_watcher(const char *path)
Could it be worth to check if we can use some code from unix-socket.c ?
Especially important could be that unix_sockaddr_init() wotks around a p
Hello everyone,
I have a question about command 'git clone'
If i clone a repo from remote, and if i run command:
# git remote show origin
It will output origin's url, however, this is what i want, i just want to clone
codes, but keep everything else unchanged, for example branches and
they url…
On Fri, Jan 17, 2014 at 10:24 PM, Torsten Bögershausen wrote:
> On 2014-01-17 10.47, Nguyễn Thái Ngọc Duy wrote:
> [snip[
>> diff --git a/file-watcher-lib.c b/file-watcher-lib.c
>
>
>> +int connect_watcher(const char *path)
> Could it be worth to check if we can use some code from unix-socket.c ?
On 01/17/2014 03:26 AM, Jeff King wrote:
> On Thu, Jan 16, 2014 at 03:58:57PM -0800, SH wrote:
>
>> We have a repository which holds lots of shell and perl scripts. We add the
>> files to repository (from windows client) with executable permissions (using
>> cygwin) but when we pull that repository
On 01/17/2014 12:40 AM, John Keeping wrote:
On Thu, Jan 16, 2014 at 06:47:38PM -0800, Siddharth Agarwal wrote:
On 01/16/2014 06:21 PM, Jeff King wrote:
On Thu, Jan 16, 2014 at 05:08:14PM -0800, Siddharth Agarwal wrote:
With git-next, where git pull --rebase can print out "fatal: No such
ref:
"Kyle J. McKay" writes:
> On my OS X platform depending on which version of OpenSSL I'm using,
> the OPENSSLDIR path would be one of these:
>
> /System/Library/OpenSSL
> /opt/local/etc/openssl
>
> And neither of those uses a "certs" directory, they both use a
> "cert.pem" bundle instead:
>
>
Hi,
Erik Faye-Lund wrote:
> --- a/builtin/merge.c
> +++ b/builtin/merge.c
> @@ -367,7 +367,7 @@ static void squash_message(struct commit *commit, struct
> commit_list *remotehead
> sha1_to_hex(commit->object.sha1));
> pretty_print_commit(&ctx, commit, &out);
>
Jeff King writes:
> diff_filespec has a 2-bit "dirty_submodule" field and
> defines two flags as macros. Originally these were right
> next to each other, but a new field was accidentally added
> in between in commit 4682d85.
Interesting.
- 4682d852 (diff-index.c: "git diff" has no need to rea
Jeff King writes:
> But while looking at it, I noticed a bunch of cleanups for
> diff_filespec. With the patches below, sizeof(struct diff_filespec) on
> my 64-bit machine goes from 96 bytes down to 80. Compiling with "-m32"
> goes from 64 bytes down to 52.
>
> The first few patches have cleanup
Jeff King writes:
> On Thu, Jan 16, 2014 at 05:08:14PM -0800, Siddharth Agarwal wrote:
>
>> With git-next, where git pull --rebase can print out "fatal: No such
>> ref: ''" if git pull --rebase is run on branches without an upstream.
>
> This is already fixed in bb3f458 (rebase: fix fork-point wi
Jonathan Nieder writes:
> Hi,
>
> Erik Faye-Lund wrote:
>
>> --- a/builtin/merge.c
>> +++ b/builtin/merge.c
>> @@ -367,7 +367,7 @@ static void squash_message(struct commit *commit, struct
>> commit_list *remotehead
>> sha1_to_hex(commit->object.sha1));
>> pretty
On Fri, Jan 17, 2014 at 8:07 PM, Junio C Hamano wrote:
> Jonathan Nieder writes:
>
>> Hi,
>>
>> Erik Faye-Lund wrote:
>>
>>> --- a/builtin/merge.c
>>> +++ b/builtin/merge.c
>>> @@ -367,7 +367,7 @@ static void squash_message(struct commit *commit,
>>> struct commit_list *remotehead
>>>
"Kyle J. McKay" writes:
> On Jan 16, 2014, at 20:21, Jeff King wrote:
>> When we run the pager, we always set "LESS=R" to tell the
>> pager to pass through ANSI colors. On modern versions of
>> FreeBSD, the system "more" can do the same trick.
> [snip]
>> diff --git a/pager.c b/pager.c
>> index 9
Jeff King writes:
> diff --git a/pager.c b/pager.c
> index 90d237e..2303164 100644
> --- a/pager.c
> +++ b/pager.c
> @@ -87,6 +87,10 @@ void setup_pager(void)
> argv_array_push(&env, "LESS=FRSX");
> if (!getenv("LV"))
> argv_array_push(&env, "LV=-c");
> +#ifdef P
Thanks guys. Sorry but one more question, like I mentioned we have hosted
repositories so how do I make some configuration changes are server based so
whether the client have those changes or not, it wouldn't matter. Also I have
one client on linux and another one on windows (for my testing pur
Roman Kagan writes:
> 2013/12/31 Roman Kagan :
>> 2013/12/30 Junio C Hamano :
>>> Roman Kagan writes:
I'd like to note that it's IMO worth including in the 'maint' branch
as it's a crasher. Especially so since the real fix has been merged
in the subversion upstream and nominated
On Fri, Jan 17, 2014 at 10:57:56AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Thu, Jan 16, 2014 at 05:08:14PM -0800, Siddharth Agarwal wrote:
> >
> >> With git-next, where git pull --rebase can print out "fatal: No such
> >> ref: ''" if git pull --rebase is run on branches without
Yuri writes:
> I think that in a rare case of error this extra-printout wouldn't
> hurt.
If the "error is rare, extra verbiage does not hurt" were a valid
attitude, "error is rare, non-zero exit is enough" would be equally
valid ;-)
Also that statement contradicts with the rationale given by 26
On Fri, Jan 17, 2014 at 10:46:59AM -0800, Junio C Hamano wrote:
> Jeff King writes:
>
> > diff_filespec has a 2-bit "dirty_submodule" field and
> > defines two flags as macros. Originally these were right
> > next to each other, but a new field was accidentally added
> > in between in commit 468
(Please no top posting next time)
On 2014-01-17 20.20, SH wrote:
> On Friday, January 17, 2014 10:08 AM, Torsten Bögershausen
> wrote:
> On 01/17/2014 03:26 AM, Jeff King wrote:
>
>> On Thu, Jan 16, 2014 at 03:58:57PM -0800, SH wrote:
>>
>>> We have a repository which holds lots of shell and per
Junio C Hamano writes:
> Jeff King writes:
>
>> diff --git a/pager.c b/pager.c
>> index 90d237e..2303164 100644
>> --- a/pager.c
>> +++ b/pager.c
>> @@ -87,6 +87,10 @@ void setup_pager(void)
>> argv_array_push(&env, "LESS=FRSX");
>> if (!getenv("LV"))
>> argv_array
Commit 48059e4 (pull: use merge-base --fork-point when appropriate,
2013-12-08) incorrectly assumes that get_remote_merge_branch will either
yield a non-empty string or return an error, but there are circumstances
where it will yield an empty string.
The previous code then invoked git-rev-list wit
John Keeping writes:
>> Perhaps something like this is needed?
>> ...
> Either that or "2>/dev/null" like in the original, yes.
Ah, that makes sense. I see you already followed-up with a patch,
so I'll pick it up.
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
th
Jonathan Nieder writes:
> Junio C Hamano wrote:
>> Jonathan Nieder writes:
>
>>> Shouldn't this use write_in_full() to avoid a silently truncated result? (*)
>>
>> Meaning this? If so, I think it makes sense.
> [...]
>> -if (xwrite(fd, out.buf, out.len) < 0)
>> +if (write_in_full(fd, ou
Junio C Hamano wrote:
> Jonathan Nieder writes:
>> Shouldn't this use write_in_full() to avoid a silently truncated result? (*)
>
> Meaning this? If so, I think it makes sense.
[...]
> - if (xwrite(fd, out.buf, out.len) < 0)
> + if (write_in_full(fd, out.buf, out.len) != out.len)
Yes.
Thanks again.
On Friday, January 17, 2014 11:55 AM, Torsten Bögershausen
wrote:
(Please no top posting next time)
On 2014-01-17 20.20, SH wrote:
> On Friday, January 17, 2014 10:08 AM, Torsten Bögershausen
> wrote:
> On 01/17/2014 03:26 AM, Jeff King wrote:
>
>> On Thu, Jan 16, 2014 at 03
On Fri, Jan 17, 2014 at 11:43:35AM -0800, Junio C Hamano wrote:
> Yuri writes:
>
> > I think that in a rare case of error this extra-printout wouldn't
> > hurt.
>
> If the "error is rare, extra verbiage does not hurt" were a valid
> attitude, "error is rare, non-zero exit is enough" would be eq
One other idea to handle this is at configuration phase. You can test
more and less with every option used on every platform for each of them
respectively. Test could run the command with the option, and check if
it passes the given escape sequence. This would be reflected in config.h
defines l
On Fri, Jan 17, 2014 at 03:13:25PM -0500, Jeff King wrote:
> On Fri, Jan 17, 2014 at 11:43:35AM -0800, Junio C Hamano wrote:
>
> > Yuri writes:
> >
> > > I think that in a rare case of error this extra-printout wouldn't
> > > hurt.
> >
> > If the "error is rare, extra verbiage does not hurt" w
I was trying to send a new version of a patch to a gerrit server from
a new computer, so I made a change with a ChangeId in the description
and tried to review it:
strainu@emily:~/core> git branch archivebot
strainu@emily:~/core> git checkout archivebot
M pywikibot/page.py
Switched to branch
On 01/17/2014 12:13, Jeff King wrote:
$ git clonehttps://google.com/foo.git
Cloning into 'foo'...
fatal: repository 'https://google.com/foo.git/' not found
fatal: Reading from helper 'git-remote-https' failed
That second line is not adding anything, and IMHO is making things
uglier a
Hi,
Strainu wrote:
> strainu@emily:~/core> git review -f
> Creating a git remote called "gerrit" that maps to:
> ssh://stra...@gerrit.wikimedia.org:29418/pywikibot/core.git
> Your change was committed before the commit hook was installed.
> Amending the commit to add a gerrit change id.
>
On Fri, Jan 17, 2014 at 12:39:39PM -0800, Yuri wrote:
> >That second line is not adding anything, and IMHO is making things
> >uglier and more confusing. We_expected_ the helper to hang up; that's
> >how it signals an error to us. It is not an unexpected condition at all.
> >The exit(128) we do i
2014/1/17 Jonathan Nieder :
> Hi,
>
> Strainu wrote:
>
>> strainu@emily:~/core> git review -f
>> Creating a git remote called "gerrit" that maps to:
>> ssh://stra...@gerrit.wikimedia.org:29418/pywikibot/core.git
>> Your change was committed before the commit hook was installed.
>> Amending
On Fri, Jan 17, 2014 at 10:14:28AM -0200, Gordon Freeman wrote:
> Hello guys, im Gordon.
>
> I have a question about workflow with git that i dont know if im doing
> it right.
> I have 1 repo with 2 branchs the first is the master of the project.
> the second is a branch copy of the master but he n
On Jan 17, 2014, at 10:14, Junio C Hamano wrote:
If I am reading the code correctly, if /etc/ssl/certs does not exist
on the filesystem at all, it wouldn't even attempt verification, so
I take your "the verification will fail" to mean that you forgot to
also mention "And on OS X, /etc/ssl/certs d
Perhaps I haven't been clear enough: the commit already had a change
ID, added manually, so with or without the hook it would have been
attached to the correct review.
In this case, the hook will actually do nothing, making the current
wording of the message confusing IMO. My suggestion was [1] to
Junio C Hamano writes:
> Perhaps we can start it like this. Then pager.c can iterate over
> the PAGER_ENV string, parse out LESS=, LV=, etc., and do its thing.
>
> We would also need to muck with git-sh-setup.sh but that file is
> already preprocessed in the Makefile, so we should be able to do
Jeff King writes:
> I'm happy with it either way. I almost just pulled the macro
> definitions, including DIFF_FILE_VALID, out of the struct definition
> completely. I see the value in having the flags near their bitfield, but
> it makes the definition a bit harder to read.
Yeah, my thoughts exa
Currently git log mixes timezones in the date records in the same log,
so the following dates wold appear in one log:
Date: Thu Jan 16 17:11:28 2014 -0800
Date: Thu Jan 16 20:10:04 2014 -0500
Timezone here doesn't help the log reader at all. It doesn't even
reflect the actual location of th
Hi,
Yuri wrote:
> Timezone here doesn't help the log reader at all. It doesn't even
> reflect the actual location of the submitter. Instead, it should be
> converted to the local TZ of the client. This will make it easier to
> read and understand the time.
Does "git log --date=local" or "git log
On Wed, Jan 15, 2014 at 06:13:30AM -0500, Jeff King wrote:
> On Wed, Jan 15, 2014 at 11:37:08AM +0100, David Kastrup wrote:
>
> > The question is what guarantees I have with regard to the commit date of
> > a commit in relation to that of its parent commits:
> >
> > a) none
> > b) commitdate(chil
Hi,
I want to do some cleaning in this round of l10n:
Removing two po files (da.po and nl.po) without a single
translation for almost 2 years.
Statistics for other languages:
* There are five full translations for German, French,
Swedish, Vietnamese and Simplified Chinese;
* 2 partial tr
On Sat, Jan 18, 2014 at 10:05 AM, brian m. carlson
wrote:
> On Fri, Jan 17, 2014 at 10:14:28AM -0200, Gordon Freeman wrote:
>> Hello guys, im Gordon.
>>
>> I have a question about workflow with git that i dont know if im doing
>> it right.
>> I have 1 repo with 2 branchs the first is the master of
66 matches
Mail list logo
