I have the following project structure:
root-project
|
|-- A
| |
| |-- C
|
|-- B
A and B are submodules of the root-project. C is in turn a submodule
of project A. Suppose I have made changes to projects A,B and C and
commited these changes to the
On Sat, Mar 21, 2015 at 4:43 AM, Thomas Gummerer t.gumme...@gmail.com wrote:
The split index extension uses ewah bitmaps to mark index entries as
deleted, instead of removing them from the index directly. This can
result in an on-disk index, in which entries of stage #0 and higher
stages
On Tue, Mar 24, 2015 at 7:46 PM, mdc...@seznam.cz wrote:
Duy, you wrote:
This is true. To elaborate, if we have to recurse in excluded directories so
that we can include some back, then the reason for excluding is already
defeated as we may need to traverse the entire directory structure.
On Thu, Mar 19, 2015 at 4:33 AM, Max Kirillov m...@max630.net wrote:
On Sun, Feb 08, 2015 at 09:36:43AM -0800, Jens Lehmann wrote:
I wonder if it's worth all the hassle to invent new names. Wouldn't
it be much better to just keep a list of per-worktree configuration
value names and use that
Hi Duy, Eric,
thx a lot. So net net - I can't really achieve this. It feels like something
very basic and simple so pretty surprising but guess that's what it is :)
Normally, I'd expect that the functionality will behave like with similar other
blacklist/whitelist functionalities in Linux -
On Sat, Mar 21, 2015 at 10:59 AM, Junio C Hamano gits...@pobox.com wrote:
A further tangent (Duy Cc'ed for this point). We might want to
rethink the interface to ce_path_match() and report_path_error()
so that we do not have to do a separate allocation of has this
pathspec been used? array.
While commit 9f673f9 (gc: config option for running --auto in
background - 2014-02-08) helps reduce some complaints about 'gc
--auto' hogging the terminal, it creates another set of problems.
The latest in this set is, as the result of daemonizing, stderr is
closed and all warnings are lost. This
Paul Tan pyoka...@gmail.com writes:
Matthieu and Eric: I know I said I will try to re-order the patches to
put the tests before the implementation, but after thinking and trying
to rewrite the commit messages I realised it seems really weird to me.
In this patch series, the implementation is
On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine sunsh...@sunshineco.com wrote:
e.g. db, reports or scripts, we could keep going for a while. I
think I attempted to do this in the past and failed (don't remember
exactly why). Maybe I'll try again some time in future.
I also was pretty sure that
Quoting Jeff King p...@peff.net:
This shortens the code and fixes some -chaining.
Signed-off-by: Jeff King p...@peff.net
---
t/t1301-shared-repo.sh | 20 +++-
1 file changed, 7 insertions(+), 13 deletions(-)
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
On Tue, Mar 24, 2015 at 8:17 AM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote:
While commit 9f673f9 (gc: config option for running --auto in
background - 2014-02-08) helps reduce some complaints about 'gc
--auto' hogging the terminal, it creates another set of problems.
The latest in this set
On Mon, Mar 23, 2015 at 12:03:37PM -0700, Junio C Hamano wrote:
Is it a good time for me to pull from you, or do you recommend me to
wait for a bit, expecting more? We'll go in the pre-release freeze
soon-ish, so I thought I should ping.
Now is a good time to pull from the usual place,
* pw/remote-set-url-fetch (2014-11-26) 1 commit
- remote: add --fetch and --both options to set-url
This has not seen any activity for a few months since $gmane/261483;
is anybody still interested in resurrecting it?
--
To unsubscribe from this list: send the line unsubscribe git in
the
Junio C Hamano gits...@pobox.com writes:
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
This cycle is turning out to be a shoot for product excellence
release. About half of the
From: Duy Nguyen pclo...@gmail.com
On Fri, Mar 20, 2015 at 6:07 AM, Philip Oakley philipoak...@iee.org
wrote:
Hi, I was expecting that sparse checkout could be used to avoid the
checking
out, by git, of files which have colons in their name into the
worktree when
on Windows.
Yue Lin Ho
On 03/24, Junio C Hamano wrote:
Thomas Gummerer t.gumme...@gmail.com writes:
03f15a7 read-cache: fix reading of split index moved the checks for the
correct order of index entries out of do_read_index. This loosens the
checks more than necessary. Re-introduce the checks for the order,
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
While commit 9f673f9 (gc: config option for running --auto in
background - 2014-02-08) helps reduce some complaints about 'gc
--auto' hogging the terminal, it creates another set of problems.
The latest in this set is, as the result of
Quoting Jeff King p...@peff.net:
These say roughly the same thing as the hand-rolled
messages. We do lose the merge did not complete debug
message, but merge and write-tree are prefectly capable of
s/prefectly/perfectly/
writing useful error messages when they fail.
Signed-off-by: Jeff
From: Michael J Gruber g...@drmicha.warpmail.net
Junio C Hamano venit, vidit, dixit 20.03.2015 23:38:
Stefan Beller sbel...@google.com writes:
Thomas referencing reading the man page offline, made me wonder
why you wouldn't read the man pages itself as they can also be
carried around offline.
Thomas Gummerer t.gumme...@gmail.com writes:
03f15a7 read-cache: fix reading of split index moved the checks for the
correct order of index entries out of do_read_index. This loosens the
checks more than necessary. Re-introduce the checks for the order, but
don't error out when we have
Junio C Hamano gits...@pobox.com writes:
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
This has been lingering in my 'pu' branch without seeing any updates
since $gmane/250758; is anybody still interested in resurrecting it
and moving it
t9119 refuses to run with svn versions greater than 1.6 since git svn
info does not even try to match the output of svn info for later
versions.
Adjust git svn info to match these versions and make t9119 run with
them. This requires the following changes:
* compute checksums with SHA1 instead of
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
At the first look, a user may think the default version is 23. Even
with UNIX background, there's no reference anywhere close that may
indicate this is glob or regex.
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com
---
Thanks.
On Mon, Mar 23, 2015 at 6:18 PM, Duy Nguyen pclo...@gmail.com wrote:
Could you share these changes? I'm just wondering if we can add kcov
support to the test suite.
In this case it's more of an embarrassing hack, as I just needed a way
to make git run kcov outdir git-pull.sh whenever git pull
Michael Haggerty mhag...@alum.mit.edu writes:
It is easy to allow --abbrev=+7; I would just need to add NUM_PLUS to
those call sites. Should I do so?
The more relevant question to ask from my point of view is why you
need to add NUM_PLUS to enable it. What valid reason do you
have to forbid
On 03/19/2015 06:26 AM, Jeff King wrote:
On Tue, Mar 17, 2015 at 05:00:02PM +0100, Michael Haggerty wrote:
My main questions:
* Do people like the API? My main goal was to make these functions as
painless as possible to use correctly, because there are so many
call sites.
* Is it too
On 03/19/2015 08:32 AM, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
I wonder how much of the boilerplate in the parse_* functions could be
factored out to use a uintmax_t, with the caller just providing the
range. That would make it easier to add new types like off_t, and
possibly
Quoting Jeff King p...@peff.net:
This test contains a lot of hand-rolled messages to show
when the test fails. We can omit most of these by using
verbose and test_must_fail. A few of them are for
update-index, but we can assume it produces reasonable error
messages when it fails.
On Tue, Mar 24, 2015 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
This has been lingering in my 'pu' branch without seeing any updates
On Wed, Mar 25, 2015 at 01:23:23AM +0100, SZEDER Gábor wrote:
for f in one dir/two
do
append_cr $f tmp mv -f tmp $f
-git update-index -- $f || {
-echo Oops
-false
-break
-}
+
On Wed, Mar 25, 2015 at 03:53:52AM +0100, SZEDER Gábor wrote:
cmd1
for i in a b c; do
cmd2 $i
done
cmd3
which will not notice failures of cmd2 a or cmd b
s/cmd b/cmd2 b/ ?
Yes, but the patches are already in next, so it is sadly too late for
commit
Quoting Jeff King p...@peff.net:
The confirmation tests in t9001 all save the value of
sendemail.confirm, do something to it, then restore it at
the end, in a way that breaks the -chain (they are not
wrong, because they save the $? value, but it fools
--chain-lint).
Instead, they can all use
On Wed, Mar 25, 2015 at 12:51:20AM +0100, SZEDER Gábor wrote:
@@ -33,7 +32,7 @@ do
git init --shared=1
test 1 = $(git config core.sharedrepository)
)
-actual=$(ls -l sub/.git/HEAD)
+actual=$(ls -l
On Wed, Mar 25, 2015 at 03:00:22AM +0100, SZEDER Gábor wrote:
Instead, they can all use test_when_finished, and we can
even make the code simpler by factoring out the shared
lines.
I think that saving the value of 'sendemail.confirm' is not necessary.
There are two blocks of confirmation
On Wed, Mar 25, 2015 at 6:50 AM, Philip Oakley philipoak...@iee.org wrote:
I've corrected the sparse-checkout, but won't the command line 'git
update-index --skip-worktree' will still need it? (demo commands below)
A git checkout (without arguments) or read-trree -mu should attach
skip-worktree
On Wed, Mar 25, 2015 at 5:07 AM, Junio C Hamano gits...@pobox.com wrote:
+ LANG=C git gc --auto
+ sleep 1 # give it time to daemonize
+ while test -f .git/gc.pid; do sleep 1; done
Yuck...
Yeah.. it's hard to test daemon things. I'm not even sure if we
Quoting Jeff King p...@peff.net:
However, there are a number of places it cannot reach:
- it cannot find a failure to break out of loops on error,
like:
cmd1
for i in a b c; do
cmd2 $i
done
cmd3
which will not notice failures of cmd2 a or cmd b
Jakub Narębski jna...@gmail.com writes:
On Tue, Mar 24, 2015 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
Junio C Hamano gits...@pobox.com writes:
* jn/gitweb-utf8-in-links (2014-05-27) 1 commit
- gitweb: Harden UTF-8 handling in generated links
This has been lingering in my
Here's what I found looking for loops like:
for i in a b c; do
something_important $i || break
done
something_else
which presumably expect the chain to stop when something_important fails
for any loop element. The solutions are one of (depending on the
surrounding code):
1. Switch
When checking a list of file mtimes, we use a loop and break
out early from the loop if any entry does not match.
However, the exit code of a loop exited via break is always
0, meaning that the test will fail to notice we had a
mismatch. Since the loop is inside a function, we can fix
this by
A loop like:
for f in one two; do
something $f ||
break
done
will correctly break out of the loop when we see a failure
of one item, but the resulting exit code will always be
zero. We can fix that by putting the loop into a function or
subshell, but in this case it is
When we test deleting notes, we run git notes remove in a
loop. However, the exit value of the loop will only reflect
the final note we process. We should break out of the loop
with a failing exit code as soon as we see a problem.
Note that we can call exit 1 here without explicitly
creating a
Hi,
On Wed, Mar 25, 2015 at 2:37 AM, Junio C Hamano gits...@pobox.com wrote:
Paul Tan pyoka...@gmail.com writes:
..., I propose the following requirements for the rewritten code:
1. No spawning of external git processes. This is to support systems with
high
``fork()`` or process
These are all cases where we do a setup step of the form:
for i in $foo; do
set_up $i || break
done
more_setup
would not notice a failure in set_up (because break always
returns a 0 exit code). These are just setup steps that we
do not expect to fail, but it does not hurt to be
Since shell loops may drop the exit code of failed commands
inside the loop, some tests try to keep track of the status
by setting a variable. This can end up cumbersome and hard
to read; it is much simpler to just exit directly from the
loop using return 1 (since each case is either in a helper
The idea of this helper is that we want to save the current
value of a config variable and then restore it again after
the test completes. However, there's no point in actually
saving the value; it should always be restored to the string
never (which you can confirm by instrumenting
save_confirm
These tests are not wrong, but it is much shorter and more
idiomatic to say verbose or test_must_fail rather than
printing our own messages on failure. Likewise, there is no
need to say happy at the end of a test; the test suite
takes care of that.
Signed-off-by: Jeff King p...@peff.net
---
I
When copying the test repository, we try to detect whether
the copy succeeded. However, most of the heavy lifting is
done inside a for loop, where our break will lose the exit
code of the failing cp. We can take advantage of the fact
that we are in a subshell, and just exit 1 to break out
with a
Hi all,
I'm applying for git in the Google Summer of Code this year. For my
project, I propose to rewrite git-pull.sh and git-am.sh into fast
optimized C builtins. I've already hacked up a prototype of a builtin
git-pull in [1], and it showed a promising 8x improvement in execution
time on
Am 24.03.2015 um 17:06 schrieb Michael Haggerty:
Parsing numbers is not rocket science, but there are a lot of pitfalls,
especially around overflow. It's even harder to write such code via
macros and the result is less readable.
This patch series is mostly about finding a reasonable API and
On Tue, Mar 24, 2015 at 6:19 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
A few minor details:
on operating systems with poor file system performance (i.e. Windows)
= that's not only windows, I also commonly use a slow filesystem on
Linux, just because it's NFS. Mentionning other
On Tue, Mar 24, 2015 at 5:39 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
e.g. db, reports or scripts, we could keep going for a while. I
think I attempted to do this in the past and failed (don't remember
exactly why).
t1501-worktree.sh does not copy the shared index in the relative
$GIT_WORK_TREE and git subprocesses test, which makes the test fail
when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in
order to fix this.
Signed-off-by: Thomas Gummerer t.gumme...@gmail.com
---
This applies on top
On 03/24/2015 04:58 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
It is easy to allow --abbrev=+7; I would just need to add NUM_PLUS to
those call sites. Should I do so?
The more relevant question to ask from my point of view is why you
need to add NUM_PLUS to
Stefan Beller sbel...@google.com writes:
So I started looking into extending the buffer size as another 'first step'
towards the protocol version 2 again. But now I think the packed length
limit of 64k is actually a good and useful thing to have and should be
extended/fixed if and only if we
Thomas Gummerer t.gumme...@gmail.com writes:
t1501-worktree.sh does not copy the shared index in the relative
$GIT_WORK_TREE and git subprocesses test, which makes the test fail
when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in
order to fix this.
Signed-off-by: Thomas
On Mon, Mar 23, 2015 at 09:01:48PM +0100, Jens Lehmann wrote:
Am 20.03.2015 um 01:13 schrieb Trevor Saunders:
On Thu, Mar 19, 2015 at 02:15:19PM -0700, Junio C Hamano wrote:
Trevor Saunders tbsau...@tbsaunde.org writes:
I have a feeling that an optional feature that allows git submodule
Paul Tan pyoka...@gmail.com writes:
..., I propose the following requirements for the rewritten code:
1. No spawning of external git processes. This is to support systems with high
``fork()`` or process creation overhead, and to reduce redundant IO by
taking advantage of the internal
The three dots in messages where the hash is abbreviated
were misinterpreted and are fixed with this commit.
Noticed-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
po/de.po | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
From: Phillip Sz phillip.sze...@gmail.com
Signed-off-by: Phillip Sz phillip.sze...@gmail.com
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
po/de.po | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/po/de.po b/po/de.po
index 11fbd0f..7b30f62
Michael J Gruber g...@drmicha.warpmail.net wrote:
Ralf Thielow venit, vidit, dixit 21.03.2015 22:21:
Am 21. März 2015 um 13:52 schrieb Phillip Sz phillip.sze...@gmail.com:
I think we should use it like this, as most open-source projects do.
Also we should use a space before the three dots
On 03/24, Duy Nguyen wrote:
On Sat, Mar 21, 2015 at 4:43 AM, Thomas Gummerer t.gumme...@gmail.com wrote:
The split index extension uses ewah bitmaps to mark index entries as
deleted, instead of removing them from the index directly. This can
result in an on-disk index, in which entries of
Ralf Thielow venit, vidit, dixit 21.03.2015 22:21:
Am 21. März 2015 um 13:52 schrieb Phillip Sz phillip.sze...@gmail.com:
I think we should use it like this, as most open-source projects do.
Also we should use a space before the three dots as per
On Sun, Mar 22, 2015 at 12:36 PM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
The cleanup function is used in 4 places now and it's always safe to
free up the memory as well.
Signed-off-by: Stefan Beller sbel...@google.com
---
http.c | 1 +
1 file
Junio C Hamano gits...@pobox.com writes:
Michael Haggerty mhag...@alum.mit.edu writes:
It is easy to allow --abbrev=+7; I would just need to add NUM_PLUS to
those call sites. Should I do so?
The more relevant question to ask from my point of view is why you
need to add NUM_PLUS to enable
On 03/19/2015 07:22 AM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
* It allows leading whitespace.
This might be blessing in disguise. Our friends on MacOS may be
relying on that
git cmd --abbrev=$(wc -c foo)
to work as expected, even though their wc
Duy Nguyen pclo...@gmail.com writes:
Thank you for catching this. I was about to write would be nice to
point out what tests fail so the reviewer has easier time trying
themselves, but whoa.. quite a few of them!
May I suggest a slight modification. Even though stage info is messed
up
t1501-worktree.sh does not copy the shared index in the relative
$GIT_WORK_TREE and git subprocesses test, which makes the test fail
when GIT_TEST_SPLIT_INDEX is set. Copy the shared index as well in
order to fix this.
Helped-by: Junio C Hamano gits...@pobox.com
Signed-off-by: Thomas Gummerer
https://rubygems.org/gems/macblame/
check this out.. and you can also contribute to the developement at,
https://github.com/praserocking/macblame-gem
or
https://github.com/praserocking/macblame
..
hope this tool will be helpful to you all!
Thanks,
Prasanna
--
To unsubscribe from this list: send
Eric Sunshine sunsh...@sunshineco.com writes:
On Tue, Mar 24, 2015 at 5:39 AM, Duy Nguyen pclo...@gmail.com wrote:
On Tue, Mar 24, 2015 at 8:55 AM, Eric Sunshine sunsh...@sunshineco.com
wrote:
e.g. db, reports or scripts, we could keep going for a while. I
think I attempted to do this in
On Tue, Mar 24, 2015 at 01:02:35PM -0700, Junio C Hamano wrote:
* jk/test-chain-lint (2015-03-22) 28 commits
[...]
What I queued here has fix to the issue J6t found in 15/25 squashed
in, and also has 26/25 and 27/25 follow-up fixes from Michael, plus
28/25 follow-up from Torsten. If
Junio C Hamano gits...@pobox.com writes:
[Stalled]
* mh/fdopen-with-retry (2015-03-06) 6 commits
- buffer_fdinit(): use fdopen_with_retry()
- update_info_file(): use fdopen_with_retry()
- copy_to_log(): use fdopen_with_retry()
- fdopen_lock_file(): use fdopen_with_retry()
- SQUASH???
Junio C Hamano gits...@pobox.com writes:
* jk/test-chain-lint (2015-03-22) 28 commits
- t6039: fix broken chain
- t9158, t9161: fix broken -chain in git-svn tests
- t9104: fix test for following larger parents
- t4104: drop hand-rolled error reporting
- t0005: fix broken -chains
-
Thanks a lot for fixing!
Phillip
Let's apply this instead.
-- 8 --
From: Phillip Sz phillip.sze...@gmail.com
Date: Sat, 21 Mar 2015 13:52:37 +0100
Subject: [PATCH] l10n: de.po: add space before ellipsis
Signed-off-by: Phillip Sz phillip.sze...@gmail.com
Signed-off-by: Ralf Thielow
Paul Tan pyoka...@gmail.com writes:
On Tue, Mar 24, 2015 at 6:19 PM, Matthieu Moy
matthieu@grenoble-inp.fr wrote:
About the timeline: I'd avoid too much parallelism. Usually, it's best
to try to send a first patch to the mailing list as soon as possible,
hence focus on one point first
Stefan Beller sbel...@google.com writes:
Well there is hope, as `release_request` only touches
free(request-url);
free(request);
and not the userData pointer.
OK.
I am a bit puzzled what you're trying to hint at.
The caller does this:
static void
2015-03-24 18:32 GMT+01:00 Junio C Hamano gits...@pobox.com:
Ralf Thielow ralf.thie...@gmail.com writes:
diff --git a/po/de.po b/po/de.po
index 11fbd0f..9fa3f4c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -616,7 +616,7 @@ msgstr
#: help.c:373
#, c-format
msgid in %0.1f seconds
Duy Nguyen pclo...@gmail.com writes:
read-tree -m does not invoke diff, does it? If I went with my
previous approach (modifying unpack-trees to ignore i-t-a entries)
then this could be a problem, but because unpack-trees is untouched,
merge operations should not be impacted by this patch.
2015-03-24 18:10 GMT+01:00 Ralf Thielow ralf.thie...@gmail.com:
Let's apply this instead.
-- 8 --
#: builtin/notes.c:51
msgid git notes copy --stdin [from-object to-object]...
-msgstr git notes copy --stdin [von-Objekt nach-Objekt]...
+msgstr git notes copy --stdin [von-Objekt
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
03f15a7 read-cache: fix reading of split index moved the checks for the
correct order of index entries out of do_read_index. This loosens the
checks more than necessary. Re-introduce the checks for the order, but
don't error out when we have multiple stage-0 entries in the index.
Return a flag
Michael Haggerty mhag...@alum.mit.edu writes:
Regarding specifically allowing/disallowing a leading '+': I saw a
couple of callsites that explicitly check that the first character is a
digit before calling strtol(). I assumed that is to disallow sign
characters [1]. For example,
diff.c:
On Tue, Mar 24, 2015 at 2:07 PM, Shenbaga Prasanna S
prasann...@freshdesk.com wrote:
https://rubygems.org/gems/macblame/
check this out.. and you can also contribute to the developement at,
https://github.com/praserocking/macblame-gem
or
https://github.com/praserocking/macblame
..
hope
Duy Nguyen pclo...@gmail.com writes:
On Sat, Mar 21, 2015 at 10:59 AM, Junio C Hamano gits...@pobox.com wrote:
A further tangent (Duy Cc'ed for this point). We might want to
rethink the interface to ce_path_match() and report_path_error()
so that we do not have to do a separate allocation of
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 in
the
85 matches
Mail list logo
