On 08/11/2015 10:03 PM, Junio C Hamano wrote:
Michael Haggerty mhag...@alum.mit.edu writes:
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
diff.c | 29 +++--
1 file changed, 7 insertions(+), 22 deletions(-)
Nice code reduction.
diff --git a/diff.c
On 08/11/2015 10:21 PM, Junio C Hamano wrote:
Thanks for a pleasant read. All looked reasonable.
Thanks for your review!
Michael
--
Michael Haggerty
mhag...@alum.mit.edu
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
Elia Pinto gitter.spi...@gmail.com writes:
diff --git a/http.c b/http.c
index e9c6fdd..1504005 100644
--- a/http.c
+++ b/http.c
@@ -37,6 +37,8 @@ static int curl_ssl_verify = -1;
static int curl_ssl_try;
static const char *ssl_cert;
static const char *ssl_cipherlist;
+static const
On 15-08-12 02:43 AM, Jacob Keller wrote:
Hello,
Recently there was some discussion about git-notes and how we do not fetch
notes from remotes by default. The big problem with doing so is because
refs/remotes/* hierarchy is only setup for branches (heads), so we don't
have any clean
Hello all,
I am using git stashes to ensure that my source builds and tests
correctly. My general work flow is this: Before committing I create a
stash and clean everything:
git stash save -q --keep-index --include-untracked
Then I perform some tests (mvn compile test), after that I restore
Teach git about a new option, http.sslVersion, which permits one to
specify the SSL version to use when negotiating SSL connections. The
setting can be overridden by the GIT_SSL_VERSION environment
variable.
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
This is the second version. I
Am Catherine, a dying widow, am donating my trust fund money to any
God fearing individual willing to embrasse a life changing encounter.
Kindly contact me on catherinemelco...@gmail.com if you are priviledged to read
this mail for details.
Cath
---
This email has been checked for viruses by
On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller jacob.kel...@gmail.com wrote:
Oh interesting. I did a test. If you provide a fully qualified ref not
inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
rather than refs/foo/y
I need to do some more digging on this to determine the
Reordering the struct member env to be next to env_array
helps understanding the struct better.
This also adds comments to indicate that arg{s,v} and (env, env_array)
are used for the same purpose and only one must be used. Although
these comments are in the Documentation, I still think they are
On Wed, Aug 12, 2015 at 2:57 PM, Jacob Keller jacob.kel...@gmail.com wrote:
On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland jo...@herland.net wrote:
If we don't already refuse to merge into a ref outside refs/notes, then
I would consider that a bug to be fixed, and not some corner use case that
On Wed, Aug 12, 2015 at 11:43 PM, Jacob Keller jacob.kel...@gmail.com wrote:
On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller jacob.kel...@gmail.com wrote:
Oh interesting. I did a test. If you provide a fully qualified ref not
inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 12, 2015 at 10:43 PM, Junio C Hamano gits...@pobox.com wrote:
...
%(objectname:abbrev=8). To specify two modification magics, each of
which takes a number, the user would say e.g.
%(objectname:abbrev=8,magic=4)
...
And that
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 second batch of topics have graduated to 'master'. Most
notably, the rewritten git am is in. Also worktree add is
getting improved.
You
On Tue, Jun 02, 2015 at 07:11:10AM -0400, Michael Rappazzo wrote:
In the Tags and heads view, the list of refs is globally sorted.
The list of local refs (heads) is separated by the remote refs. This
change re-orders the view toi be: local refs, remote refs tracked by
local refs, remote refs,
On Wed, Aug 12, 2015 at 8:34 PM, Jacob Keller jacob.kel...@gmail.com wrote:
On Wed, Aug 12, 2015 at 9:10 AM, Junio C Hamano gits...@pobox.com wrote:
Some design boundaries:
- Moving the remote-tracking branch hierarchy from refs/remotes/$O/*
to refs/remotes/$O/heads/* would not fly,
On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller sbel...@google.com wrote:
In the first hunk, `submodule` is NULL all the time, so we can make it clearer
by directly returning NULL.
In the second hunk, we can directly return the lookup values as it also makes
the coder clearer.
Signed-off-by:
On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland jo...@herland.net wrote:
If we don't already refuse to merge into a ref outside refs/notes, then
I would consider that a bug to be fixed, and not some corner use case that
we must preserve for all future.
After all, we do already have a test in
On Wed, Aug 12, 2015 at 5:34 PM, Stefan Beller sbel...@google.com wrote:
On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine sunsh...@sunshineco.com
wrote:
On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller sbel...@google.com wrote:
if (!gitmodule_sha1_from_commit(commit_sha1, sha1))
-
David Turner dtur...@twopensource.com writes:
Instead of a linear search over common_list to check whether
a path is common, use a trie. The trie search operates on
path prefixes, and handles excludes.
Signed-off-by: David Turner dtur...@twopensource.com
---
Probably overkill, but maybe
Quoting Junio C Hamano gits...@pobox.com:
SZEDER Gábor sze...@ira.uka.de writes:
'git config' can only show values or name-value pairs, so if a shell
script needs the names of set config variables it has to run 'git config
--list' or '--get-regexp' and parse the output to separate config
Instead of a linear search over common_list to check whether
a path is common, use a trie. The trie search operates on
path prefixes, and handles excludes.
Signed-off-by: David Turner dtur...@twopensource.com
---
Probably overkill, but maybe we could later use it for making exclude
or
We need a place to stick refs for bisects in progress that is not
shared between worktrees. So we use the refs/worktree/ hierarchy.
The is_per_worktree_ref function and associated docs learn that
refs/worktree/ is per-worktree, as does the git_path code in path.c
The ref-packing functions learn
Using the new refs/worktree/ refs, make bisection per-worktree.
Signed-off-by: David Turner dtur...@twopensource.com
---
Documentation/git-bisect.txt | 4 ++--
Documentation/rev-list-options.txt | 14 +++---
bisect.c | 2 +-
builtin/rev-parse.c
Instead of common_list having formatting like ! and /, use a struct to
hold common_list data in a structured form.
We don't use 'exclude' yet; instead, we keep the old codepath that
handles info/sparse-checkout and logs/HEAD. Later, we will use exclude.
Signed-off-by: David Turner
On Wed, Aug 12, 2015 at 3:41 PM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.kel...@gmail.com writes:
I spoke to soon. We have an init_notes_check function which shows
that it does refuse to merge outside of refs/notes/* It prevents all
notes operations outside of refs/notes
On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine sunsh...@sunshineco.com wrote:
On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller sbel...@google.com wrote:
In the first hunk, `submodule` is NULL all the time, so we can make it
clearer
by directly returning NULL.
In the second hunk, we can
On Wed, Aug 12, 2015 at 4:26 AM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I know that we don't yet have a proper place to put remote notes refs,
but the ref in notes.ref.merge _must_ be a local notes ref (you even
use the localref notation in the
Jacob Keller jacob.kel...@gmail.com writes:
I spoke to soon. We have an init_notes_check function which shows
that it does refuse to merge outside of refs/notes/* It prevents all
notes operations outside of refs/notes
OK. Then it is OK to limit notes.ref.mergestrategy so that ref
refers to
SZEDER Gábor sze...@ira.uka.de writes:
s/becase/because/;
OK.
...
I agree with Peff that --names-only has a subtle difference with
an existing and well known subcommand option and it would be a bit
irritating to remember which options is for which command.
OK.
...
The topic is now in
Hi,
Quoting René Scharfe (2015-08-12 21:40:48)
Am 11.08.2015 um 12:40 schrieb Johannes Schauer:
for repositories with more than 16k files and folders, git-archive will
create
zip files which store the wrong number of entries. That is, it stores the
number of entries modulo 16k. This
Hello,
Recently there was some discussion about git-notes and how we do not
fetch notes from remotes by default. The big problem with doing so is
because refs/remotes/* hierarchy is only setup for branches (heads),
so we don't have any clean location to put them.
Around the time of git 1.8.0,
Hi Johannes,
On 2015-08-11 22:51, Johannes Sixt wrote:
Invoking plink requires special treatment, and we have support and even
test cases for the commands 'plink' and 'tortoiseplink'. We also support
.exe variants for these two and there is a test for 'plink.exe'.
On Windows, however, where
Michael Haggerty mhag...@alum.mit.edu writes:
No, prepare_temp_file() sometimes sets diff_tempfile::name to
/dev/null, and sometimes to point at its argument `name`.
That explains everything. Thanks. It's been a while since I wrote
this part of the system ;-).
--
To unsubscribe from this
On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
struct atom_value{
Obviously not a problem with this step, but you need a SP before the
open brace.
Will add.
@@ -692,6 +704,26 @@ static void populate_value(struct
Karthik Nayak karthik@gmail.com writes:
+ format_quote_value(atomv, quote_style, output);
If the one to add a literal string (with %hex escaping) is called append_,
then this should be called append_quoted_atom() or something, no?
Although it does append like append_non_atom
On Wed, Aug 12, 2015 at 9:59 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
+ format_quote_value(atomv, quote_style, output);
If the one to add a literal string (with %hex escaping) is called append_,
then this should be called
Jacob Keller jacob.kel...@gmail.com writes:
Recently there was some discussion about git-notes and how we do not
fetch notes from remotes by default. The big problem with doing so is
because refs/remotes/* hierarchy is only setup for branches (heads),
so we don't have any clean location to
On Wed, Aug 12, 2015 at 10:10 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
+void strbuf_utf8_align(struct strbuf *buf, align_type
Karthik Nayak karthik@gmail.com writes:
On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
+void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned
int width,
+const char *s)
+{
+
Duy Nguyen pclo...@gmail.com writes:
I know this is a corner case, but because it has a valid use case,
maybe we should do something about it. Immediate reaction is to add an
option to send no haves. But maybe you guys have better ideas.
This and similar corner cases were discussed in very
Johannes Schindelin johannes.schinde...@gmx.de writes:
Hi,
On 2015-08-11 22:38, Johannes Sixt wrote:
diff --git a/t/t2019-checkout-ambiguous-ref.sh
b/t/t2019-checkout-ambiguous-ref.sh
index 8396320..199b22d 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++
Also add some code comments explaining how the fields in struct
diff_tempfile are used.
Signed-off-by: Michael Haggerty mhag...@alum.mit.edu
---
This is a replacement for tempfile patch v2 12/16 that includes some
extra code comments. It is also available from my GitHub repo [1] on
branch
On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
Hi Johannes,
On 2015-08-11 22:51, Johannes Sixt wrote:
Invoking plink requires special treatment, and we have support and even
test cases for the commands 'plink' and 'tortoiseplink'. We also support
.exe
This is a corner case that has a real use case:
git clone linux-2.6.git
cd linux-2.6
git remote add history git-history.git
git fetch history
# graft graft graft
Because history.gi and linux-2.6.git have nothing in common, the
server side keeps asking for more haves and the client keeps sending
Teach git about a new option, http.sslVersion, which permits one to
specify the SSL version to use when negotiating SSL connections. The
setting can be overridden by the GIT_SSL_VERSION environment
variable.
Signed-off-by: Elia Pinto gitter.spi...@gmail.com
---
Documentation/config.txt
Hi,
On 2015-08-11 22:38, Johannes Sixt wrote:
diff --git a/t/t2019-checkout-ambiguous-ref.sh
b/t/t2019-checkout-ambiguous-ref.sh
index 8396320..199b22d 100755
--- a/t/t2019-checkout-ambiguous-ref.sh
+++ b/t/t2019-checkout-ambiguous-ref.sh
@@ -69,7 +69,7 @@ test_expect_success 'wildcard
On Tue, Aug 11, 2015 at 11:26 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
-static void print_value(struct atom_value *v, int quote_style)
+static void format_quote_value(struct atom_value *v, int quote_style,
struct strbuf *output)
{
Hmph...
2015-08-12 15:33 GMT+02:00 Remi Galan Alfonso
remi.galan-alfo...@ensimag.grenoble-inp.fr:
Hello, Elia
Elia Pinto gitter.spi...@gmail.com writes:
+if (ssl_version != NULL *ssl_version) {
+if (!strcmp(ssl_version,tlsv1)) {
+sslversion =
On Tue, Aug 11, 2015 at 11:43 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep),
atomv);
- format_quote_value(atomv, quote_style, output);
+
On Tue, Aug 11, 2015 at 11:30 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
@@ -1283,9 +1279,11 @@ void show_ref_array_item(struct ref_array_item *info,
const char *format, int qu
if (color_parse(reset, color) 0)
Hello, Elia
Elia Pinto gitter.spi...@gmail.com writes:
+if (ssl_version != NULL *ssl_version) {
+if (!strcmp(ssl_version,tlsv1)) {
+sslversion = CURL_SSLVERSION_TLSv1;
+} else if (!strcmp(ssl_version,sslv2)) {
+
On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
+void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned
int width,
+const char *s)
+{
+ int display_len = utf8_strnwidth(s,
On Wed, Aug 12, 2015 at 07:43:01PM +0200, Johannes Sixt wrote:
27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16)
introduced a new function for_each_loose_file_in_objdir() with a helper
for_each_file_in_obj_subdir(). The latter calls callbacks for each file
found during
On Wed, Aug 12, 2015 at 04:24:51PM +0200, Elia Pinto wrote:
Teach git about a new option, http.sslVersion, which permits one to
specify the SSL version to use when negotiating SSL connections. The
setting can be overridden by the GIT_SSL_VERSION environment
variable.
Signed-off-by: Elia
Am 12.08.2015 um 00:14 schrieb Junio C Hamano:
Now, I am wondering if it makes sense to do these two things:
* Teach revision.c::read_revisions_from_stdin() to use
strbuf_getline() instead of strbuf_getwholeline().
* Teach strbuf_getline() to remove CR at the end when stripping the
On Wed, Aug 12, 2015 at 11:54 AM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.kel...@gmail.com writes:
Just thinking aloud, perhaps we can introduce a brand new top level
hierarchy refs/remote/$O/{heads,tags,notes,...}, and give backward
compatibility by making a moral
On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I know that we don't yet have a proper place to put remote notes refs,
but the ref in notes.ref.merge _must_ be a local notes ref (you even
use the localref notation in the
Jacob Keller jacob.kel...@gmail.com writes:
On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I know that we don't yet have a proper place to put remote notes refs,
but the ref in notes.ref.merge _must_ be a local notes ref (you
On Wed, Aug 12, 2015 at 10:53 AM, Junio C Hamano gits...@pobox.com wrote:
Stefan Beller sbel...@google.com writes:
On Mon, Jun 15, 2015 at 2:48 PM, Junio C Hamano gits...@pobox.com wrote:
Thanks. Will replace and wait for comments from others.
I have reviewed the patches carefully and they
If you want to look up by name, use `submodule_from_name` instead.
Signed-off-by: Stefan Beller sbel...@google.com
---
Documentation/technical/api-submodule-config.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/technical/api-submodule-config.txt
In the first hunk, `submodule` is NULL all the time, so we can make it clearer
by directly returning NULL.
In the second hunk, we can directly return the lookup values as it also makes
the coder clearer.
Signed-off-by: Stefan Beller sbel...@google.com
---
submodule-config.c | 12 +---
1
On Wed, Aug 12, 2015 at 12:09 PM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.kel...@gmail.com writes:
On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano gits...@pobox.com wrote:
Johan Herland jo...@herland.net writes:
I know that we don't yet have a proper place to put remote
Stefan Beller sbel...@google.com writes:
However just as I was convinced of my review and sent out the email, I started
working with it. And I found nits which I'd ask you to squash into the round
or
put on top.
Good ;-). I'd prefer a full reroll, as it has been quite a while
since v5 was
27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16)
introduced a new function for_each_loose_file_in_objdir() with a helper
for_each_file_in_obj_subdir(). The latter calls callbacks for each file
found during a directory traversal and finally also a callback for the
directory
Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund:
On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin
johannes.schinde...@gmx.de wrote:
FWIW Git for Windows has this patch (that I wanted to contribute
in due time, what with being busy with all those tickets) to solve the
problem mentioned in
On Wed, Aug 12, 2015 at 9:10 AM, Junio C Hamano gits...@pobox.com wrote:
Jacob Keller jacob.kel...@gmail.com writes:
Recently there was some discussion about git-notes and how we do not
fetch notes from remotes by default. The big problem with doing so is
because refs/remotes/* hierarchy is
Jacob Keller jacob.kel...@gmail.com writes:
Just thinking aloud, perhaps we can introduce a brand new top level
hierarchy refs/remote/$O/{heads,tags,notes,...}, and give backward
compatibility by making a moral equivalent of a symbolic link from
refs/remote/$O/heads to refs/remotes/$O/. The
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano gits...@pobox.com wrote:
Minor nits on the design. %(align:width[,position]) would let
us write %(align:16)...%(end) and use the default position, which
may be beneficial if one kind of alignment is
Stefan Beller sbel...@google.com writes:
On Mon, Jun 15, 2015 at 2:48 PM, Junio C Hamano gits...@pobox.com wrote:
Thanks. Will replace and wait for comments from others.
I have reviewed the patches carefully and they look good to me.
OK, I recall there were a few iterations with review
Marc Branchaud marcn...@xiplink.com writes:
Not a lot. Existing DWIMery already handles ambiguous branches, by
preferring a local branch name over any remote ones. The only teaching
that's really needed is ...
You need to remember that there are five useful things you can do to
mutable
Am 11.08.2015 um 12:40 schrieb Johannes Schauer:
Hi,
for repositories with more than 16k files and folders, git-archive will create
zip files which store the wrong number of entries. That is, it stores the
number of entries modulo 16k. This will break unpackers that do not include
code to
Jacob Keller jacob.kel...@gmail.com writes:
That still hasn't really resolved the question of how to deal with
tags, but it does solve the question of how to deal with replace and
notes refs.
I do not think it would be a good change to add a
[remote foo]
fetch =
I'm pretty happy about Git in general, but for two situations where I've
found workarounds, which both have the same problem, which is that they
touch files unnecessarily:
* First case: merge into a dirty tree.
I often want to git pull into a tree
that's dirty. I know many people find this to
On Wed, Aug 12, 2015 at 10:43 PM, Junio C Hamano gits...@pobox.com wrote:
Karthik Nayak karthik@gmail.com writes:
On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano gits...@pobox.com wrote:
Minor nits on the design. %(align:width[,position]) would let
us write %(align:16)...%(end) and use
74 matches
Mail list logo
