On Tue, Jul 28, 2015 at 9:11 AM, Karthik Nayak wrote:
> diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
> index a67138a..897cd81 100644
> --- a/Documentation/git-branch.txt
> +++ b/Documentation/git-branch.txt
> @@ -11,7 +11,7 @@ SYNOPSIS
> 'git branch' [--color[=] | --n
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 = strlen(refname);
> + struct ref_array_item *ref = xcalloc(1, sizeof(struct ref_array_item)
> + len + 1);
> + memcpy(ref->ref
On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak wrote:
> diff --git a/ref-filter.h b/ref-filter.h
> index 7d1871d..3458595 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -5,6 +5,7 @@
> #include "refs.h"
> #include "commit.h"
> #include "parse-options.h"
> +#include "revision.h"
>
> /* Qu
On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak wrote:
> @@ -712,6 +713,15 @@ static void populate_value(struct ref_array_item *ref)
> v->modifier_atom = 1;
> v->pad_to_right = 1;
> continue;
> + } else if (starts
On Thu, Aug 20, 2015 at 6:37 PM, Matthieu Moy
wrote:
> Hi,
>
> I use 'git interpret-trailers' as a commit-msg hook to add a
> Signed-off-by in a repository.
>
> When used in a one-line commit message formatted like
> 'foo: do something', the command interprets the one-line summary as a
> trailer,
an empty line that can be ignored too.
This way we can properly process commit messages that have
only one line with something that looks like a trailer, for
example like "area of code: change we made".
Signed-off-by: Christian Couder
---
t/t7513-interpret-traile
On Sat, Aug 22, 2015 at 8:51 AM, Karthik Nayak wrote:
>
> The test t1430 'git branch shows badly named ref' has been changed to
> check the stderr for the warning regarding the broken ref. This is
> done as ref-filter throws a warning for broken refs rather than
> directly printing them.
[...]
>
When looking for the start of the trailers in the message
we are passed, we should ignore the first line of the message.
The reason is that if we are passed a patch or commit message
then the first line should be the patch title.
If we are passed only trailers we can expect that they start
with an
We currently ignore the first line passed to `git interpret-trailers`,
when looking for the beginning of the trailers.
Unfortunately this does not work well when a commit is created with a
line break in the title, using for example the following command:
git commit -m 'place of
code: change we ma
Sorry I sent the part below privately by mistake:
On Tue, Aug 25, 2015 at 11:07 PM, Matthieu Moy
wrote:
>
> Now, I found another issue: I still have this "interpret-trailers" in my
> hooks/commit-msg, and it behaves badly when I use "git commit -v". With
> -v, I get a diff in COMMIT_EDITMSG, and
On Wed, Aug 26, 2015 at 9:48 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> We currently ignore the first line passed to `git interpret-trailers`,
>> when looking for the beginning of the trailers.
>>
>> Unfortunately this does not work well when a co
> * dt/refs-bisection (2015-08-28) 5 commits
> - bisect: make bisection refs per-worktree
> - refs: make refs/worktree/* per-worktree
> - SQUASH???
> - path: optimize common dir checking
> - refs: clean up common_list
>
> Move the refs used during a "git bisect" session to per-worktree
> hie
We currently ignore the first line passed to `git interpret-trailers`,
when looking for the beginning of the trailers.
Unfortunately this does not work well when a commit is created with a
line break in the title, using for example the following command:
git commit -m 'place of
code: change we ma
On Mon, Aug 31, 2015 at 9:36 AM, Matthieu Moy
wrote:
> Junio C Hamano writes:
>
>> * ad/bisect-terms (2015-08-03) 4 commits
>> - bisect: allow setting any user-specified in 'git bisect start'
>> - bisect: add 'git bisect terms' to view the current terms
>> - bisect: add the terms old/new
>> -
Hi,
On Sun, Aug 30, 2015 at 6:38 AM, Neil Brown wrote:
>
> Hi,
> the following git-bisect log - applied to a recent linux-kernel tree
> produced different end results when I use "git bisect replay"
> and when I just run it as a shell script.
>
> $ git bisect replay /tmp/log
> We are not bisect
On Mon, Aug 31, 2015 at 10:38 AM, Matthieu Moy
wrote:
> Christian Couder writes:
>
>> That's why instead of ignoring only the first line, it is better to
>> ignore the first paragraph.
>> ---
>
> Lacks sign-off again.
Ooops, sorry.
> This replaces
On Mon, Aug 31, 2015 at 8:13 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> On Mon, Aug 31, 2015 at 10:38 AM, Matthieu Moy
>> wrote:
>>> Christian Couder writes:
>>>
>>>> That's why instead of ignoring only the first
On Mon, Aug 31, 2015 at 10:06 PM, Junio C Hamano wrote:
> David Turner writes:
>
>>> Christian, thanks for raising this one.
>>>
>>> I do recall the thread and I might be the somebody like Michael you
>>> remember, e.g. $gmane/275105---which did mention that "git bisect"
>>> would not need changi
Hi,
On Thu, Sep 3, 2015 at 12:46 AM, Johannes Schindelin
wrote:
> 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 "
Hi,
A draft of Git Rev News edition 7 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-7.md
Everyone is welcome to contribute in any section, like Matthieu
already did, either by editing the above page on GitHub and sending a
pull request, or by comment
On Sat, Sep 5, 2015 at 9:39 PM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> To salvage "interpret-trailers" needs a lot more, as we are
>> realizing that the definition that led to its external design does
>> not match the way users use footers in the real world. This affects
>> the inte
On Sat, Sep 5, 2015 at 3:39 PM, John Keeping wrote:
> It may be useful to run git-interpret-trailers without needing to be in
> a repository.
Yeah, it looks like it works fine outside a repo.
Tested-by: Christian Couder
Thanks,
Christian.
--
To unsubscribe from this list: send th
Hi everyone,
I'm happy announce that the 7th edition of Git Rev News is now published:
https://git.github.io/rev_news/2015/09/09/edition-7/
Thanks a lot to all the contributors!
Enjoy,
Christian, Thomas and Nicola.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of
Hi,
On Mon, Sep 14, 2015 at 10:42 PM, Breanna Devore-McDonald
wrote:
> Hello all,
>
> I'm a third year Computer Science student at the University of Notre
> Dame, and for the final project of my Data Structures class, my group
> and I have to find a way to contribute our (hopefully) newly-found
>
Since 77d604c (Enhanced sq_quote(), 10 Oct 2005), the
comment at the beginning of quote.c is broken.
Let's fix it.
---
quote.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/quote.c b/quote.c
index 7920e18..890885a 100644
--- a/quote.c
+++ b/quote.c
@@ -7,6 +7,7 @@ int quote_path_fully = 1;
A big comment at the beginning of quote.c is really
related to sq_quote_buf(), so let's move it in front
of this function.
---
quote.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/quote.c b/quote.c
index 890885a..fe884d2 100644
--- a/quote.c
+++ b/quote.c
@@ -4,6
On Thu, May 28, 2015 at 9:20 PM, Junio C Hamano wrote:
> SZEDER Gábor writes:
>
>> @@ -16,11 +16,12 @@ SYNOPSIS
>> 'git config' [] [type] [-z|--null] --get-all name [value_regex]
>> 'git config' [] [type] [-z|--null] --get-regexp name_regex
>> [value_regex]
>> 'git config' [] [type] [-z|--nul
On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak wrote:
> Introduce and implement 'ref_filter_clear_data()' which will free
> all allocated memory for 'ref_filter_cbdata' and its underlying array
> of 'ref_array_item'.
>
> Mentored-by: Christian Couder
On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak wrote:
>
> -static void sort_refs(struct ref_sort *sort, struct ref_array *array)
> +void sort_ref_array(struct ref_sort *sort, struct ref_array *array)
It is probably better to call the above function ref_array_sort()...
[...]
> -static struct ref
On Sun, May 31, 2015 at 10:04 AM, Christian Couder
wrote:
> On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak wrote:
>>
>> -static void sort_refs(struct ref_sort *sort, struct ref_array *array)
>> +void sort_ref_array(struct ref_sort *sort, struct ref_array *array)
>
> It
On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak wrote:
>
> -struct ref_sort {
> - struct ref_sort *next;
> - int atom; /* index into used_atom array */
Where is this used_atom array?
I searched but couldn't find it in the same file.
> - unsigned reverse : 1;
> -};
--
To unsubscr
Hi,
A draft of Git Rev News edition 4 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-4.md
Everyone is welcome to contribute in any section, like Junio and
Matthieu already did, either by editing the
above page on GitHub and sending a pull request, or
On Sun, May 31, 2015 at 11:17 AM, Karthik Nayak wrote:
> On 05/31/2015 01:41 PM, Christian Couder wrote:
>>
>> On Sun, May 31, 2015 at 10:04 AM, Christian Couder
>> wrote:
>>>
>>> On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak
>>> wrote:
>&
On Sun, May 31, 2015 at 9:13 PM, Bruce Korb wrote:
> $ git format-patch -o patches --ignore-if-in-upstream
> 14949fa8f39d29e44b43f4332ffaf35f11546502..2de9eef391259dfc8748dbaf76a5d55427f37b0d
> Segmentation fault
> /u/gnu/proj/gnu-pw-mgr
> $ git format-patch -o patches
> 14949fa8f39d29e44b43f4332f
On Sun, May 31, 2015 at 10:50 PM, Karthik Nayak wrote:
> On 06/01/2015 02:16 AM, Matthieu Moy wrote:
>>
>> You can have a preparatory patch that adds ref-filter.c containing just
>> "#include ref-filter.h" and ref-filter.h with proper content. After this
>> preparatory patch, you're in a rather si
On Sun, May 31, 2015 at 10:45 PM, Bruce Korb wrote:
> Oh, you can also clone the gnu-pw-mgr and likely get the same result:
Yeah, after cloning from http://git.savannah.gnu.org/r/gnu-pw-mgr.git
I get the following backtrace:
Program received signal SIGSEGV, Segmentation fault.
0x004b26b1
On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder
wrote:
> On Sun, May 31, 2015 at 10:45 PM, Bruce Korb wrote:
>> Oh, you can also clone the gnu-pw-mgr and likely get the same result:
>
> Yeah, after cloning from http://git.savannah.gnu.org/r/gnu-pw-mgr.git
> I get the f
On Mon, Jun 1, 2015 at 1:53 AM, Christian Couder
wrote:
> On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder
> wrote:
>> On Sun, May 31, 2015 at 10:45 PM, Bruce Korb wrote:
>>> Oh, you can also clone the gnu-pw-mgr and likely get the same result:
>>
>&
Hi Greg,
On Mon, Jun 1, 2015 at 3:54 AM, Greg KH wrote:
> On Mon, Jun 01, 2015 at 09:17:59AM +0900, Greg KH wrote:
>> Hi all,
>>
>> I received the patch attached below as part of a submission against the
>> Linux kernel tree. The patch seems to have been hand-edited, and is not
>> correct, and p
On Mon, Jun 1, 2015 at 2:01 AM, Christian Couder
wrote:
> On Mon, Jun 1, 2015 at 1:53 AM, Christian Couder
> wrote:
>> On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder
>> wrote:
>>> On Sun, May 31, 2015 at 10:45 PM, Bruce Korb wrote:
>>>> Oh, you can a
On Mon, Jun 1, 2015 at 3:44 PM, Christian Couder
wrote:
>
> The following seems to fix it, but I am not sure it is the right fix:
Ooops, I had not seen that Brian and Peff are already discussing a fix
in this thread:
http://thread.gmane.org/gmane.comp.version-control.git/270371
Hi,
Git Rev News edition 4 is now available:
https://git.github.io/rev_news/2015/06/03/edition-4/
Thanks a lot to all the helpers!
Enjoy,
Christian, Thomas and Nicola.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More ma
On Thu, Jun 4, 2015 at 9:59 AM, Antoine Delaite
wrote:
> From: Christian Couder
>
> When not looking for a regression during a bisect but for a fix or a
> change in another given property, it can be confusing to use 'good'
> and 'bad'.
>
> This patch i
Hi,
On Thu, Jun 4, 2015 at 3:04 PM, Rossella Barletta
wrote:
> Dear git group,
>
>
> I would like to ask your help for a problem that we cannot fix in any way.
>
> We have a git repository in folder on Windows.
>
> Then we use VMware player on CentOS_6 on which we create a clone of
> the git repo
On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas
wrote:
> Thanks, thanks, thanks.
>
> One last question. If I don't want to compile Git myself, how long may the pu
> branch take approx. to get into a next release?
According to:
https://github.com/git/git/blob/master/Documentation/howto/maintain-
On Fri, Jun 5, 2015 at 10:07 AM, Christian Couder
wrote:
> On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas
> wrote:
>> Thanks, thanks, thanks.
>>
>> One last question. If I don't want to compile Git myself, how long may the
>> pu branch take approx. to get in
On Fri, Jun 5, 2015 at 8:54 AM, Rossella Barletta
wrote:
[...]
> FIST ONE (PERMISSION PROBLEMS)
>
> - Repo is on windows
> - Repo folder is shared
> -Repo is a copy of another repository being on a machine in another
> city on which we cannot access. We got all the files, included the
> folder .
On Fri, Jun 5, 2015 at 6:34 PM, Louis Stuber
wrote:
>
> Signed-off-by: Louis Stuber
> Signed-off-by: Antoine Delaite
> ---
It looks like this patch applies on top of the bisect old/new series
posted by Antoine.
This should be stated somewhere.
> git-bisect.sh |8 +++-
> 1 files change
On Sat, Jun 6, 2015 at 9:04 AM, Karthik Nayak wrote:
> Version for of this patch can be found here :
> http://www.mail-archive.com/git@vger.kernel.org/msg70280.html
>
> Changes in this version:
> * Rename functions to better suit the code.
> * implement filter_refs()
> * use FLEX
On Sat, Jun 6, 2015 at 10:03 PM, Karthik Nayak wrote:
> This is a follow up series to the one posted here
> http://thread.gmane.org/gmane.comp.version-control.git/270922
>
> This patch series adds '--ponints-at', '--merged', '--no-merged' and
s/--ponints-at/--points-at/
> '--contain' options to
Please use a subject that is shorter and looks more like others on this list.
On Sun, Jun 7, 2015 at 9:54 PM, Ariel Faigon wrote:
>
> Junio,
>
> This is my 1st time doing this, sorry.
> I hope this satisfies the git Sign Off procedure.
The above lines should not be there, otherwise they will be
On Mon, Jun 8, 2015 at 10:50 AM, Konrád Lőrinczi wrote:
> I would like to group some files, so I can list group files together,
> list group changes together, filter by group for staging, also order
> by group.
> It seems, there is no such feature in GIT I would need, so I send it
> as suggestion.
On Tue, Jun 9, 2015 at 8:45 AM, Matthieu Moy
wrote:
> Antoine Delaite writes:
>
>> --- a/git-bisect.sh
>> +++ b/git-bisect.sh
>> @@ -32,6 +32,8 @@ OPTIONS_SPEC=
>>
>> _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
>> _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
>> +NAME_BAD="bad"
>> +NAME_G
On Tue, Jun 9, 2015 at 9:01 AM, Matthieu Moy
wrote:
>> Subject: Re: [PATCH 3/4] bisect: simplify the add of new bisect terms
>
> s/add/addition/
>
> Antoine Delaite writes:
>
>> +static const char *name_bad;
>> +static const char *name_good;
>
> Same remark as PATCH 2.
As for patch 2, I think "n
lly helped you, he probably
emailed you using another address.
> Mentored-by: Christian Couder
"Mentored-by:" is used by Google Summer of Code students. If someone
helps you and you want to acknowledge that, you can add an
"Helped-by:" trailer (unless your helper tells you that
On Wed, Jun 10, 2015 at 5:24 PM, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>> "Somebody else did it like that" is not a good justification. Especially
>> when the previous code was not merged: the code wasn't finished.
>>
>> But I actually disagree with the fact that it was not the idea. The
On Fri, Jun 12, 2015 at 8:29 PM, Karthik Nayak wrote:
> On 06/12/2015 11:34 PM, Junio C Hamano wrote:
>>
>> Karthik Nayak writes:
>>
What change since 9f613dd do you have in mind, exactly, though?
>>>
>>>
>>> Well initially the atoms were indexed into used_atom array, which
>>> later was rem
On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak wrote:
>
> diff --git a/ref-filter.h b/ref-filter.h
> index c2856b8..799e118 100644
> --- a/ref-filter.h
> +++ b/ref-filter.h
> @@ -50,6 +50,18 @@ struct ref_filter_cbdata {
> struct ref_filter *filter;
> };
>
> +/* Macros for checking --me
On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak wrote:
> Add a macro for using the '--contains' option in parse-options.h
> also include an optional '--with' option macro which performs the
> same action as '--contains'.
>
> Make tag.c use thi
On Tue, Jun 23, 2015 at 1:31 AM, Greg Ledger wrote:
> after adding git config ‹global user.name Greg Ledger and git config
> ‹global user.email gled...@glcdelivers.com, when I run:
> source ~/.gitconfig
The ~/.gitconfig file is not a shell script. You should not source it.
It is a text file that
On Thu, Jun 25, 2015 at 9:32 AM, Caio Marcelo de Oliveira Filho
wrote:
> In projects that use Signed-off-by, it's convenient to include that line
> in the commit by default. The commit.signoff config option allows to add
> that line in all commits automatically.
You can use a commit template.
Or
On Thu, Jun 25, 2015 at 8:50 PM, Matthieu Moy wrote:
[...]
> @@ -178,7 +183,7 @@ bisect_start() {
> } &&
> git rev-parse --sq-quote "$@" >"$GIT_DIR/BISECT_NAMES" &&
> eval "$eval true" &&
> - if test $revision_seen -eq 1 && test ! -s "$GIT_DIR/BISECT_TERMS"
> +
On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty wrote:
[...]
> +Eventually there will be no more revisions left to bisect, and the
> +command will print out a description of the first bad commit, and also
> +create a reference called `refs/bisect/bad` that points at that
> +commit.
This could
On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy
wrote:
> Christian Couder writes:
>
>> On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty
>> wrote:
>>
>> [...]
>>
>>> +Eventually there will be no more revisions left to bisect, and the
>>>
On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty wrote:
> On 06/26/2015 03:15 PM, Christian Couder wrote:
>> On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy
>> wrote:
>>> Christian Couder writes:
>>>
>>>> On Fri, Jun 26, 2
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy wrote:
>
> static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn,
> void *cb_data)
> {
> - return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn,
> cb_data);
> + struct strbuf bisect_refs = STRBUF_INIT;
>
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy wrote:
> From: Antoine Delaite
>
> Introduction of the git bisect terms command. The user can set his own
> terms. It will work exactly like before. The terms must be set before the
> start.
After looking a bit at the code, I think that for now exist
On Sat, Jun 27, 2015 at 12:25 AM, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>>> Matthieu Moy writes:
>>>
+ git bisect terms
>>>
>>> I think this is the other way around.
>>
>> Indeed.
>
> I hate to be saying this, but this is a strong indication that
> consistency with "start $bad $g
On Sat, Jun 27, 2015 at 6:25 AM, Junio C Hamano wrote:
> On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder
> wrote:
>>
>> If we don't want to support positional arguments, then I would suggest
>> supporting first the following instead:
>>
>> git
> shortened refname is printed.
>
> Mentored-by: Christian Couder
> Mentored-by: Matthieu Moy
> Signed-off-by: Karthik Nayak
> ---
> ref-filter.c | 17 -
> 1 file changed, 16 insertions(+), 1 deletion(-)
>
> diff --git a/ref-filter.c b/ref-filter
On Sat, Jun 27, 2015 at 10:02 PM, Christian Couder
wrote:
> On Thu, Jun 25, 2015 at 1:43 PM, Karthik Nayak wrote:
>
>> + if (starts_with(formatp, "lalign")) {
>> + const char *valp;
>> +
On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty wrote:
> On 06/28/2015 08:15 AM, Junio C Hamano wrote:
>> On Sat, Jun 27, 2015 at 10:51 PM, Michael Haggerty
>> wrote:
>>>
>>> I would like to remind everybody of my old claim that it would be
>>> possible to teach `git bisect` to infer by itself
On Mon, Jun 29, 2015 at 9:34 AM, Matthieu Moy
wrote:
> Christian Couder writes:
>
>> On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty
>> wrote:
>>> I understand that the user might make a mistake when marking the initial
>>> commits, but as soon as b
On Mon, Jun 29, 2015 at 11:32 AM, Matthieu Moy
wrote:
> Christian Couder writes:
[...]
> I find it particularly frustrating that we issue the message:
>
> "The merge base %s is bad.\n"
> "This means the bug has been fixed "
> "between %s an
Hi,
A draft of Git Rev News edition 5 is available here:
https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md
Everyone is welcome to contribute in any section, like Junio and
Matthieu already did, either by editing the
above page on GitHub and sending a pull request, or
On Sun, Jul 5, 2015 at 9:11 PM, Eric Sunshine wrote:
> On Sun, Jul 05, 2015 at 01:13:57PM +0200, Christian Couder wrote:
>> A draft of Git Rev News edition 5 is available here:
>> https://github.com/git/git.github.io/blob/master/rev_news/drafts/edition-5.md
>> Everyone is wel
On Mon, Jul 6, 2015 at 9:39 PM, Eric Sunshine wrote:
> On Mon, Jul 06, 2015 at 10:54:28AM -0700, Junio C Hamano wrote:
>> Eric Sunshine writes:
>> > How about this instead: prefixing with "As originally implemented",
>> > with a couple s/is/was/ thrown in...
>> >
>> > As originally implemente
Hi,
Git Rev News edition 5 is now available:
https://git.github.io/rev_news/2015/07/08/edition-5/
Thanks a lot to all the helpers!
Enjoy,
Christian, Thomas and Nicola.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More ma
On Wed, Jul 8, 2015 at 9:43 AM, Junio C Hamano wrote:
> Michael J Gruber writes:
>
>> Maybe a matter of taste, but I think in general we could do with a bit
>> less of "narrating" and more of "summarizing".
>
> True.
I think sometimes the details might be interesting for different reasons.
>> J
On Thu, Jul 9, 2015 at 12:27 PM, Karthik Nayak wrote:
> Mentored-by: Christian Couder
> Mentored-by: Matthieu Moy
> Signed-off-by: Karthik Nayak
> ---
> Documentation/git-tag.txt | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/Documentation/git-tag.txt b/D
merged into the named commit. The '--no-merged' option
> lets the user to only list tags not merged into the named commit.
> If no object is provided it assumes HEAD as the object.
>
> Add documentation and tests for the same.
>
> Mentored-by: Christian Couder
> Me
On Mon, Jul 20, 2015 at 8:24 AM, Eric Sunshine wrote:
> On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak wrote:
>> 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 options which are used in `
Hi,
It looks like we are very inconsistent in shell scripts about
indenting lines starting with "die" after a line that ends with "||",
like:
quite long command ||
die "command failed"
For example in git-rebase--interactive.sh, there is often, but not
always, an extra tab before the die.
It loo
On Fri, Jun 24, 2016 at 10:06 PM, Eric Wong wrote:
> Please don't drop Cc:, re-adding git@vger and Christian
>
> Jacob Godserv wrote:
>> > Christian (Cc-ed) also noticed the problem a few weeks ago
>> > and took a more drastic approach by having git-svn die
>> > instead of warning:
>> > http://mi
88383 s, with the git am
command launched by the rebase command taking 3.705677431 s.
With this series on top of next, the rebase took 3.044529494 s, with
the git am command launched by the rebase command taking 0.583521168
s.
Christian Couder (41):
apply: make some names more specific
app
() is called only by apply_patch() which already
returns either -1 or -128 when an error happened, let's make it also
return -1 or -128.
This makes it compatible with what find_header() and parse_binary()
already return.
Helped-by: Eric Sunshine
Signed-off-by: Christian Couder
---
bu
eturn -128 and it will exit(1) when it returns -1.
We exit() with code 128 because that was what die() was doing
and we want to keep the distinction between exiting with code 1
and exiting with code 128.
Helped-by: Eric Sunshine
Signed-off-by: Christian Couder
---
builtin/apply.c
To prepare for some structs and constants being moved from
builtin/apply.c to apply.h, we should give them some more
specific names to avoid possible name collisions in th global
namespace.
Signed-off-by: Christian Couder
---
builtin/apply.c | 20 ++--
1 file changed, 10
ned-off-by: Christian Couder
---
builtin/apply.c | 41 ++---
1 file changed, 26 insertions(+), 15 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index d3a9da2..bb1dffa 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -3900,11 +3900,12 @@
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", add_index_file() should return -1 instead of
calling die().
Signed-off-by: Christian Couder
--
To libify `git apply` functionality we must make 'struct apply_state'
usable outside "builtin/apply.c".
Let's do that by creating a new "apply.h" and moving
'struct apply_state' there.
Signed-off-by:
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", check_apply_state() should return -1 instead of
calling die().
Signed-off-by: Christian Couder
--
ase of a
real error. This will be done in a following patch.
Helped-by: Nguyễn Thái Ngọc Duy
Signed-off-by: Christian Couder
---
builtin/apply.c | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 174dbf3..0bed352 100644
--
As these functions are going to be part of the libified
apply api, let's give them a name that is more specific
to the apply api.
Signed-off-by: Christian Couder
---
builtin/apply.c | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --
ed
to init_apply_state() many times to be reused by series of calls to
the apply lib functions.
Helped-by: Nguyễn Thái Ngọc Duy
Helped-by: Johannes Schindelin
Helped-by: Eric Sunshine
Signed-off-by: Christian Couder
---
builtin/apply.c | 37 ++---
1 file changed, 26 inser
ned-off-by: Christian Couder
---
builtin/apply.c | 27 +--
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 6ec87e6..f54b8c5 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4383,6 +4383,12 @@ static int write_out_
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", remove_file() should return -1 instead of
calling die().
Signed-off-by: Christian Couder
--
To avoid possible mistakes and to uniformly show the errno
related messages, let's use error_errno() where possible.
Signed-off-by: Christian Couder
---
apply.c | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/apply.c b/apply.c
index de86f40..2ac22d3 1
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in builtin/apply.c, parse_whitespace_option() should return -1 instead
of calling die().
Signed-off-by: Christian Couder
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", parse_traditional_patch() should return -1
instead of calling die().
Signed-off-by: Christ
1 - 100 of 3241 matches
Mail list logo
