And, of course, as soon as I send these, I notice the bad signoff on
about half of them, including this one :( Those probably got screwed up
when I ended up losing my entire repo once when a test went wrong.
Anyway, I went ahead and fixed them in my local version, so next rev
they'll be fine.
On
From: Ronnie Sahlberg
These functions do not use any backend specific code so we move
them to the common code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 52
refs.c | 52 +++
From: Ronnie Sahlberg
These functions do not contain any backend specific code so we move
them to the common code and share across all backends.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 203
refs.
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 5 -
refs.c | 5 +
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 3b06714..a346629 100644
--- a/refs-be-files.c
+++ b/
From: Ronnie Sahlberg
This function does not contain any backend specific code so we
move it to the common code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 109
refs.c | 109 +++
Signed-off-by: David Turner
---
refs-be-files.c | 10 --
refs.c | 10 ++
refs.h | 2 ++
3 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 657b58f..3138624 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 5 +++--
refs.h | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 1180799..c49d44e 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -3501,8 +
From: Ronnie Sahlberg
This function can be shared across all refs backends so move it
to the common code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 7 ---
refs.c | 7 +++
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ref
From: Ronnie Sahlberg
Move update_ref() to the refs.c file since this function does not
contain any backend specific code. Move the ref classifier functions
as well, since update_ref depends on them.
Based on Ronnie Sahlberg's patch
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
From: Ronnie Sahlberg
These functions do not depend on the backend implementation so we
move them to the common code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 18 --
refs.c | 18 ++
2 files changed, 18 insertions
The file backend doesn't need this function, but other backends might.
Signed-off-by: David Turner
Signed-off-by: Ronnie Sahlberg
---
refs-be-files.c | 1 +
refs.c | 4 +++-
refs.h | 4 +++-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/refs-be-files.c b/refs-
Because HEAD and stash are per-worktree, other backends need to
go through the files backend to manage these refs and their reflogs.
To enable this, we make some files backend functions public.
Signed-off-by: David Turner
---
refs-be-files.c | 34 +-
refs.h
Alternate refs backends might not need refs/heads and so on, so we make
ref db initialization part of the backend.
Signed-off-by: David Turner
---
builtin/init-db.c | 14 --
refs-be-files.c | 17 +
refs.c| 5 +
refs.h| 4
4 files c
From: Ronnie Sahlberg
Move read_ref_at() to the refs.c file since this function does not
contain any backend specific code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 118
refs.c | 118
Add a new option, --refs-backend-type, to allow the ref backend type to
be set on new clones.
Submodules must use the same ref backend as the parent repository, so
we also pass the --refs-backend-type option option when cloning
submodules.
Signed-off-by: David Turner
---
Documentation/git-clone
Alternate ref backends might need different data for transactions. Make
struct ref_transaction an empty struct, and let backends define their
own structs which extend it.
Signed-off-by: David Turner
---
refs-be-files.c | 20 +---
refs.h | 8 ++--
2 files changed, 1
From: Ronnie Sahlberg
Create a new refs.c file that will be used to hold all the refs
code that is backend agnostic and will be shared across all backends.
Signed-off-by: Ronnie Sahlberg
---
refs.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/refs.c b/refs.c
index e69de29..77492ff 10
Signed-off-by: David Turner
---
refs-be-files.c | 3 ++-
refs.h | 7 +++
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 5170c5c..71c39ca 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -3607,7 +3607,7 @@ static int expire_r
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
---
refs-be-files.c | 9 -
refs.c | 9 +
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index a346629..6b5b290 100644
--- a/refs-be-files.c
+++ b/refs-be-files.c
@@ -2
This function does not contain any backend specific code so we
move it to the common code.
Signed-off-by: David Turner
---
refs-be-files.c | 53 -
refs.c | 31 +++
refs.h | 27 ++
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
---
refs-be-files.c | 83 -
refs.c | 81 +++
2 files changed, 81 insertions(+), 83 deletions(-)
diff --git a/refs-be-files.c
Add register_refs_backend, to allow refs backends to be registered.
Signed-off-by: David Turner
---
refs.c | 6 ++
refs.h | 1 +
2 files changed, 7 insertions(+)
diff --git a/refs.c b/refs.c
index 3a2cafb..9bdd51f 100644
--- a/refs.c
+++ b/refs.c
@@ -18,6 +18,12 @@ struct ref_be *refs_backe
Create new function verify_no_descendants, to hold one of the ref
conflict checks used in verify_refname_available. Multiple backends
will need this function, so it goes in the common code.
Signed-off-by: David Turner
---
refs-be-files.c | 33 -
refs.c |
Add a database backend for refs using LMDB. This backend runs git
for-each-ref about 30% faster than the files backend with fully-packed
refs on a repo with ~120k refs. It's also about 4x faster than using
fully-unpacked refs. In addition, and perhaps more importantly , it
avoids case-conflict i
In the file-based backend, the reflog piggybacks on the ref lock.
Since other backends won't have the same sort of ref lock, ref backends
must also handle reflogs.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 21 +++--
refs.c | 51 +++
In a moment, we'll create initdb functions for ref backends, and code
from initdb that calls this function needs to move into the files
backend. So this function needs to be public.
Signed-off-by: David Turner
---
builtin/init-db.c | 12
cache.h | 5 +
path.c
Soon, the db refs backend will use this to restart read transactions
after subcommands which might have modified the refs database.
Signed-off-by: David Turner
---
run-command.c | 2 ++
run-command.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/run-command.c b/run-command.c
index 02aab3
We also have to make rename_ref_available public, since alternate
backends for rename_ref will need it.
Signed-off-by: David Turner
---
refs-be-files.c | 19 ++-
refs.c | 21 +
refs.h | 4
3 files changed, 27 insertions(+), 17 deletions
Rename copy_msg to copy_reflog_msg and make it public.
Signed-off-by: David Turner
---
refs-be-files.c | 28 +---
refs.c | 26 ++
refs.h | 2 ++
3 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/refs-be-files.c b/r
This function does not contain any backend specific code so we
move it to the common code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner http://vger.kernel.org/majordomo-info.html
This function might be used by other refs backends
Signed-off-by: David Turner
---
refs.h | 11 +++
1 file changed, 11 insertions(+)
diff --git a/refs.h b/refs.h
index 5542587..359e166 100644
--- a/refs.h
+++ b/refs.h
@@ -259,6 +259,17 @@ int verify_refname_available(const char *newname
From: Ronnie Sahlberg
Add ref backend methods for:
resolve_ref_unsafe, verify_refname_available, pack_refs, peel_ref,
create_symref, resolve_gitlink_ref.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
builtin/init-db.c | 1 +
cache.h | 7 +++
refs-be-files.c
This allows them to be used by other ref backends.
Signed-off-by: David Turner
---
refs-be-files.c | 24
refs.h | 24
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 71c39ca..ec7ec
Add tests for the database backend.
Signed-off-by: David Turner
---
t/t1460-refs-be-db.sh| 1103 ++
t/t1470-refs-be-db-reflog.sh | 353 ++
2 files changed, 1456 insertions(+)
create mode 100755 t/t1460-refs-be-db.sh
create mode 10075
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs.c | 7 ---
refs.h | 13 +
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/refs.c b/refs.c
index 76b05f1..9c29899 100644
--- a/refs.c
+++ b/refs.c
@@ -2824,13 +2824,6 @@ int pack_refs(unsigned int
From: Ronnie Sahlberg
Add a ref structure for backend methods. Start by adding method pointers
for the transaction functions.
Add a function set_refs_backend to switch between backends. The files
based backend is the default.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
ref
From: Ronnie Sahlberg
Create a public version of verify_refname_available that backends can
provide.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs.c | 53 ++---
refs.h | 17 +
2 files changed, 47 insertions(
Alternate refs backends might still use files to store per-worktree
refs. So the files backend's ref-loading infrastructure should be
available to those backends, just for use on per-worktree refs. Add
do_for_each_per_worktree_ref, which iterates over per-worktree refs.
Signed-off-by: David Turn
From: Ronnie Sahlberg
Move delete_pseudoref, delete_ref() and delete_refs() to the refs.c
file since these functions do not contain any backend specific code.
Based on a patch by Ronnie Sahlberg.
Signed-off-by: David Turner
Signed-off-by: Ronnie Sahlberg
---
refs-be-files.c | 94
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 36 +---
refs.c | 47 +++
refs.h | 23 +++
3 files changed, 95 insertions(+),
Add method for for_each_reftype_fullpath.
Signed-off-by: David Turner
---
refs-be-files.c | 3 ++-
refs.c | 5 +
refs.h | 2 ++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index 19bf12b..85257b9 100644
--- a/refs-be-files.
I think I've broken about all of the standalone stuff out, so here's
the main enchilada.
This series depends on at least the following topics in pu:
dt/refs-bisection
dt/refs-pseudo
dt/reflog-tests
kn/for-each-tag (patch 21 and corresponding bits of 42 depend on this;
we could skip them, but I wan
From: Ronnie Sahlberg
Move the hidden refs functions to the refs.c file since these
functions do not contain any backend specific code.
Signed-off-by: Ronnie Sahlberg
Signed-off-by: David Turner
---
refs-be-files.c | 51 ---
refs.c | 50
From: Ronnie Sahlberg
Signed-off-by: Ronnie Sahlberg
---
refs-be-files.c | 15 ---
refs.c | 15 +++
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/refs-be-files.c b/refs-be-files.c
index a36568f..21b38cf 100644
--- a/refs-be-files.c
+++ b/refs-
Patch to make it possible to pin submodules so that they are not
affected by the --remote option in "git submodule".
Anders Ro (2):
git-submodule.sh: pin submodule when branch name is '@'
t7412: add test case for pinned submodules
Documentation/git-submodule.txt | 3 +-
git-submodule.sh
On Wed, 2 Sep 2015, Aaron Bird wrote:
> I am running windows 8.1. Every time I try and open git Bash I get an
> unexpected kernal mode trap error and computer instantly shuts down.
For lurkers, Aaron also reported this bug at
https://github.com/git-for-windows/git/issues/348 and we are eagerly
Hi,
On Wed, 2 Sep 2015, Paul Tan wrote:
> On Wed, Sep 2, 2015 at 12:55 AM, Matthieu Moy
> wrote:
> > I consider this GSoC as a great success and a pleasant experience.
> > Congratulation to Paul and Karthik, and a warm "thank you" to everybody
> > who contributed: administrators, mentors, review
Hi Junio,
I have a couple of fixes lined up for bugs in Git for Windows 2.5.1. Do
you plan to release 2.5.2 any time soon? If yes, I would hold off,
otherwise I will just do a Git for Windows 2.5.1 (Rel 2).
Thanks,
Dscho
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bod
On Wed, Sep 02, 2015 at 05:30:14PM -0400, Jeff King wrote:
> On Wed, Sep 02, 2015 at 10:41:34AM -0700, Junio C Hamano wrote:
>
> > Jeff King writes:
> >
> > > + /* historical alias */
> > > + if (!strcmp(format, "local"))
> > > + format = "default-local";
> > > +
> > > + mode->type = par
This reimplements the helper function `module_clone` in shell
in C as `clone`. This functionality is needed for converting
`git submodule update` later on, which we want to add threading
to.
Signed-off-by: Stefan Beller
---
builtin/submodule--helper.c | 136 ++
Most of the submodule operations work on a set of submodules.
Calculating and using this set is usually done via:
module_list "$@" | {
while read mode sha1 stage sm_path
do
# the actual operation
done
}
Currently the function `module_
I finished the refactoring and picked up suggestions from Eric and Junio.
Stefan Beller (3):
submodule: Reimplement `module_list` shell function in C
submodule: Reimplement `module_name` shell function in C
submodule: Reimplement `module_clone` shell function in C
.gitignore
This implements the helper `name` in C instead of shell,
yielding a nice performance boost.
Before this patch, I measured a time (best out of three):
$ time ./t7400-submodule-basic.sh >/dev/null
real0m11.066s
user0m3.348s
sys 0m8.534s
With this patch applied I meas
On 2 September 2015 at 21:39, wrote:
> From: Lars Schneider
>
> Perforce keeps the encoding of a path as given by the originating OS.
> Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
> encoding Perforce had used for the paths. This encoding is used to
> transcode the paths
On Wed, Sep 02, 2015 at 10:41:34AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > + /* historical alias */
> > + if (!strcmp(format, "local"))
> > + format = "default-local";
> > +
> > + mode->type = parse_date_type(format, &p);
> > + mode->local = 0;
> > +
> > + if (
On Wed, Sep 02, 2015 at 01:29:08PM -0700, Junio C Hamano wrote:
> John Keeping writes:
>
> > In which case, should we just support it now?
> >
> > Normally I'd suggest banning controversial options on the basis that
> > it's easier in the future to allow something that was previously banned
> >
An early preview release Git v2.6.0-rc0 is now available for
testing at the usual places. It is comprised of 406 non-merge
commits since v2.5.0, contributed by 50 people, 12 of which are
new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following
From: Lars Schneider
Diff to v4:
* add verbose output
* reword help text
* remove comment how to generate encoded sequence
* use ascii characters in encoded sequence where possible
* wrap 'cd' in TC in a subshell
Thanks to Eric, Torsten, and Junio for feedback!
Cheers,
Lars
Lars Schneider (1):
From: Lars Schneider
Perforce keeps the encoding of a path as given by the originating OS.
Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
encoding Perforce had used for the paths. This encoding is used to
transcode the paths to UTF-8. As an example, Perforce on Windows often
John Keeping writes:
> In which case, should we just support it now?
>
> Normally I'd suggest banning controversial options on the basis that
> it's easier in the future to allow something that was previously banned
> than change the meaning of an options, but in this case I can't see any
> other
On Wed, Sep 02, 2015 at 01:11:35PM -0700, Junio C Hamano wrote:
> John Keeping writes:
> > OTOH, I don't think there's any disagreement about what "relative-local"
> > and "raw-local" would output were they supported, just whether they are
> > useful. There doesn't seem to be any harm in supporti
John Keeping writes:
> On Wed, Sep 02, 2015 at 08:16:59AM -0700, Junio C Hamano wrote:
>> Jeff King writes:
>>
>> > I guess "relative dates do not depend on timezones, so -local is
>> > meaningless" would be the closest thing.
>
> The discussion about "raw-local" was in a separate subthread, I
On Wed, Sep 02, 2015 at 08:16:59AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Wed, Sep 02, 2015 at 08:48:26AM +0100, John Keeping wrote:
> >
> >> On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote:
> >> > [1] I do think the error message for "relative-local is nonsense" coul
Jeff King writes:
> There's a bug in builtin/am.c in which we take a lock on
> MERGE_RR recursively. But rather than fix am.c, this patch
> fixes the confusing interface from rerere.c that caused the
> bug. Read on for the gory details.
>
> The setup_rerere() function both reads the existing MERG
Matthieu Prat writes:
> A test was designed for "git diff-index --cached -M" but the command is
> run without the "-M" option (which makes the test essentially identical
> to its preceding counterpart).
Very true and it seems that it has been that way from the day these
trio of tests were introd
On Wednesday, September 2, 2015, wrote:
> Perforce keeps the encoding of a path as given by the originating OS.
> Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
> encoding Perforce had used for the paths. This encoding is used to
> transcode the paths to UTF-8. As an example,
A test was designed for "git diff-index --cached -M" but the command is
run without the "-M" option (which makes the test essentially identical
to its preceding counterpart).
Give the command the option it deserves and the test a raison d'être.
Signed-off-by: Matthieu Prat
---
t/t7060-wtstatus.
On Wed, Sep 2, 2015 at 10:58 AM, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>> I consider this GSoC as a great success and a pleasant experience.
>> Congratulation to Paul and Karthik, and a warm "thank you" to everybody
>> who contributed: administrators, mentors, reviewers, and obviously
>>
Matthieu Moy writes:
> I consider this GSoC as a great success and a pleasant experience.
> Congratulation to Paul and Karthik, and a warm "thank you" to everybody
> who contributed: administrators, mentors, reviewers, and obviously
> Junio! (not to mention Google, who made all this possible)
>
>
Jeff King writes:
> + /* historical alias */
> + if (!strcmp(format, "local"))
> + format = "default-local";
> +
> + mode->type = parse_date_type(format, &p);
> + mode->local = 0;
> +
> + if (skip_prefix(p, "-local", &p)) {
> + if (mode->type == DATE_RE
John Keeping writes:
> diff --git a/Documentation/rev-list-options.txt
> b/Documentation/rev-list-options.txt
> index a9b808f..5d28133 100644
> --- a/Documentation/rev-list-options.txt
> +++ b/Documentation/rev-list-options.txt
> @@ -702,12 +702,16 @@ include::pretty-options.txt[]
> --date=(rel
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Karthik Nayak writes:
>>
>>> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote:
Karthik Nayak writes:
>>> + die(_("format: `end` atom used without a supporting
>>> atom"));
>>
>> Not a show-stopper, b
Junio C Hamano writes:
> Karthik Nayak writes:
>
>> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote:
>>> Karthik Nayak writes:
>>>
>> + die(_("format: `end` atom used without a supporting
>> atom"));
>
> Not a show-stopper, but we may need some wordsmithing fo
Matthieu Moy writes:
> I actually found the other more readable, as it reads "display the
> refname aligned on 15 columns, and then a space",
FWIW, I too find the "15-col followed by a space" easier to
understand. I was merely being curious when/why Karthik changed
preference, not objecting to
larsxschnei...@gmail.com writes:
> From: Lars Schneider
>
> Perforce keeps the encoding of a path as given by the originating OS.
> Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
> encoding Perforce had used for the paths. This encoding is used to
> transcode the paths to UT
Karthik Nayak writes:
> On Wed, Sep 2, 2015 at 8:40 PM, Junio C Hamano wrote:
>> Karthik Nayak writes:
>>
>>> + if (filter->lines)
>>> + format = to_free =
>>> xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)",
>>> +
Karthik Nayak writes:
> On Wed, Sep 2, 2015 at 2:37 PM, Matthieu Moy
> wrote:
>> Karthik Nayak writes:
>>
>>> --- a/builtin/tag.c
>>> +++ b/builtin/tag.c
>>> @@ -185,6 +185,10 @@ static enum contains_result contains(struct commit
>>> *candidate,
>>> return contains_test(candidate, want);
On Wed, Sep 2, 2015 at 9:15 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote:
>>> Karthik Nayak writes:
>>>
>> + die(_("format: `end` atom used without a supporting
>> atom"));
>
> Not a show-stopper, but we
Karthik Nayak writes:
> On Wed, Sep 2, 2015 at 2:15 PM, Matthieu Moy
>>> @@ -754,6 +816,42 @@ static void populate_value(struct ref_array_item *ref)
>>> else
>>> v->s = " ";
>>> continue;
>>> + } else if (skip_p
Junio C Hamano writes:
> Karthik Nayak writes:
>
+ } else if (skip_prefix(name, "align", &valp)) {
>>>
>>> This looked as if you are willing to take %(align) in addition to
>>> %(align:...), but...
>>>
+ struct align *align = &v->align;
+
On Wed, Sep 2, 2015 at 12:55 AM, Matthieu Moy
wrote:
> I consider this GSoC as a great success and a pleasant experience.
> Congratulation to Paul and Karthik, and a warm "thank you" to everybody
> who contributed: administrators, mentors, reviewers, and obviously
> Junio! (not to mention Google,
On Wed, Sep 2, 2015 at 1:43 AM, Karthik Nayak wrote:
> On Tue, Sep 1, 2015 at 10:25 PM, Matthieu Moy
> wrote:
>> Hi,
>>
>> The Google Summer of Code 2015 is officially over. We had two students
>> (Paul and Karthik), and both of them passed. 100 % success :-).
>>
>
> Congrats Paul :)
Thanks, you
Karthik Nayak writes:
> On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote:
>> Karthik Nayak writes:
>>
> + die(_("format: `end` atom used without a supporting atom"));
Not a show-stopper, but we may need some wordsmithing for "a
supporting atom" here; an end-us
On Wed, Sep 2, 2015 at 8:40 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> + if (filter->lines)
>> + format = to_free =
>> xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)",
>> +filter->lines);
>
> I recall h
Jeff King writes:
> On Wed, Sep 02, 2015 at 08:48:26AM +0100, John Keeping wrote:
>
>> On Tue, Sep 01, 2015 at 06:44:31PM -0400, Jeff King wrote:
>> > [1] I do think the error message for "relative-local is nonsense" could
>> > perhaps be more explanatory, but I couldn't come up with any bett
Karthik Nayak writes:
> + if (filter->lines)
> + format = to_free =
> xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)",
> +filter->lines);
I recall hearing that you were more in favor of
"%(align:16)%(refn
On Wed, Sep 2, 2015 at 8:31 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
+ die(_("format: `end` atom used without a supporting atom"));
>>>
>>> Not a show-stopper, but we may need some wordsmithing for "a
>>> supporting atom" here; an end-user would not know what it is.
>>
Karthik Nayak writes:
>>> + die(_("format: `end` atom used without a supporting atom"));
>>
>> Not a show-stopper, but we may need some wordsmithing for "a
>> supporting atom" here; an end-user would not know what it is.
>
> Probably something like "format: `end` atom should only be
>
From: Lars Schneider
Perforce keeps the encoding of a path as given by the originating OS.
Git expects paths encoded as UTF-8. Add a config to tell git-p4 what
encoding Perforce had used for the paths. This encoding is used to
transcode the paths to UTF-8. As an example, Perforce on my Windows
bo
From: Lars Schneider
Diff to v3:
* add proper commit message
* remove command line option "--path-encoding" and add config
"git-p4.pathEncoding"
* change TC number to 9822
* escape UTF-8 characters in TC
* change test encoding used in TC from cp1251 to ISO-8859-1
* use static ISO-8859-1 encoded
On Wed, Sep 2, 2015 at 2:37 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> --- a/builtin/tag.c
>> +++ b/builtin/tag.c
>> @@ -185,6 +185,10 @@ static enum contains_result contains(struct commit
>> *candidate,
>> return contains_test(candidate, want);
>> }
>>
>> +/*
>> + * Currently m
On Wed, Sep 2, 2015 at 2:15 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> --- a/ref-filter.c
>> +++ b/ref-filter.c
>
>> @@ -163,9 +174,28 @@ static void quote_formatting(struct strbuf *s, const
>> char *str, int quote_style)
>> }
>> }
>>
>> +static void align_handler(struct ref_for
On Wed, Sep 2, 2015 at 2:11 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> +test_expect_success 'alignment with format quote' '
>> + cat >expect <<-EOF &&
>> + refname is ${sq} ${sq}\\${sq}${sq}master${sq}\\${sq}${sq}
>>${sq}|
>> + refname is ${sq}
On Wed, Sep 2, 2015 at 9:45 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
+ if (filter->kind == FILTER_REFS_BRANCHES)
+ ret = for_each_fullref_in("refs/heads/", ref_filter_handler,
&ref_cbdata, broken);
+ else if (filter->kind == FILTER_REFS_REMOT
On Wed, Sep 2, 2015 at 2:49 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> We have an `at_end` function for each element of the stack which is to
>> be called when the `end` atom is encountered. Using this we implement
>> the aling_handler() for the `align` atom, this aligns the final str
Karthik Nayak writes:
> + if (filter->lines)
> + format = to_free =
> xstrfmt("%%(align:15,left)%%(refname:short)%%(end) %%(contents:lines=%d)",
> +filter->lines);
> + else
> + format = "%(refname:short)";
> +
> + verify
Karthik Nayak writes:
> --- a/builtin/tag.c
> +++ b/builtin/tag.c
> @@ -185,6 +185,10 @@ static enum contains_result contains(struct commit
> *candidate,
> return contains_test(candidate, want);
> }
>
> +/*
> + * Currently modified and used in ref-filter as append_lines(), will
> + * ev
Karthik Nayak writes:
> --- a/ref-filter.c
> +++ b/ref-filter.c
> @@ -163,9 +174,28 @@ static void quote_formatting(struct strbuf *s, const
> char *str, int quote_style)
> }
> }
>
> +static void align_handler(struct ref_formatting_stack *stack)
Perhaps name it end_align_handler, to ma
Karthik Nayak writes:
> +test_expect_success 'alignment with format quote' '
> + cat >expect <<-EOF &&
> + refname is ${sq} ${sq}\\${sq}${sq}master${sq}\\${sq}${sq}
> ${sq}|
> + refname is ${sq}${sq}\\${sq}${sq}side${sq}\\${sq}${sq}
> ${sq}
Hi Jesper,
On 2015-09-02 09:45, Jesper Jørgensen wrote:
> I am learning how git works, and is using the excellent book on the
> official site.
> I believe I have located a mistake in one of the images.
> It is about Figure 3.17 on this page :
> http://git-scm.com/book/en/v2/Git-Branching-Basic-B
1 - 100 of 105 matches
Mail list logo
