On Thu, Jul 30, 2015 at 12:49 AM, Eric Sunshine wrote:
> On Tuesday, July 28, 2015, Karthik Nayak wrote:
>> Introduce 'ref_formatting' structure to hold values of pseudo atoms
>> which help only in formatting. This will eventually be used by atoms
>> like `color` and the `padright` atom which wil
On Wed, Jul 29, 2015 at 9:26 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
>> wrote:
>>>
>>> I'm not sure what's the convention, but I think the test description
>>> should give the expected behavior even with test_expect_failure.
>>>
>>> And
> Thanks for the patch. This is already fixed in the 'next' branch by
> 2e73ab6 (Documentation/git-worktree: fix incorrect reference to file
> "locked", 2015-07-20).
You are right; sorry for the noise. I checked only maint and master.
/J
--
To unsubscribe from this list: send the line "unsubscrib
On Wed, Jul 29, 2015 at 6:37 PM, Junio C Hamano wrote:
> Johan Herland writes:
>> On Wed, Jul 29, 2015 at 7:01 AM, Junio C Hamano wrote:
>>> Johan Herland writes:
>>>
I believe it is a bad compromise. It complicates the code, and it
provides a concurrent notes merges that is unnecessa
On Wed, Jul 29, 2015 at 7:03 PM, Johan Sageryd wrote:
> Signed-off-by: Johan Sageryd
> ---
> diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
> index 3387e2f..d9d90b5 100644
> --- a/Documentation/git-worktree.txt
> +++ b/Documentation/git-worktree.txt
> @@ -39,7 +39,7
On Wed, Jul 29, 2015 at 3:20 PM, Stefan Beller wrote:
> On Wed, Jul 29, 2015 at 3:01 PM, Paul Gortmaker
> wrote:
>> The linux kernel repository has some commits in it with dates from
>> the year 1970 and also 2030 (and possibly others). We probably shouldi
>> warn people when the dates look susp
On Wed, Jul 29, 2015 at 2:30 PM, Matthieu Moy
wrote:
> Eric Sunshine writes:
>
>> Also, please explain here and in the commit message why this highly
>> specialized colorizer ('colornext'), is needed even though a more
>> general purpose one ('color') is already available.
>
> It is needed in the
On Wed, Jul 29, 2015 at 7:58 PM, David Turner wrote:
> + specially by git. Psuedorefs both have names that are all-caps,
s/Psuedo/Pseudo/
...Johan
--
Johan Herland,
www.herland.net
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@v
I'm looking at dir.c, and there's a bit I'm confused about:
prep_exclude() says:
/*
* .. and .gitignore does not exist before
* (i.e. null exclude_sha1 and skip_worktree is
* not set). Then we can skip loading .
On Mon, Jul 27, 2015 at 02:23:04PM -0700, Junio C Hamano wrote:
> * bc/object-id (2015-06-17) 10 commits
> . remote.c: use struct object_id in many functions
> . object-id: use struct object_id in struct object
> . remote.c: use struct object_id in ref_newer()
> . transport-helper.c: use struct
Signed-off-by: Johan Sageryd
---
Documentation/git-worktree.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 3387e2f..d9d90b5 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.t
On Wed, Jul 29, 2015 at 3:01 PM, Paul Gortmaker
wrote:
> The linux kernel repository has some commits in it with dates from
> the year 1970 and also 2030 (and possibly others). We probably shouldi
> warn people when the dates look suspect.
>
> For commits in the future, note that a committer in
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Junio C Hamano writes:
>>
Couldn't think of a better replacer, any suggestions would be welcome :)
>>>
>>> See below.
>>> ...
>>> One way to do all of the above is ...
>>
>> Note that is just "one way", not the only or not necessarily the
The linux kernel repository has some commits in it with dates from
the year 1970 and also 2030 (and possibly others). We probably shouldi
warn people when the dates look suspect.
For commits in the future, note that a committer in Australia
could commit on New Years Day, and send it to a maintai
Signed-off-by: Stefan Beller
---
>> The non alignment of white space harmed my feelings for aesthetics more
>> than it should have.
>
> Hmm, but this does not align curlies for OPT_DATE(),
> OPT_EXPIRY_DATE(), etc...
That's true, but that was the least invasive fix to appease the aesthetics
as i
Eric Sunshine writes:
>> @@ -1254,9 +1273,26 @@ static void emit(const char *cp, const char *ep)
>> +static void reset_formatting_state(struct ref_formatting_state *state)
>> +{
>> + int quote_style = state->quote_style;
>> + memset(state, 0, sizeof(*state));
>> + state->quote_s
Eric Sunshine writes:
> Also, please explain here and in the commit message why this highly
> specialized colorizer ('colornext'), is needed even though a more
> general purpose one ('color') is already available.
It is needed in the current form to allow
%(colornext:blue)%(ifexists:[%s]) to col
Karthik Nayak writes:
> What I was thinking of was something like this :
>
> struct strbuf format = STRBUF_INIT;
> char c = ' ';
> if (current)
> c = '*';
> strbuf_addf(&format, "%c", c, other format options...);
> show_ref_array_item(item, format.buf, quote_style, 0);
> strbuf_release(&f
Junio C Hamano writes:
> Junio C Hamano writes:
>
>>> Couldn't think of a better replacer, any suggestions would be welcome :)
>>
>> See below.
>> ...
>> One way to do all of the above is ...
>
> Note that is just "one way", not the only or not necessarily the
> best. It certainly is not the ea
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Signed-off-by: Matthieu Moy
>> ---
>> This is meant to be applied on top of kn/for-each-ref.
>
> Hmm, as 2.5 is already out and we can rewind 'next' in the coming
> couple of days, I am tempted to squash this in instead of applying
> it on top.
David Turner writes:
> Add glossary entries for both concepts.
>
> Pseudorefs and per-worktree refs do not yet have special handling,
> because the files refs backend already handles them correctly. Later,
> we will make the LMDB backend call out to the files backend to handle
> per-worktree ref
Stefan Beller writes:
> Signed-off-by: Stefan Beller
> ---
>
> The non alignment of white space harmed my feelings for aesthetics more
> than it should have.
Hmm, but this does not align curlies for OPT_DATE(),
OPT_EXPIRY_DATE(), etc...
>
> parse-options.h | 2 +-
> 1 file changed, 1 insertio
On Wed, Jul 29, 2015 at 11:51 AM, Patrick Steinhardt wrote:
> parse_connect_url() checks if the path component of the URL is
> empty and if so causes the program to die. As the function is to
> be used at other call sites which do not require this check, move
> up the error checking to the existin
Eric Sunshine writes:
>> Side Note: --format="%(padright:X)" applies to the next available atom
>> and not to the next span. I find this more accurate as I don't see why
>> we'd want to pad something of known length. But its up for discussion
>
> This isn't supported by the current %(padright:) s
Signed-off-by: Stefan Beller
---
The non alignment of white space harmed my feelings for aesthetics more
than it should have.
parse-options.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parse-options.h b/parse-options.h
index c71e9da..08d7818 100644
--- a/parse-options.h
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> The 'colornext' atom allows us to color only the succeeding atom with
> a particular color. This resets any previous color preferences set. It
> is not compatible with `padright`. This is required for printing
> formats like `git branch -vv` where
Eric Sunshine writes:
>> @@ -1254,9 +1273,26 @@ static void emit(const char *cp, const char *ep)
>> +static void reset_formatting_state(struct ref_formatting_state *state)
>> +{
>> + int quote_style = state->quote_style;
>> + memset(state, 0, sizeof(*state));
>> + state->quote_s
Eric Sunshine writes:
>> @@ -1254,9 +1273,26 @@ static void emit(const char *cp, const char *ep)
>> +static void reset_formatting_state(struct ref_formatting_state *state)
>> +{
>> + int quote_style = state->quote_style;
>> + memset(state, 0, sizeof(*state));
>> + state->quote_s
On Wed, Jul 29, 2015 at 3:38 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Tue, Jul 28, 2015 at 7:18 PM, Matthieu Moy
>> wrote:
>>> Christian Couder writes:
>>>
On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak
wrote:
> +static void ref_array_append(struct ref_array
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Add support to sort by version using the "v:refname" and
> "version:refname" option. This is achieved by using the 'versioncmp()'
> function as the comparing function for qsort.
>
> This option is included to support sorting by versions in `git tag
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Add a new atom "padright" and support %(padright:X) where X is a
> number. This will align the succeeding atom value to the left
> followed by spaces for a total length of X characters. If X is less
> than the item size, the entire atom value is p
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Changes in v6:
> * Change the flow of commits, introduce rest_formatting_state.
> * Rename
> ref_formatting -> apply_formatting_state
> apply_pseudo_state -> store_formatting_state
> * Remove the patch for making color a pseudo atom, and rename
> p
On Tuesday, July 28, 2015, Karthik Nayak wrote:
> Introduce 'ref_formatting' structure to hold values of pseudo atoms
> which help only in formatting. This will eventually be used by atoms
> like `color` and the `padright` atom which will be introduced in a
> later patch.
Isn't this commit messag
The most recent round of the discussion is here:
http://thread.gmane.org/gmane.comp.version-control.git/219505/focus=219524
--
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/majo
Aside from whether or not this change is desirable, see a few pointers
below to improve the patch...
On Monday, July 27, 2015, Sina Siadat wrote:
> Adds a new option 'o' to the 'add -p' command that lets you open and edit the
> current file.
Imperative mood: "Add a new option..."
> The existing
Dave Borowitz writes:
> It looks like git config --unset may leave an orphaned section, but a
> subsequent set adds a new section:
Old news known for at least several years. Patches welcome ;-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord.
It looks like git config --unset may leave an orphaned section, but a
subsequent set adds a new section:
$ git config --file=myconfig section.foo true
$ git config --file=myconfig --unset section.foo
$ cat myconfig
[section]
$ git config --file=myconfig section.foo true
$ cat myconfig
[section]
[s
Junio C Hamano writes:
>> Couldn't think of a better replacer, any suggestions would be welcome :)
>
> See below.
> ...
> One way to do all of the above is ...
Note that is just "one way", not the only or not necessarily the
best. It certainly is not the easiest, I think.
%(if:atom)...%(en
On Wed, Jul 29, 2015 at 3:31 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Tue, Jul 28, 2015 at 6:39 PM, Matthieu Moy
>> wrote:
>>> Karthik Nayak writes:
>>>
We check if given ref is the current branch in print_ref_list(). Move
this check to print_ref_item() where it is che
On Wed, Jul 29, 2015 at 6:16 AM, Jacob Keller wrote:
> On Tue, Jul 28, 2015 at 1:12 PM, Karthik Nayak wrote:
>> On Tue, Jul 28, 2015 at 6:39 PM, Matthieu Moy
>> wrote:
>>> Karthik Nayak writes:
>>>
We check if given ref is the current branch in print_ref_list(). Move
this check to pr
Karthik Nayak writes:
>> A handful of "huh?" on the design.
>>
>> - The atom says "if *exists*" and explanation says "has a value".
>>How are they related? Does an atom whose value is an empty
>>string has a value? Or is "ifexists" meant to be used only to
>>ignore meaningless atom
Pseudorefs should not be updated through the ref transaction
API, because alternate ref backends still need to store pseudorefs
in GIT_DIR (instead of wherever they store refs). Instead,
change update_ref and delete_ref to call pseudoref-specific
functions.
Signed-off-by: David Turner
---
refs.
Now update_ref (via write_pseudoref) does almost exactly what
write_cherry_pick_head did, so we can remove write_cherry_pick_head
and just use update_ref.
Signed-off-by: David Turner
---
sequencer.c | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/sequ
Instead of manually writing a pseudoref (in one case) and shelling out
to git update-ref (in another), use the update_ref function. This
is much simpler.
Signed-off-by: David Turner
---
bisect.c | 37 -
1 file changed, 8 insertions(+), 29 deletions(-)
diff -
Add glossary entries for both concepts.
Pseudorefs and per-worktree refs do not yet have special handling,
because the files refs backend already handles them correctly. Later,
we will make the LMDB backend call out to the files backend to handle
per-worktree refs.
Signed-off-by: David Turner
-
Add a function ref_type, which categorizes refs as per-worktree,
pseudoref, or normal ref.
Later, we will use this in refs.c to treat pseudorefs specially.
Alternate ref backends may use it to treat both pseudorefs and
per-worktree refs differently.
Signed-off-by: David Turner
---
refs.c | 26 +
This version removes the old patch 2/6, which changed notes to use
normal refs instead of pseudorefs. We don't actually want to forbid
per-worktree notes merge; instead, we want to either ensure that they
don't conflict, or use a completely different merge mechanism. So we
omit this patch.
In ad
On Wed, Jul 29, 2015 at 3:26 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Tue, Jul 28, 2015 at 6:31 PM, Matthieu Moy
>> wrote:
>>>
-static void show_detached(struct ref_list *ref_list, int maxwidth)
-{
- struct commit *head_commit =
lookup_commit_reference_gen
Matthieu Moy writes:
> Signed-off-by: Matthieu Moy
> ---
> This is meant to be applied on top of kn/for-each-ref.
Hmm, as 2.5 is already out and we can rewind 'next' in the coming
couple of days, I am tempted to squash this in instead of applying
it on top.
Thanks.
> ref-filter.c | 4 ++--
>
On Tue, Jul 28, 2015 at 11:27 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> The 'ifexists' atom allows us to print a required format if the
>> preceeding atom has a value. If the preceeding atom has no value then
>> the format given is not printed. e.g. to print "[]" we can
>> now use th
Patrick Steinhardt writes:
> We fail to guess a sensible directory name for a newly cloned
> repository when the path component of the URL is empty. E.g.
> cloning a repository 'ssh://user:passw...@example.com/' we create
> a directory 'passw...@example.com' for the clone.
>
> Fix this by ...
It
Matthieu Moy writes:
> Then, as you say, it is up to the user to remove things that Git has
> added. Why would we ask the user to do this when we have a way to have
> the tool do it?
The timeline of development, perhaps? I thought cleanup=scissors was
a fairly recent invention that hasn't been
Junio C Hamano writes:
> If we do not change anything (not even applying the [v3 2/6] patch
> we are discussing),...
This one and...
> If there are reasons/limitations that make simultaneous "notes
> merge" of different notes in different $GIT_DIRs impossible, then I
> agree we shouldn't bother
Johan Herland writes:
> On Wed, Jul 29, 2015 at 7:01 AM, Junio C Hamano wrote:
>> Johan Herland writes:
>>
>>> I believe it is a bad compromise. It complicates the code, and it
>>> provides a concurrent notes merges that is unnecessarily tied to (and
>>> dependent on) worktrees. For example, if
Karthik Nayak writes:
> On Wed, Jul 29, 2015 at 9:34 PM, Matthieu Moy
> wrote:
>> Karthik Nayak writes:
>>
>>> Ah, I hate making grammatical errors, Even though I check it always gets
>>> away.
>>> Anyways waiting for Junio and others to reply on this version. Could do a
>>> resend
>>> for th
On Wed, Jul 29, 2015 at 3:19 AM, Eric Sunshine wrote:
> On Mon, Jul 27, 2015 at 3:27 AM, Karthik Nayak wrote:
>> From: Karthik Nayak
>>
>> Since 'ref-filter' only has an option to match path names add an
>> option for plain fnmatch pattern-matching.
>>
>> This is to support the pattern matching
On Wed, Jul 29, 2015 at 3:11 AM, Eric Sunshine wrote:
> On Mon, Jul 27, 2015 at 3:27 AM, Karthik Nayak wrote:
>> Add a new atom "padright" and support %(padright:X) where X is a
>> number. This will align the succeeding atom value to the left
>> followed by spaces for a total length of X charact
On Wed, Jul 29, 2015 at 9:22 PM, Matthieu Moy wrote:
> Signed-off-by: Matthieu Moy
> ---
> This is meant to be applied on top of kn/for-each-ref.
>
> ref-filter.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/ref-filter.c b/ref-filter.c
> index 43502a4..3fbbbeb 100
On Wed, Jul 29, 2015 at 9:34 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> Ah, I hate making grammatical errors, Even though I check it always gets
>> away.
>> Anyways waiting for Junio and others to reply on this version. Could do a
>> resend
>> for this series if needed.
>
> If you too
Karthik Nayak writes:
> Ah, I hate making grammatical errors, Even though I check it always gets away.
> Anyways waiting for Junio and others to reply on this version. Could do a
> resend
> for this series if needed.
If you took all my remarks into account, I think it's worth a resend as
it sho
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> Duy Nguyen writes:
>>
>>> On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
>>> wrote:
> If the user wants whatever she types in the resulting commit
> literally, there is the "--cleanup=" option, no?
$ GIT_EDITOR=touch git comm
On Tue, Jul 28, 2015 at 9:49 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> From: Karthik Nayak
>>
>> Add support for %(objectname:size=X) where X is a number.
>> This will print the first X characters of an objectname.
>> The minimum value for X is 5. Hence any value lesser than
>> 5 wi
On Tue, Jul 28, 2015 at 12:56 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> -static void print_value(struct atom_value *v, int quote_style)
>> +static void apply_formatting_state(struct ref_formatting_state *state,
>> +struct atom_value *v, struct strbuf *va
Karthik Nayak writes:
> On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
> wrote:
>>
>> I'm not sure what's the convention, but I think the test description
>> should give the expected behavior even with test_expect_failure.
>>
>> And please help the reviewers by saying what's the status wrt this t
Matthieu Moy writes:
> Duy Nguyen writes:
>
>> On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
>> wrote:
If the user wants whatever she types in the resulting commit
literally, there is the "--cleanup=" option, no?
>>>
>>> $ GIT_EDITOR=touch git commit --cleanup=verbatim
>>> [detached
On Tue, Jul 28, 2015 at 11:23 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> On Tue, Jul 28, 2015 at 7:05 PM, Matthieu Moy
>> wrote:
>>
>>> Ideally, you could also have a modifier atom %(alignleft) [...]
>>
>> This could work for refname, as each ref_array_item holds the refname,
>> But ot
Signed-off-by: Matthieu Moy
---
This is meant to be applied on top of kn/for-each-ref.
ref-filter.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ref-filter.c b/ref-filter.c
index 43502a4..3fbbbeb 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -868,8 +868,8 @@ static i
Expose parse_connect_url which is to be used later in this patch
series.
Signed-off-by: Patrick Steinhardt
---
connect.c | 13 +
connect.h | 13 +
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/connect.c b/connect.c
index c0144d8..bdbcee4 100644
--- a/co
parse_connect_url() checks if the path component of the URL is
empty and if so causes the program to die. As the function is to
be used at other call sites which do not require this check, move
up the error checking to the existing caller.
Signed-off-by: Patrick Steinhardt
---
connect.c | 6 +++-
During cleanup we do a simple 'rm /*' to remove leftover files
from previous tests. As 'rm' errors out when there is anything it
cannot delete and there are directories present at '/' it will
throw an error, causing the '&&' chain to fail.
Fix this by explicitly removing the files.
Signed-off-by:
Test behavior of `git clone` when working with an empty path
component. This may be the case when cloning a file system's root
directory or from a remote server's root.
Signed-off-by: Patrick Steinhardt
---
t/t1509-root-worktree.sh | 39 +++
1 file changed, 39
We fail to guess a sensible directory name for a newly cloned
repository when the path component of the URL is empty. E.g.
cloning a repository 'ssh://user:passw...@example.com/' we create
a directory 'passw...@example.com' for the clone.
Fix this by using parse_connect_url to split host and path
Signed-off-by: Patrick Steinhardt
---
t/t1509-root-worktree.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index b6977d4..0c80129 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -125,7 +125
As proposed the previous patch has been changed such that we now
utilize parse_connect_url(), which splits a connect URL by host
and path components. If the path component is empty we now try to
fall back to the host component, stripping it of its port and
authentication information.
The first two
Karthik Nayak writes:
> On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
> wrote:
>
>>> - qsort(array.items, index, sizeof(struct ref_array_item *), ref_cmp);
>>> + if (!sorting) {
>>> + def_sorting.next = NULL;
>>> + def_sorting.atom = parse_ref_filter_atom(sort_typ
On Tue, Jul 28, 2015 at 1:16 PM, Jacob Keller wrote:
> On Tue, Jul 28, 2015 at 12:11 AM, Karthik Nayak wrote:
>> Add the '--points-at' option provided by 'ref-filter'. The option lets
>> the user to list only branches which points at the given object.
>>
>> Add documentation and tests for the sam
On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
wrote:
>
> I'm not sure what's the convention, but I think the test description
> should give the expected behavior even with test_expect_failure.
>
> And please help the reviewers by saying what's the status wrt this test
> (any plan on how to fix it?
Re-sending this as it wasn't sent as plain text and failed.
On Tue, Jul 28, 2015 at 7:47 PM, Matthieu Moy
wrote:
> Karthik Nayak writes:
>
>> @@ -458,7 +345,7 @@ static void add_verbose_info(struct strbuf *out, struct
>> ref_array_item *item,
>> }
>>
>> if (item->kind == REF_LOCAL_B
On Wed, Jul 29, 2015 at 7:01 AM, Junio C Hamano wrote:
> Johan Herland writes:
>
>> I believe it is a bad compromise. It complicates the code, and it
>> provides a concurrent notes merges that is unnecessarily tied to (and
>> dependent on) worktrees. For example, if I wanted to perform N
>> concu
On Wed, Jul 29, 2015 at 7:17 PM, Matthieu Moy
wrote:
> Duy Nguyen writes:
>
>> On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
>> wrote:
If the user wants whatever she types in the resulting commit
literally, there is the "--cleanup=" option, no?
>>>
>>> $ GIT_EDITOR=touch git commit --
Duy Nguyen writes:
> On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
> wrote:
>>> If the user wants whatever she types in the resulting commit
>>> literally, there is the "--cleanup=" option, no?
>>
>> $ GIT_EDITOR=touch git commit --cleanup=verbatim
>> [detached HEAD 1b136a7] # Please enter the
Hi again!
Where's this at? Your last regex looks perfect to me:
^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$
Do you need anything else from me?
Thanks,
Zoë.--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordom
On Wed, Jul 29, 2015 at 12:48 AM, Matthieu Moy
wrote:
>> If the user wants whatever she types in the resulting commit
>> literally, there is the "--cleanup=" option, no?
>
> $ GIT_EDITOR=touch git commit --cleanup=verbatim
> [detached HEAD 1b136a7] # Please enter the commit message for your change
Hello guys,
we have to turn some projects managed by Subversion into a GIT-based
solution. However the conversion unfortunately fails with an error:
== %< ==
[...]
Found branch parent: (refs/remotes/origin/tags/v_2.1.1)
450fa2c84a8fc087a2a66e5fb3d6d22096671f81
Following
Thank you for looking into this.
--
Ed Avis
--
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
Junio C Hamano writes:
> OK. So the proposal on the table is that a backslash at the
> beginning of a line is stripped.
Yes.
> Stripping part should look like this.
Thanks.
> To make it work for things like "git commit --amend", you would need
> to prefix any line that comes from the payload
Karthik Nayak writes:
> On Tue, Jul 28, 2015 at 7:18 PM, Matthieu Moy
> wrote:
>> Christian Couder writes:
>>
>>> On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak
>>> wrote:
>>>
+static void ref_array_append(struct ref_array *array, const char *refname)
+{
+ size_t len = st
Karthik Nayak writes:
> On Tue, Jul 28, 2015 at 6:39 PM, Matthieu Moy
> wrote:
>> Karthik Nayak writes:
>>
>>> We check if given ref is the current branch in print_ref_list(). Move
>>> this check to print_ref_item() where it is checked right before
>>> printing.
>>
>> This means that the '*' a
Karthik Nayak writes:
> On Tue, Jul 28, 2015 at 6:31 PM, Matthieu Moy
> wrote:
>>
>>> -static void show_detached(struct ref_list *ref_list, int maxwidth)
>>> -{
>>> - struct commit *head_commit =
>>> lookup_commit_reference_gently(head_sha1, 1);
>>> -
>>> - if (head_commit && is_descend
89 matches
Mail list logo
