On Sun, Jul 10, 2016 at 10:06:12AM -0700, Shawn Pearce wrote:
> On Fri, Jul 8, 2016 at 5:31 PM, Stefan Beller wrote:
> > +
> > + /* NEEDSWORK: expose the limitations to be configurable. */
> > + int max_options = 32;
> > +
> > + /*
> > +* NEEDSWORK:
On Mon, Jul 11, 2016 at 06:59:51PM -0700, Junio C Hamano wrote:
> > diff --git a/help.c b/help.c
> > index 19328ea..0cea240 100644
> > --- a/help.c
> > +++ b/help.c
> > @@ -419,6 +419,13 @@ int cmd_version(int argc, const char **argv, const
> > char *prefix)
> > * with external projects
How do things look at this point? This version is what I ended up
queuing in 'pu', but I took your "Thanks" in $gmane/299120 to only
mean "Thanks for feeding some ideas to help me move forward", not
necessarily "Tnanks that looks like the right approach." yet, so
right now both topics are
[Cc'd Tim, who originally authored the dir-diff code]
On Tue, Jul 05, 2016 at 08:52:52PM +0100, John Keeping wrote:
> On Mon, Jul 04, 2016 at 08:37:39PM +0200, Bernhard Kirchen wrote:
> > Today I started using --dir-diff and noticed a problem when specifying a
> > non-full path limiter. My diff
Jeff King writes:
> Maybe this on top of the other documentation patches?
>
> -- >8 --
> Subject: [PATCH] doc/pretty-formats: explain shortening of %gd
>
> The actual shortening rules aren't that interesting and
> probably not worth getting into (I gloss over them here as
>
Jeff King writes:
> On Mon, Jul 11, 2016 at 11:35:05PM +0200, Andreas Schwab wrote:
>
>> Junio C Hamano writes:
>>
>> > local_tzoffset: detect errors from tm_to_time_t
>>
>> not ok 19 - show date (iso:5758122296 -0400)
>> #
>> #
On Tue, Jul 12, 2016 at 12:56:11AM +, Eric Wong wrote:
> Jeff King wrote:
> > Otherwise, we'll have to skip the test, perhaps with something like the
> > patch below. I suspect the problem is actually the size of "unsigned
> > long", not time_t, as we use that internally for a
$ git clone https://github.com/gitster/git tmpgit2 -v -v -v
Cloning into 'tmpgit2'...
Server supports multi_ack_detailed
Server supports no-done
Server supports side-band-64k
Server supports ofs-delta
Server version is
Jeff King wrote:
> Otherwise, we'll have to skip the test, perhaps with something like the
> patch below. I suspect the problem is actually the size of "unsigned
> long", not time_t, as we use that internally for a bunch of time
> computation.
We should probably be using int64_t
On 07/11/2016 07:54 PM, Jeff King wrote:
Yes, that's somewhat the point of the test.
How does it fail for you (what does it look like with "-v")? We may be
able to check for an outcome that matches both cases.
On Ubuntu i386 and Ubuntu armhf, I get the following verbose output from
On Mon, Jul 11, 2016 at 12:50:00PM -0400, Theodore Ts'o wrote:
> On Mon, Jul 11, 2016 at 01:06:17AM -0400, Jeff King wrote:
> >
> > The documentation claims that "raw-local" does not work. It
> > does, but the end result is rather subtle. Let's describe it
> > in better detail, and test to make
On Mon, Jul 11, 2016 at 12:48:34PM -0400, Theodore Ts'o wrote:
> On Mon, Jul 11, 2016 at 01:05:13AM -0400, Jeff King wrote:
> > The "reflog selector" format changes based on a series of
> > heuristics, and that applies equally to both stock "log -g"
> > output, as well as "--format=%gd". The
On Mon, Jul 11, 2016 at 11:35:05PM +0200, Andreas Schwab wrote:
> Junio C Hamano writes:
>
> > local_tzoffset: detect errors from tm_to_time_t
>
> not ok 19 - show date (iso:5758122296 -0400)
> #
> # echo "$time -> $expect" >expect &&
> #
This makes git checkout, git reset, etc use smudgeToFile.
Includes test cases.
(There's a call to convert_to_working_tree in merge-recursive.c
that could also be made to use smudgeToFile as well.)
Signed-off-by: Joey Hess
---
entry.c | 40
Back from vacation with a reroll of jh/clean-smudge-annex.
Deals with conflicting changes from cc/apply-am in pu.
Since tb/convert-peek-in-index is not currently in pu, this reroll isn't
based on it, and will conflict if that topic gets added back into pu.
Not sure what the status of
This adds new smudgeToFile and cleanFromFile filter commands,
which are similar to smudge and clean but allow direct access to files on
disk.
This interface can be much more efficient when operating on large files,
because the whole file content does not need to be streamed through the
filter. It
git am updates the work tree and so should use the smudgeToFile filter.
This includes some refactoring into convert_to_working_tree_filter_to_file
to make it check the file after running the smudgeToFile command, and clean
up from a failing command.
Signed-off-by: Joey Hess
If the smudgeToFile filter fails, it can leave the worktree file with the
wrong content, or even deleted. Recover from this by falling back to
running the smudge filter.
Signed-off-by: Joey Hess
---
entry.c | 66 ++-
It's natural to expect %f to be an actual file on disk; help avoid that
mistake.
Signed-off-by: Joey Hess
---
Documentation/gitattributes.txt | 5 +
1 file changed, 5 insertions(+)
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index
Let the user know when they have a smudgeToFile/cleanFromFile config
that cannot be used because the corresponding smudge/clean config
is missing.
The warning is only displayed a maximum of once per git invocation,
and only when doing an operation that would use the filter.
Signed-off-by: Joey
Recursive merge updates the work tree and so should use the smudgeToFile
filter.
At this point, smudgeToFile is run by everything that updates work
tree files.
Signed-off-by: Joey Hess
---
merge-recursive.c | 53 ---
Includes test cases.
Signed-off-by: Joey Hess
---
sha1_file.c | 42 --
t/t0021-conversion.sh | 36
2 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
Junio C Hamano writes:
> local_tzoffset: detect errors from tm_to_time_t
not ok 19 - show date (iso:5758122296 -0400)
#
# echo "$time -> $expect" >expect &&
# test-date show:$format "$time" >actual &&
#
For the sake of documentation, I worked on this patch but I
don't there was a measurable improvement (hard to tell with
variable network conditions) and it increased memory usage to
around 380M.
I wanted to reduce the list scanning in fill_active_slot() by
deleting during iteration, but I'm not
TL;DR: dumb HTTP clone from a certain badly-packed repo goes from
~2 hours to ~30 min memory usage drops from 2G to 360M
I hadn't packed the public repo at https://public-inbox.org/git
for a few weeks. As an admin of a small server limited memory
and CPU resources but fairly good bandwidth, I
This parameter has not been used since commit 1d389ab65dc6
("Add support for parallel HTTP transfers") back in 2005
Signed-off-by: Eric Wong
---
http-walker.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/http-walker.c b/http-walker.c
index
Using the a Linux-kernel-derived doubly-linked list
implementation from the Userspace RCU library allows us to
enqueue and delete items from the object request queue in
constant time.
This change reduces enqueue times in the prefetch() function
where object request queue could grow to several
404s are common when fetching loose objects on static HTTP
servers, and reestablishing a connection for every single
404 adds additional latency.
Signed-off-by: Eric Wong
---
http-walker.c | 9 +
http.c| 16 ++--
2 files changed, 23 insertions(+), 2
Signed-off-by: Philip Oakley
---
Found while checking the 'symmetric difference' documentation
---
Documentation/pretty-formats.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index
For the r1..r2 case, the exclusion of r1, rather than inclusion of r2,
would be the unexpected case in natural language for a simple linear
development, i.e. start..end excludes start.
Signed-off-by: Philip Oakley
---
Documentation/revisions.txt | 11 ++-
1 file
The terms Left and Right side originate from the symmetric
difference. Name them there.
---
Documentation/revisions.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 19314e3..79f6d03 100644
---
Signed-off-by: Philip Oakley
---
Documentation/gitk.txt | 2 +-
Documentation/rev-list-options.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 6ade002..6c3eb15 100644
---
Signed-off-by: Philip Oakley
---
Documentation/gitrevisions.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt
index e903eb7..33039c6 100644
--- a/Documentation/gitrevisions.txt
+++
Do not self-define `reachable`, which can lead to misunderstanding.
Instead define `reachability` explictly.
Signed-off-by: Philip Oakley
---
Documentation/revisions.txt | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git
The prior sentence has too many clauses for easy parsing.
Replace 'the latter case' with a direct quote.
Signed-off-by: Philip Oakley
---
Documentation/gitrevisions.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/gitrevisions.txt
While there, also break out the other shorthand notations and
add a title for the revision range summary (which also appears
in git-rev-parse, so keep it mixed case).
Signed-off-by: Philip Oakley
---
Documentation/revisions.txt | 23 +--
1 file changed,
This is the re-roll of the po/range-doc (2016-07-01) 3 commits and its
follow on patch.
The series has gained additional patches following the discussions
($gmane/298790).
The original first 3 patches are unchanged, though 2/8 has been inserted
to name the Left and Right ranges.
The extra four
The latest maintenance release Git v2.9.1 is now available at the
usual places. This release includes fixes to two bugs that have
been reported on the list recently, among other changes:
- v2.9.0 changed cloning of submodules in a top-level superproject
that was cloned shallowly to
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'. The ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
The first maintenance release for
Junio C Hamano writes:
> Subject: [PATCH] merge: avoid "safer crlf" during recording of merge results
> ...
> We can work this around by not refreshing the new cache entry in
> make_cache_entry() called by add_cacheinfo(). After add_cacheinfo()
> adds the new entry, we can
Pranit Bauva writes:
> Add test to explicitly check that 'git bisect reset' is working as
> expected. This is already covered implicitly by the test suite.
Without fuzzy "this is not an improvement but it helps" that sounds
like making excuse, the above reads much
Pranit Bauva writes:
> Some minor nits. Previous version can be found here[1].
>
> [1]: http://thread.gmane.org/gmane.comp.version-control.git/298263
>
> The inter-diff is :
> ...
> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
> ...
> Pranit Bauva (6):
Are You In Need Of A Legit Loan?Email Back To Apply Now
--
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
Theodore Ts'o writes:
>> I'm on the fence, so I'll let you decide how you want to proceed. I can
>> live with "%gr" and "%gt", as they are at least symmetric with their
>> author/committer counterparts.
>
> I'm on the fence myself. I can live with either, since either way the
>
Johannes Schindelin writes:
> diff --git a/xdiff/xutils.c b/xdiff/xutils.c
> index 62cb23d..027192a 100644
> --- a/xdiff/xutils.c
> +++ b/xdiff/xutils.c
> @@ -200,8 +200,10 @@ int xdl_recmatch(const char *l1, long s1, const char
> *l2, long s2, long flags)
>
Johannes Schindelin writes:
>> No, the point is, refs subsystem needs to know which refs is per-repo,
>> which is per-worktree. So far the rules are "everything under refs,
>> except a few known exceptions, is per-repo" and "everything directly
>> under $GIT_DIR is
"brian m. carlson" writes:
> On Sun, Jul 10, 2016 at 10:16:44PM +, Eric Wong wrote:
>> My Debian wheezy LTS system is still on glibc 2.13; and LTS
>> distros may use older glibc, still, so lets not unnecessarily
>> break things out-of-the-box.
>>
>> We seem to
Stefan Beller writes:
> This is not what I had in mind, but rather the pain of dealing with multi line
> environment variables.
Hmph, is that painful?
$ cmd "$VAR"
inside double quotes would do multi-line just fine, I think.
But I think it is OK (and probably
On Mon, Jul 11, 2016 at 7:22 PM, Christian Couder
wrote:
> Everytime split index is turned on, it creates a "sharedindex."
> file in the git directory. This makes sure that old sharedindex
> files are removed after a new one has been created.
Hmm it's one-way
When a "tree unpacking" operation is needed, which is part of
switching branches using "git checkout", the following happens in a
sparse checkout:
1) Run all existing entries through $GIT_DIR/info/sparse-checkout,
mark entries that are to-be-excluded or to-be-included.
2) Do n-way merge stuff
On Mon, Jul 11, 2016 at 9:27 AM, Nils Fenner wrote:
> Hi Santiago,
>
> repeated your test here and actually found something interesting. When
> committing via 'git gui', commits are not being gpg-signed, while firing
> a 'git commit' shows the passphrase dialog and signs the
Eric Wong writes:
> The following changes since commit cf4c2cfe52be5bd973a4838f73a35d3959ce2f43:
>
> Second batch of topics for 2.10 (2016-06-27 10:07:08 -0700)
>
> are available in the git repository at:
>
> git://bogomips.org/git-svn.git master
>
> for you to fetch changes
Everytime split index is turned on, it creates a "sharedindex."
file in the git directory. This makes sure that old sharedindex
files are removed after a new one has been created.
Signed-off-by: Christian Couder
---
read-cache.c | 27
Signed-off-by: Christian Couder
---
builtin/update-index.c | 13 +++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index f06fe80..2b8aaa6 100644
--- a/builtin/update-index.c
+++
Signed-off-by: Christian Couder
---
cache.h | 1 +
config.c | 10 ++
2 files changed, 11 insertions(+)
diff --git a/cache.h b/cache.h
index f1dc289..5296a50 100644
--- a/cache.h
+++ b/cache.h
@@ -1695,6 +1695,7 @@ extern int git_config_get_bool_or_int(const
Signed-off-by: Christian Couder
---
t/t1700-split-index.sh | 37 +
1 file changed, 37 insertions(+)
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 8aef49f..f1af0d5 100755
--- a/t/t1700-split-index.sh
+++
Signed-off-by: Christian Couder
---
Documentation/git-update-index.txt | 6 ++
1 file changed, 6 insertions(+)
diff --git a/Documentation/git-update-index.txt
b/Documentation/git-update-index.txt
index c6cbed1..2293140 100644
---
Signed-off-by: Christian Couder
---
Documentation/config.txt | 4
1 file changed, 4 insertions(+)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index e208af1..aec8ecb 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -324,6
This will make us use the split-index feature or not depending
on the value of the core.splitIndex config variable.
Signed-off-by: Christian Couder
---
read-cache.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index
Goal
We want to make it possible to use the split-index feature
automatically by just setting a new "core.splitIndex" configuration
variable to true.
This can be valuable as split-index can help significantly speed up
`git rebase` especially along with the current work to libify `git
Also use the functions in cmd_update_index() in
builtin/update-index.c.
Signed-off-by: Christian Couder
---
builtin/update-index.c | 17 -
split-index.c | 18 ++
split-index.h | 2 ++
3 files changed, 24 insertions(+),
Johannes Schindelin writes:
> What about the am-call-merge-recursive-directly patch series? As I
> demonstrated by rebasing it to `pu`, it is actually not butchering the
> smudge/clean pathway as you suggested.
What I said was it seemed to conflict with something
Hello,
I'm using git 1.9.1 in Ubuntu 14.04.
I have a repository on github, a clone on my desktop and bare repo on a
private server, in my desktop the remotes looks like this
all g...@github.com:user/repo.git (fetch)
all g...@github.com:user/repo.git (push)
all
On Mon, Jul 11, 2016 at 06:27:57PM +0200, Nils Fenner wrote:
> Hi Santiago,
>
> repeated your test here and actually found something interesting. When
> committing via 'git gui', commits are not being gpg-signed, while firing
> a 'git commit' shows the passphrase dialog and signs the commit
On Mon, Jul 11, 2016 at 01:06:17AM -0400, Jeff King wrote:
>
> The documentation claims that "raw-local" does not work. It
> does, but the end result is rather subtle. Let's describe it
> in better detail, and test to make sure it works (namely,
> the epoch time doesn't change, but the zone
On Mon, Jul 11, 2016 at 01:05:13AM -0400, Jeff King wrote:
> The "reflog selector" format changes based on a series of
> heuristics, and that applies equally to both stock "log -g"
> output, as well as "--format=%gd". The documentation for
> "%gd" doesn't cover this. Let's mention the multiple
On Mon, Jul 11, 2016 at 01:02:02AM -0400, Jeff King wrote:
> Yeah, I'd have hoped for %gd, as well. One thing I think we should move
> towards in the long run is giving more readable names to our
> placeholders for git-log, the way for-each-ref and cat-file do (but
> keeping the existing ones for
Your Package Delivery From UPS COURIER Email Back For More Info
--
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
Hi Santiago,
repeated your test here and actually found something interesting. When
committing via 'git gui', commits are not being gpg-signed, while firing
a 'git commit' shows the passphrase dialog and signs the commit correctly.
Here's what I did:
git init gpg-signing-test && cd
On Mon, Jul 11, 2016 at 1:45 PM, Johannes Schindelin
wrote:
> We forgot to adjust this code path after moving the test helpers to
> t/helper/.
Oops. Yet it looks like the right thing to do.
>
> Signed-off-by: Johannes Schindelin
> ---
>
Hi Nils,
I just checked and I have commits made in 2.9 with this option set and I
don't seem to have your issue. Here's what I did:
santiago at ~/test-signing ✔ git init
Initialized empty Git repository in /home/santiago/test-signing/.git/
santiago at ~/test-signing ✔ hub create
Adjust t4201 to pass on Windows; a couple of test cases need to be
skipped on Windows which leads to a different shortlog than on Linux.
Let's just fix that by limiting the shortlog's commit range to traverse
only one commit: that guarantees that it does not matter how many test
cases were
Hi KES,
On Mon, 11 Jul 2016, KES wrote:
> For this diff
> diff --git a/app/public/v2/index.html b/app/public/v2/index.html
> index f73ba73..3af0c64 100644
> --- a/app/public/v2/index.html
> +++ b/app/public/v2/index.html
> @@ -21,11 +21,15 @@
>
>
>
> -
> - MOV
> -
Hi
For this diff
diff --git a/app/public/v2/index.html b/app/public/v2/index.html
index f73ba73..3af0c64 100644
--- a/app/public/v2/index.html
+++ b/app/public/v2/index.html
@@ -21,11 +21,15 @@
-
- MOV
- ADD
- DEL
-
+
+
+ MOV
+ ADD
We forgot to adjust this code path after moving the test helpers to
t/helper/.
Signed-off-by: Johannes Schindelin
---
Published-As:
https://github.com/dscho/git/releases/tag/valgrind-and-test-helpers-v1
t/test-lib.sh | 2 +-
1 file changed, 1 insertion(+), 1
Hey Git community,
since Version 2.9.0, the configuration option "commit.gpgsign" doesn't
work as users would expect. By committing via 'git gui' (or usual 'git
commit' without further option), commits are not being auto-signed any
longer, when "commit.gpgSign" configuration option is set. I
On Sun, Jul 10, 2016 at 10:16:44PM +, Eric Wong wrote:
> My Debian wheezy LTS system is still on glibc 2.13; and LTS
> distros may use older glibc, still, so lets not unnecessarily
> break things out-of-the-box.
>
> We seem to assume Linux is using glibc in our Makefiles anyways,
> so I don't
Hi Junio,
On Fri, 8 Jul 2016, Junio C Hamano wrote:
> * js/am-call-theirs-theirs-in-fallback-3way (2016-07-08) 1 commit
> - am: counteract gender bias
>
> One part of "git am" had an oddball helper function that called
> stuff from outside "his" as opposed to calling what we have "ours",
>
Hi Duy,
On Sun, 10 Jul 2016, Duy Nguyen wrote:
> We will be able to see refs from all worktrees if we choose to.
What I tried to say is: even if we make it technically feasible to have
per-worktree refs or reflogs, the downsides are too prohibitive. We should
simply not introduce support for
80 matches
Mail list logo