@number first, @size second argument.
Signed-off-by: Arjun Sreedharan
---
builtin/for-each-ref.c| 2 +-
compat/regex/regcomp.c| 12 ++--
compat/regex/regex_internal.c | 4 ++--
compat/regex/regexec.c| 10 +-
imap-send.c | 2 +-
5 files
Hi,
Bostjan Skufca wrote:
> Git is great for tracking code development, but when deploying
> mentioned code by using git itself, various configuration files must
> be created additionally, which are normally .gitignored, for various
> reasons (code portability, sensitive data, etc). There is curr
Hi there,
I created a patch which makes ".gitignore" filename configurabe.
Preliminary diff is pasted below.
My question is:
Would something like this be acceptable for inclusion?
(providing documentation and test cases will be done too, of course)
See "Motivation" part below for additional expl
On Fri, Aug 29, 2014 at 3:08 PM, Jeff King wrote:
> On Fri, Aug 29, 2014 at 02:56:18PM -0700, Junio C Hamano wrote:
>
>> Jeff King writes:
>>
>> > If a pack contains duplicates of an object, and if that
>> > object has any deltas pointing at it with REF_DELTA, we will
>> > try to resolve the delt
On Thu, Aug 28, 2014 at 02:36:22PM -0700, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> >> + if (check_refname_format(buffer, REFNAME_ALLOW_ONELEVEL))
> >> + ret = error_func(&tag->object, FSCK_ERROR, "invalid 'tag' name:
> >> %s", buffer);
> >> + *eol = '\n';
> >
> > I actually
On Thu, Aug 28, 2014 at 02:25:16PM -0700, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > We inspect commit objects pretty much in detail in git-fsck, but we just
> > glanced over the tag objects. Let's be stricter.
> >
> > This work was sponsored by GitHub Inc.
>
> Is it only this co
On Thu, Aug 28, 2014 at 04:46:49PM +0200, Johannes Schindelin wrote:
> So far, we assumed that the buffer is NUL terminated, but this is not
> a safe assumption, now that we opened the fsck_object() API to pass a
> buffer directly.
>
> So let's make sure that there is at least an empty line in th
On Thu, Aug 28, 2014 at 01:47:52PM -0700, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > When fsck'ing an incoming pack, we need to fsck objects that cannot be
> > read via read_sha1_file() because they are not local yet (and might even
> > be rejected if transfer.fsckobjects is set t
On Thu, Aug 28, 2014 at 04:46:42PM +0200, Johannes Schindelin wrote:
> When fsck'ing an incoming pack, we need to fsck objects that cannot be
> read via read_sha1_file() because they are not local yet (and might even
> be rejected if transfer.fsckobjects is set to 'true').
>
> For commits, there
Jeff King writes:
> On Fri, Aug 29, 2014 at 05:36:21PM +0100, Ramsay Jones wrote:
>
>> On 32-bit platforms (only), gcc and sparse both issue warnings
>> about the type of the pointer expression passed as the third
>> argument to find_commit_header(). In order to suppress the
>> warnings, we simp
On Fri, Aug 29, 2014 at 11:02:36PM +0200, Beat Bolli wrote:
> On 29.08.14 20:59, Junio C Hamano wrote:
> >> +# ISO strict date format
> >> +test_expect_success 'ISO and ISO-strict date formats display the same
> >> values' '
> >> + git log --format=%ai%n%ci | sed -e "s/ /T/; s/ //; s/..\$/:&/"
On Fri, Aug 29, 2014 at 02:56:18PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > If a pack contains duplicates of an object, and if that
> > object has any deltas pointing at it with REF_DELTA, we will
> > try to resolve the deltas twice. While unusual, this is not
> > strictly an error
Jeff King writes:
> If a pack contains duplicates of an object, and if that
> object has any deltas pointing at it with REF_DELTA, we will
> try to resolve the deltas twice. While unusual, this is not
> strictly an error, but we currently die() with an unhelpful
> message.
Hmm, I vaguely recall
On 29.08.14 21:04, Junio C Hamano wrote:
> I've queued with this fix squashed in.
Oops, I just sent v3 with your latest fixes as well. Please ignore it.
Thanks,
Beat
--
mail: echo '' | tr -d '[A-S]'
pgp: 0x506A903A; 49D5 794A EA77 F907 764F D89E 304B 93CF 506A 903A
gsm: 4.7.7.6.0.7.7.9.7.1.4.e
On 29.08.14 20:59, Junio C Hamano wrote:
>> +# ISO strict date format
>> +test_expect_success 'ISO and ISO-strict date formats display the same
>> values' '
>> +git log --format=%ai%n%ci | sed -e "s/ /T/; s/ //; s/..\$/:&/"
>> >expected &&
>> +git log --format=%aI%n%cI >actual &&
>> +
If a pack contains duplicates of an object, and if that
object has any deltas pointing at it with REF_DELTA, we will
try to resolve the deltas twice. While unusual, this is not
strictly an error, but we currently die() with an unhelpful
message. We should instead silently ignore the delta and
move
When we are resolving deltas in an indexed pack, we do it by
first selecting a potential base (either one stored in full
in the pack, or one created by resolving another delta), and
then resolving any deltas that use that base. When we
resolve a particular delta, we flip its "real_type" field
from
Scott Schmit writes:
> +00:30 because zero can't be negative in two's complement arithmetic.
Yet to meet negative zero yet myself ;-)
> The "-30 / 100 = 0" part didn't click for some reason. Sorry for the
> noise.
That's OK. You are not the only one who didn't get this right the
first time.
On Thu, Aug 28, 2014 at 04:14:01PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Thu, Aug 28, 2014 at 06:08:21PM -0400, Jeff King wrote:
> >
> >> Interesting. I couldn't convince Helgrind to catch such a case...
> >
> > Ugh. It helps if you actually helgrind the git binary, and not t
There has been concern that Git's "ISO" date format does not really
conform to the ISO-8601 standard. Thus, it cannot be parsed by ISO-8601
compliant parsers, e.g. those of XML toolchains.
The --date=iso format Git uses deviates from ISO-8601 in these ways:
- a space instead of the "T" date/time
Jeff King writes:
> On Fri, Aug 29, 2014 at 04:18:00PM -0400, David Turner wrote:
>
>> > Even if git does not die, whenever it says broken link, missing
>> > object, or object corrupt, we set errors_found and that variable
>> > affects the exit status of fsck. What does "some errors" exactly
>>
On Fri, Aug 29, 2014 at 04:18:00PM -0400, David Turner wrote:
> > Even if git does not die, whenever it says broken link, missing
> > object, or object corrupt, we set errors_found and that variable
> > affects the exit status of fsck. What does "some errors" exactly
> > mean in the original repo
On Fri, Aug 29, 2014 at 11:41:39AM -0700, Junio C Hamano wrote:
> You feed tz/100 to "%+03d:" (the "sign and hour" part of the
> timezone). What if tz is -30, i.e. less than an hour but still a
> negative offset? tz/100 would be zero and tz % 100 would be -30.
>
> tz = -30;
> printf("%+0
On Fri, 2014-08-29 at 12:21 -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote:
> >
> >> It looks like git fsck exits with 0 status even if there are some
> >> errors. The only case where there's a non-zero exit code is if
> >> veri
On 08/29/2014 09:07 PM, Junio C Hamano wrote:
> Jonas 'Sortie' Termansen writes:
> That is easy to fix, isn't it?
>
> Where you said "If you have timer_settimer(), set this makefile
> variable", you start the sentence with "If you have a working
> timer_settimer()" instead.
That's mostly right.
Junio C Hamano writes:
> I've queued with this fix squashed in.
>
> diff --git a/builtin/blame.c b/builtin/blame.c
> index 17d30d0..f9e6481 100644
> --- a/builtin/blame.c
> +++ b/builtin/blame.c
> @@ -2580,6 +2580,9 @@ parse_done:
> case DATE_RFC2822:
> blame_date_width = size
Jeff King writes:
> On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote:
>
>> It looks like git fsck exits with 0 status even if there are some
>> errors. The only case where there's a non-zero exit code is if
>> verify_pack reports errors -- but not e.g. fsck_object_dir.
>
> It will als
Jonas 'Sortie' Termansen writes:
> Jake's modified patch set breaks the case where timer_settimer exists and
> is broken. As far as I know, that's only OpenBSD among the noticeable free
> software world, but could be more systems, perhaps in the future.
That is easy to fix, isn't it?
Where you
I've queued with this fix squashed in.
diff --git a/builtin/blame.c b/builtin/blame.c
index 17d30d0..f9e6481 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2580,6 +2580,9 @@ parse_done:
case DATE_RFC2822:
blame_date_width = sizeof("Thu, 19 Oct 2006 16:00:04 -0700");
Beat Bolli writes:
> Subject: Re: [PATCH v2] pretty: Provide a strict ISO8601 date format
"pretty: add --date=iso-strict, a strict ISO-8601 date format"
> The differences between the two formats are the following:
"The --date=iso format Git uses deviates from ISO-8601 in these
ways" may make i
Hi,
Thanks for the interest. :)
There's a whole lot of emails being sent. I'll make a nice V2 shortly that
takes your feedback into consideration. :)
But first let's discuss. I think we should define the intended criteria.
I expect to find these systems out there:
* No setitimer and no timer_s
> From: Jeff King
> That makes sense, though I question whether packs are really helping you
> in the first place. I wonder if you would be better off keep your
> non-delta binaries as loose objects (this would require a new option to
> pack-objects and teaching "gc --auto" to ignore these when c
On Wed, Aug 27, 2014 at 06:10:12PM -0400, David Turner wrote:
> It looks like git fsck exits with 0 status even if there are some
> errors. The only case where there's a non-zero exit code is if
> verify_pack reports errors -- but not e.g. fsck_object_dir.
It will also bail non-zero with _certain
On Fri, Aug 29, 2014 at 11:38:00AM -0400, Dale R. Worley wrote:
> > From: Jeff King
>
> > why are you setting the packsize limit to 99m in the first place?
>
> I want to copy the Git repository to box.com as a backup measure, and
> my account on box.com limits files to 100 MB.
That makes sense
On Fri, Aug 29, 2014 at 05:36:21PM +0100, Ramsay Jones wrote:
> On 32-bit platforms (only), gcc and sparse both issue warnings
> about the type of the pointer expression passed as the third
> argument to find_commit_header(). In order to suppress the
> warnings, we simply change the type of the '
Scott Schmit writes:
> On Thu, Aug 28, 2014 at 03:53:13PM -0700, Junio C Hamano wrote:
>> Beat Bolli writes:
>> > + else if (mode == DATE_ISO8601_STRICT)
>> > + strbuf_addf(&timebuf, "%04d-%02d-%02dT%02d:%02d:%02d%+03d:%02d",
>> > + tm->tm_year + 1900,
>> > +
For the record, this commit doesn't contain my errata for OS X:
ifeq ($(uname_S),Darwin)
...
HAVE_DEV_TTY = YesPlease
+ NO_TIMER_T = UnfortunatelyYes
COMPAT_OBJS += compat/precompose_utf8.o
...
endif
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bod
Jacob Keller writes:
> diff --git a/builtin/log.c b/builtin/log.c
> index 4389722b4b1e..a39e82d67eb3 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> ...
> @@ -271,9 +271,12 @@ static void log_show_early(struct rev_info *revs, struct
> commit_list *list)
>* trigger every second even
On Fri, 2014-08-29 at 11:02 -0700, Junio C Hamano wrote:
> Jacob Keller writes:
>
> > From: Jonas 'Sortie' Termansen
> >
> > setitimer() is an obsolescent XSI interface and may be removed in a
> > future standard. Applications should use the core POSIX timer_settime()
> > instead.
> >
> > It's i
Jacob Keller writes:
> From: Jonas 'Sortie' Termansen
>
> setitimer() is an obsolescent XSI interface and may be removed in a
> future standard. Applications should use the core POSIX timer_settime()
> instead.
>
> It's important that code doesn't simply check if timer_settime is
> available as
On Thu, Aug 28, 2014 at 03:53:13PM -0700, Junio C Hamano wrote:
> Beat Bolli writes:
> > + else if (mode == DATE_ISO8601_STRICT)
> > + strbuf_addf(&timebuf, "%04d-%02d-%02dT%02d:%02d:%02d%+03d:%02d",
> > + tm->tm_year + 1900,
> > + tm-
On Fri, 2014-08-29 at 19:26 +0200, Johannes Sixt wrote:
> Am 29.08.2014 18:42, schrieb Jacob Keller:
> > From: Jonas 'Sortie' Termansen
> >
> > This function will be used in a following commit.
> >
> > The timer_settime function is provided in librt on some systems. We
> > already use this libra
Am 29.08.2014 18:42, schrieb Jacob Keller:
> From: Jonas 'Sortie' Termansen
>
> This function will be used in a following commit.
>
> The timer_settime function is provided in librt on some systems. We
> already use this library sometimes to get clock_gettime, so rework the
> logic so we don't l
Thanks.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Thanks, both.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
There has been concern that Git's "ISO" date format does not really
conform to the ISO 8601 standard. Thus, it cannot be parsed by
ISO 8601 compliant parsers, e.g. those of XML toolchains.
The differences between the two formats are the following:
- a space instead of the `T` date/time delimiter
On Fri, 2014-08-29 at 09:42 -0700, Jacob Keller wrote:
> From: Jonas 'Sortie' Termansen
>
> This hasn't been a problem in practice as almost all systems have the
> setitimer() API (or it is provided by git in the case of mingw). This code
> wasn't used in any default circumstances, as the build s
From: Jonas 'Sortie' Termansen
This function will be used in a following commit.
The timer_settime function is provided in librt on some systems. We
already use this library sometimes to get clock_gettime, so rework the
logic so we don't link with it twice.
This function was not previously used
From: Jonas 'Sortie' Termansen
This hasn't been a problem in practice as almost all systems have the
setitimer() API (or it is provided by git in the case of mingw). This code
wasn't used in any default circumstances, as the build system never sets
NO_STRUCT_ITIMERVAL - this breakage only occured
From: Jonas 'Sortie' Termansen
This type will be used in a following commit.
This type was not previously used by git. This can cause trouble for
people on systems without struct timespec if they only rely on
config.mak.uname. They will need to set NO_STRUCT_TIMESPEC manually.
Signed-off-by: Jo
From: Jonas 'Sortie' Termansen
The makefile has provisions for this case, so let's detect it in
the configure script as well.
Signed-off-by: Jonas 'Sortie' Termansen
Signed-off-by: Jacob Keller
---
configure.ac | 8
1 file changed, 8 insertions(+)
diff --git a/configure.ac b/configu
From: Jonas 'Sortie' Termansen
The makefile has provisions for this case, so let's detect it in the
configure script as well.
Signed-off-by: Jonas 'Sortie' Termansen
---
configure.ac | 6 ++
1 file changed, 6 insertions(+)
diff --git a/configure.ac b/configure.ac
index 652bfdddb2a9..6af96
From: Jonas 'Sortie' Termansen
This type will be used in a following commit.
This type was not previously used by git. This can cause trouble for
people on systems without timer_t if they only rely on config.mak.uname.
They will need to set NO_TIMER_T manually.
Signed-off-by: Jonas 'Sortie' Ter
From: Jonas 'Sortie' Termansen
This type will be used in a following commit.
This type was not previously used by git. This can cause trouble for
people on systems without struct itimerspec if they only rely on
config.mak.uname. They will need to set NO_STRUCT_ITIMERSPEC manually.
Signed-off-by
From: Jonas 'Sortie' Termansen
This type will be used in a following commit.
This type was not previously used by git. This can cause trouble for
people on systems without struct sigevent if they only rely on
config.mak.uname. They will need to set NO_STRUCT_SIGEVENT manually.
Signed-off-by: Jo
From: Jonas 'Sortie' Termansen
setitimer() is an obsolescent XSI interface and may be removed in a
future standard. Applications should use the core POSIX timer_settime()
instead.
It's important that code doesn't simply check if timer_settime is
available as it can give false positives. Some sys
On 32-bit platforms (only), gcc and sparse both issue warnings
about the type of the pointer expression passed as the third
argument to find_commit_header(). In order to suppress the
warnings, we simply change the type of the 'len' variable to
size_t.
Signed-off-by: Ramsay Jones
---
Hi Jeff,
On Thu, 2014-08-28 at 12:43 -0700, Junio C Hamano wrote:
> Jonas 'Sortie' Termansen writes:
>
> > setitimer() is an obsolescent XSI interface and may be removed in a
> > future standard. Applications should use the core POSIX timer_settime()
> > instead.
> >
> > This patch cleans up the progress
> Don't you mean it implies NO_TIMER_SETTIME?
>
> It seems to me that these were all added for TIMER_SETTIME, and not
> NO_SETTIMER? Or am I just thoroughly confused?
Thanks, that's a mistake. I copy-pasted the wrong line. :P
All of those additions should just be:
# This also implies NO_TIMER_SE
> From: Junio C Hamano
> But if your definition of the boundary between "small" and "large"
> is unreasonably low (and/or your definition of "too many" is
> unreasonably small), you will always have the problem you found.
I would propose that a pack whose size is "close enough" to
packSizeLimit
> From: Jeff King
> why are you setting the packsize limit to 99m in the first place?
I want to copy the Git repository to box.com as a backup measure, and
my account on box.com limits files to 100 MB.
> There are more delta opportunities
In this repository, only the smallest files are text fi
On Thu, 2014-08-28 at 03:04 +0200, Jonas 'Sortie' Termansen wrote:
> This function will be used in a following commit.
>
> The timer_settime function is provided in librt on some systems. We
> already use this library sometimes to get clock_gettime, so rework the
> logic so we don't link with it t
On 14-08-28 03:35 PM, Heiko Voigt wrote:
> On Thu, Aug 28, 2014 at 01:44:18PM -0400, Marc Branchaud wrote:
>> Heiko also said this:
>>> On Fri, Aug 22, 2014 at 12:00:07PM -0400, Marc Branchaud wrote:
With relative-path submodules, the push's target repo *must* also have the
submodules in
Branch tree is NULLified by filedelete command if we are trying
to delete root tree. Add sanity check and use load_tree() in that case.
Signed-off-by: Maxim Bublis
---
fast-import.c | 6 +-
t/t9300-fast-import.sh | 4 ++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git
Removing root tree with filedelete command would lead to segmentation fault
in store_tree(). First patch from patch series adds filedelete command
tests with test case to show incorrect behaviour on filedelete root operation.
Second one fixes bug by sanity check and load_tree() usage.
Maxim Bublis
Add new fast-import test series for filedelete command.
Signed-off-by: Maxim Bublis
---
t/t9300-fast-import.sh | 104 +
1 file changed, 104 insertions(+)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 5fc9ef2..9cf5e45 100755
--
On 29 авг. 2014 г., at 3:16, Junio C Hamano wrote:
> Missing ‘;'
Thanks, I’ll fix it. What a stupid mistype, I was writing some amount of Go
code recently and it doesn’t use semicolons.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger
On 29 авг. 2014 г., at 2:30, Junio C Hamano wrote:
> You may have been concentrating on the "delete root" case, but as
> long as you claim "We add a series to test filedelete command", it
> would be sensible to test more typical cases of deleting files, not
> the entire tree as well, no? Perhaps
Hi Junio,
Please pull the following l10n updates to the maint branch.
The following changes since commit 869951babc24fef5c5cd58f86baefc25b6ed3765:
l10n: de.po: improve message when switching branches (2014-08-23
19:17:38 +0200)
are available in the git repository at:
git://github.com/git-l
Signed-off-by: Jaime Soriano Pastor
---
read-cache.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 5d3c8bd..023d6d7 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1465,6 +1465,21 @@ static struct cache_entry *create_from_disk(struct
o
70 matches
Mail list logo
