Sometimes users want to report a bug they experience on
their repository, but they are not at liberty to share the
contents of the repository. It would be useful if they could
produce a repository that has a similar shape to its history
and tree, but without leaking any information. This
Using the original filename suffix for the temporary input files to
the merge tool confuses IDEs like Eclipse. This patch introduces
a configurtion option, mergetool.tmpsuffix, which get appended to
the temporary file name. That way the user can choose to use a
suffix like .tmp, which does not
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote:
* br/http-init-fix (2014-08-18) 2 commits
- http: style fixes for curl_multi_init error check
- http.c: die if curl_*_init fails
Needs S-o-b from peff for the topmost one.
What you have queued looks good. Please add in:
On Sun, Aug 10, 2014 at 03:48:24PM -0400, Jeff King wrote:
On Fri, Aug 08, 2014 at 02:58:26PM -0700, Jonathan Nieder wrote:
Maybe it's worth switching to plain
LIB_H += $(wildcard *.h)
? People using ancient compilers that never change headers wouldn't
be hurt, people using
My name is Lee Wong,
I am contacting you beacuse a client I work for who pass away over 8 months ago
did not make
a will.
I believe you may be the heir to their unclaimed estate, please send your full
name so we can proceed
with this matter urgently and I can provided further details.
Thank
Most modern platforms will use automatically computed header
dependencies to figure out when a C file needs to be rebuilt
due to a header changing. With old compilers, however, we
fall back to a static list of header files. If any of them
changes, we recompile everything. This is overly
This code was useful when we kept a static list of header
files, and it was easy to forget to update it. Since the last
commit, we generate the list dynamically.
Technically this could still be used to find a dependency
that our dynamic check misses (e.g., a header file without a
.h extension).
Hi all,
I tried to move a repository from SVN to Git, but all my tries - on three
different machines running Windows 7 with the latest patches - failed with the
same reason. I am running the latest version of Git for Windows
1.9.4-preview-20140815. One of my first steps was to clone the
Am 21.08.2014 um 11:53 schrieb Reiner Nothdurft:
Hi all,
I tried to move a repository from SVN to Git, but all my tries - on three
different machines running Windows 7 with the latest patches - failed with the
same reason. I am running the latest version of Git for Windows
Hi guys,
I wanted post you patch here for this bug, but I can't find primary
source of this problem [0], because I don't understand some ideas in the
code. So what I investigate:
Bug is reprodusible since git version 1.8.3.1 (may earlier 1.8.xx, but I
don't test it) to actual upstream
Pushing a large number of refs works over most transports,
because we implement send-pack as an internal function.
However, it can sometimes fail when pushing over http,
because we have to spawn git send-pack --stateless-rpc to
do the heavy lifting, and we pass each refspec on the
command line.
On Thu, Aug 21, 2014 at 08:17:10AM -0400, Jeff King wrote:
Documentation/git-send-pack.txt | 13 -
builtin/send-pack.c | 27 +++
remote-curl.c | 8 +++-
t/t5541-http-push-smart.sh | 15 +++
4 files
On Wed, Aug 20, 2014 at 08:18:12AM -0500, Robert Dailey wrote:
On Tue, Aug 19, 2014 at 3:57 PM, Heiko Voigt hvo...@hvoigt.net wrote:
I would actually error out when specified in already cloned state.
Because otherwise the user might expect the remote to be updated.
Since we are currently
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote:
* hv/submodule-config (2014-06-30) 4 commits
(merged to 'next' on 2014-07-17 at 5e0ce45)
+ do not die on error of parsing fetchrecursesubmodules option
+ use new config API for worktree configurations of submodules
+ extract
Good points.
On Thu, Aug 21, 2014 at 12:19 AM, Junio C Hamano gits...@pobox.com wrote:
After looking at what you did in 1/4, I started to wonder if we can
solve this in add_index_entry_with_check() in a less intrusive way.
When we call the function with a stage #0 entry, we are telling the
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com
---
read-cache.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 7f5645e..e117d3a 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1438,6 +1438,21 @@ static struct cache_entry
On Thu, Aug 21, 2014 at 3:43 PM, Jaime Soriano Pastor
jsorianopas...@gmail.com wrote:
+ if (!ce_stage(ce))
+ die(Multiple stage entries for merged file '%s',
+ ce-name);
This case can be provoked by git update-index --index-info
On Wed, Aug 20, 2014 at 11:00 PM, Junio C Hamano gits...@pobox.com wrote:
Jaime Soriano Pastor jsorianopas...@gmail.com writes:
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com
---
t/t9904-unmerged-file-with-merged-entry.sh | 86
++
Isn't this
On Wed, Aug 20, 2014 at 11:08 PM, Junio C Hamano gits...@pobox.com wrote:
Jaime Soriano Pastor jsorianopas...@gmail.com writes:
Subject: Re: [PATCH 4/4] git update-index --cacheinfo can be used to select
a stage when there are merged and unmerged entries
Hmph, what does it even mean?
On Thu, Aug 21, 2014 at 8:43 PM, Jaime Soriano Pastor
jsorianopas...@gmail.com wrote:
@@ -1499,6 +1514,9 @@ int read_index_from(struct index_state *istate, const
char *path)
ce = create_from_disk(disk_ce, consumed, previous_name);
set_index_entry(istate, i,
On 14-08-20 11:39 PM, Christian Couder wrote:
On Thu, Aug 21, 2014 at 12:05 AM, Marc Branchaud marcn...@xiplink.com wrote:
On 14-08-16 12:06 PM, Christian Couder wrote:
+
+* after them it's only possible to have some lines that contain only
+ spaces, and then a patch; the patch part is
Hi,
Jeff King wrote:
However, we do always define $(LIB_H) as a dependency of
po/git.pot. Even though we do not actually try to build that
target, make will still evaluate the dependencies when
reading the Makefile, and expand the variable. This is not
ideal
Would the following work? The
Hi,
use case: I am packaging the FOO program for Debian. FOO is maintained in
git but it has a bunch of problems (e.g. because somebody mistakenly checked
in a huge blob which would give the ).
The current workflow for this is to create a new branch, remove the
offending bits if necessary,
It is only the path that matters in the decision whether to filter or
not. Clarify this by making path the single argument of
would_convert_to_git().
Signed-off-by: Steffen Prohaska proha...@zib.de
---
convert.h | 5 ++---
sha1_file.c | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
Similar to testing expectations about malloc with GIT_ALLOC_LIMIT (see
commit d41489), it can be useful to test expectations about mmap.
This introduces a new environment variable GIT_MMAP_LIMIT to limit the
largest allowed mmap length (in KB). xmmap() is modified to check the
limit. Together
The data is streamed to the filter process anyway. Better avoid mapping
the file if possible. This is especially useful if a clean filter
reduces the size, for example if it computes a sha1 for binary data,
like git media. The file size that the previous implementation could
handle was limited
I revised the testing approach as discussed. Patch 2/3 adds GIT_MMAP_LIMIT,
which allows testing of memory expectations together with GIT_ALLOC_LIMIT.
The rest is unchanged compared to v2.
Steffen Prohaska (3):
convert: Refactor would_convert_to_git() to single arg 'path'
Introduce
Heiko Voigt hvo...@hvoigt.net writes:
On Wed, Aug 20, 2014 at 04:17:33PM -0700, Junio C Hamano wrote:
* hv/submodule-config (2014-06-30) 4 commits
(merged to 'next' on 2014-07-17 at 5e0ce45)
+ do not die on error of parsing fetchrecursesubmodules option
+ use new config API for worktree
On Fri, 2014-08-01 at 09:56 -0700, Mike Stump wrote:
Since everything I do goes up and down into repositories and I don’t want my
friends and family to scorn me, rebase isn’t the command I want to use.
You completely mis-understand what published means. Published history
is history from which
On Thu, 2014-08-21 at 17:36 +, Keller, Jacob E wrote:
On Fri, 2014-08-01 at 09:56 -0700, Mike Stump wrote:
Since everything I do goes up and down into repositories and I don’t want
my friends and family to scorn me, rebase isn’t the command I want to use.
You completely mis-understand
snip
Bug is reprodusible since git version 1.8.3.1 (may earlier 1.8.xx, but
I don't test it) to actual upstream version.
This problem doesn't exists in version 1.7.xx - or more precisely is
not reproducible. May this is reproducible
since commit 7218a215 - in this commit was added assert in
Similar to 16445242 (fetch-pack: avoid quadratic list insertion in
mark_complete), sort only after all refs are collected instead of while
inserting. The result is the same, but it's more efficient that way.
The difference will only be measurable in repositories with a large
number of refs.
Similar to 16445242 (fetch-pack: avoid quadratic list insertion in
mark_complete), sort only after all refs are collected instead of while
inserting. The result is the same, but it's more efficient that way.
The difference will only be measurable in repositories with a large
number of refs.
Am 21.08.2014 00:19, schrieb Junio C Hamano:
For that, we need to catch an index whose entries are not sorted and
error out, perhaps when read_index_from() iterates over the mmapped
index entries. We can even draw that hopelessly corrupt line
above the breakage you are addressing and add a
Jaime Soriano Pastor jsorianopas...@gmail.com writes:
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com
---
read-cache.c | 18 ++
1 file changed, 18 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 7f5645e..e117d3a 100644
--- a/read-cache.c
+++
Hi,
today I wrote a port-merge hook. Then I just detected that it only gets
executed when the merge is immediately successful. In case there is a
conflict, I have to finish the merge using the command git commit.
This will not call the post-merge hook.
I think the hook should be reliable to be
Hi,
Bertram Scharpf wrote:
today I wrote a port-merge hook. Then I just detected that it only gets
executed when the merge is immediately successful. In case there is a
conflict, I have to finish the merge using the command git commit.
This will not call the post-merge hook.
I think the
On Tue, Aug 19, 2014 at 3:06 PM, Junio C Hamano gits...@pobox.com wrote:
+ push-cert = PKT-LINE(push-cert NUL capability-list LF)
Haha. NUL. I love our wire protocol.
+ PKT-LINE(certificate version 0.1 LF)
+ PKT-LINE(pusher ident LF)
+
On Wed, Aug 20, 2014 at 11:34 AM, Michael Haggerty mhag...@alum.mit.edu wrote:
On 08/20/2014 06:28 PM, Ronnie Sahlberg wrote:
On Wed, Aug 20, 2014 at 7:52 AM, Michael Haggerty mhag...@alum.mit.edu
wrote:
I'm a little worried that abandoning *all* refname checks could open us
up to somehow
Robin Rosenberg robin.rosenb...@dewire.com writes:
Using the original filename suffix for the temporary input files to
the merge tool confuses IDEs like Eclipse. This patch introduces
a configurtion option, mergetool.tmpsuffix, which get appended to
the temporary file name. That way the user
Thomas Braun thomas.br...@virtuell-zuhause.de writes:
Signed-off-by: Thomas Braun thomas.br...@virtuell-zuhause.de
---
Today I found out that both %cd and %ad pretty print format
specifications honour the --date option as shown in:
$ git log --abbrev=8 --date=short --pretty=%h (%s, %cd)
Jeff King p...@peff.net writes:
+/*
+ * We anonymize each component of a path individually,
+ * so that paths a/b and a/c will share a common root.
+ * The paths are cached via anonymize_mem so that repeated
+ * lookups for a will yield the same value.
+ */
+static void
Jeff King p...@peff.net writes:
+--anonymize::
+ Replace all paths, blob contents, commit and tag messages,
+ names, and email addresses in the output with anonymized data,
+ while still retaining the shape of history and of the stored
+ tree.
Sometimes branch names can
Congratulations!!!Your email address has won $500,000 in
Coca-Cola/Fifa Promotion. Ticket No: 7PW1124. Contact us on e-Mail:
coke.f...@outlook.com for your claim
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Johannes Sixt j...@kdbg.org writes:
Am 21.08.2014 00:19, schrieb Junio C Hamano:
For that, we need to catch an index whose entries are not sorted and
error out, perhaps when read_index_from() iterates over the mmapped
index entries. We can even draw that hopelessly corrupt line
above the
Jaime Soriano Pastor jsorianopas...@gmail.com writes:
On Wed, Aug 20, 2014 at 11:00 PM, Junio C Hamano gits...@pobox.com wrote:
Jaime Soriano Pastor jsorianopas...@gmail.com writes:
Signed-off-by: Jaime Soriano Pastor jsorianopas...@gmail.com
---
t/t9904-unmerged-file-with-merged-entry.sh
Steffen Prohaska proha...@zib.de writes:
Similar to testing expectations about malloc with GIT_ALLOC_LIMIT (see
commit d41489), it can be useful to test expectations about mmap.
This introduces a new environment variable GIT_MMAP_LIMIT to limit the
largest allowed mmap length (in KB).
On Thu, Aug 21, 2014 at 01:15:10PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
+/*
+ * We anonymize each component of a path individually,
+ * so that paths a/b and a/c will share a common root.
+ * The paths are cached via anonymize_mem so that repeated
+ * lookups
On Thu, Aug 21, 2014 at 02:57:22PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
+--anonymize::
+ Replace all paths, blob contents, commit and tag messages,
+ names, and email addresses in the output with anonymized data,
+ while still retaining the shape of
On Thu, Aug 21, 2014 at 06:49:10PM -0400, Jeff King wrote:
The few things I don't anonymize are:
1. ref prefixes. We see the same distribution of refs/heads vs
refs/tags, etc.
2. refs/heads/master is left untouched, for convenience (and because
it's not really a secret).
Shawn Pearce spea...@spearce.org writes:
On Tue, Aug 19, 2014 at 3:06 PM, Junio C Hamano gits...@pobox.com wrote:
+ push-cert = PKT-LINE(push-cert NUL capability-list LF)
Haha. NUL. I love our wire protocol.
+ PKT-LINE(certificate version 0.1 LF)
+
On Wed, 2014-08-20 at 12:38 -0700, Junio C Hamano wrote:
David Turner dtur...@twopensource.com writes:
On Wed, 2014-08-20 at 10:29 -0700, Junio C Hamano wrote:
On Wed, Aug 20, 2014 at 9:56 AM, David Turner dtur...@twopensource.com
wrote:
On Tue, 2014-08-19 at 15:06 -0700, Junio C
If you ignore the clock skew between the pusher and the receiver, then
you are correct,
but otherwise not quite. Also by specifying that as nonce, not
server-timestamp,
the receiving end has a choice in how to generate and use the nonce
value. The only
requirement on the protocol is that the
On Tue, 2014-08-19 at 15:06 -0700, Junio C Hamano wrote:
+If the receiving end does not support push-cert, the sending end MUST
+NOT send a push-cert command.
+
+When a push-cert command is sent, command-list MUST NOT be sent; the
+commands recorded in the push certificate is used instead.
On Aug 21, 2014, at 16:40, Junio C Hamano wrote:
* The receiving end will issue push-cert=nonce in its initial
capability advertisement, and this nonce will be given on the
PUSH_CERT_NONCE environment to the pre/post-receive hooks, to
allow the nonce nonce header in the signed certificate
I maintain multiple copies of the same repo because I keep each one checked
out to different branch/rev levels. It would be nice if, similar to clone
--reference, we could also use git fetch --reference to reference a local repo
when doing a fetch to pull in updates.
--
-- Howard Chu
CTO,
On Thu, Aug 21, 2014 at 08:30:24PM +0200, René Scharfe wrote:
Similar to 16445242 (fetch-pack: avoid quadratic list insertion in
mark_complete), sort only after all refs are collected instead of while
inserting. The result is the same, but it's more efficient that way.
The difference will
On Thu, Aug 21, 2014 at 08:30:29PM +0200, René Scharfe wrote:
Similar to 16445242 (fetch-pack: avoid quadratic list insertion in
mark_complete), sort only after all refs are collected instead of while
inserting. The result is the same, but it's more efficient that way.
The difference will
On Thu, Aug 21, 2014 at 07:48:18AM -0700, Jonathan Nieder wrote:
Subject: i18n: treat make pot as an explicitly-invoked target
po/git.pot is normally used as-is and not regenerated by people
building git, so it is okay if an explicit make po/git.pot always
automatically regenerates it.
On Thu, Aug 21, 2014 at 12:28 PM, Shawn Pearce spea...@spearce.org wrote:
On Tue, Aug 19, 2014 at 3:06 PM, Junio C Hamano gits...@pobox.com wrote:
+ push-cert = PKT-LINE(push-cert NUL capability-list LF)
Haha. NUL. I love our wire protocol.
It is a direct and natural consequence of
On Fri, Aug 22, 2014 at 12:12:36AM -0400, Jeff King wrote:
po/git.pot is normally used as-is and not regenerated by people
building git, so it is okay if an explicit make po/git.pot always
automatically regenerates it. Depend on the magic FORCE target
instead of explicitly keeping track
From: Jonathan Nieder jrnie...@gmail.com
po/git.pot is normally used as-is and not regenerated by people
building git, so it is okay if an explicit make po/git.pot always
automatically regenerates it. Depend on the magic FORCE target
instead of explicitly keeping track of dependencies.
This
Most modern platforms will use automatically computed header
dependencies to figure out when a C file needs rebuilt due
to a header changing. With old compilers, however, we
fallback to a static list of header files. If any of them
changes, we recompile everything. This is overly
conservative, but
This code was useful when we kept a static list of header
files, and it was easy to forget to update it. Since the last
commit, we generate the list dynamically.
Technically this could still be used to find a dependency
that our dynamic check misses (e.g., a header file without a
.h extension).
Jeff King wrote:
On Thu, Aug 21, 2014 at 07:57:47PM -0700, Howard Chu wrote:
I maintain multiple copies of the same repo because I keep each one checked
out to different branch/rev levels. It would be nice if, similar to clone
--reference, we could also use git fetch --reference to reference a
On Sun, Aug 17, 2014 at 8:14 PM, Eric Wong normalper...@yhbt.net wrote:
But unicorn would ignore SIGPIPE it if Ruby did not; relying on SIGPIPE
while doing any multiplexed I/O doesn't work well.
Exactly. Callers block SIGPIPE for their own legitimate reasons, but they
don't consistently
66 matches
Mail list logo
