[PATCH 1/3] trailer: add a trailer.trimEmpty config option

This way people who always want trimed trailers don't need to specify it on the command line. Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- builtin/interpret-trailers.c | 2 +- trailer.c| 13 ++--- trailer.h| 2 +- 3 files changed

[PATCH 2/3] trailer: add tests for trailer.trimEmpty

Signed-off-by: Christian Couder chrisc...@tuxfamily.org --- t/t7513-interpret-trailers.sh | 72 +++ 1 file changed, 72 insertions(+) diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh index bd0ab46..066d00b 100755 --- a/t/t7513

Re: [PATCH 1/3] trailer: add a trailer.trimEmpty config option

On Sat, Feb 7, 2015 at 9:20 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder chrisc...@tuxfamily.org writes: This way people who always want trimed trailers don't need to specify it on the command line. I sense that print_all() that cares about trimming illustrate a design

Re: Question about the revision walking API

Hi, On Tue, Jan 6, 2015 at 3:02 AM, Mike Hommey m...@glandium.org wrote: Hi, I would like to know if the revision walking API works as one would expect with a calling sequence like the following: - init_revisions - add_pending_object/setup_revisions - prepare_revision_walk -

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

On Tue, Mar 17, 2015 at 9:46 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Mar 17, 2015 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: Yes, but the user is supposed

Draft of Git Rev News edition 1

Hi, A draft of Git Rev News edition 1 is available here: https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-1.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub issue:

Re: Draft of Git Rev News edition 1

On Sun, Mar 22, 2015 at 12:21 PM, David Kastrup d...@gnu.org wrote: I've seen David Kastrup (dak at gnu.org) previously reimplemented significant parts of git blame for a vast gain in performance with complex histories and large files. As working on free software is his sole

Re: Promoting Git developers

On Thu, Mar 12, 2015 at 11:58 PM, Junio C Hamano gits...@pobox.com wrote: Jeff King p...@peff.net writes: Seeing my name in shortlog was nice, but not that exciting. I submitted a patch, it was taken, and of course it ends up in any automated lists of authors. What was much more rewarding was

Re: Promoting Git developers

On Wed, Mar 11, 2015 at 9:42 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Mar 10, 2015 at 6:23 PM, Junio C Hamano gits...@pobox.com wrote: I would suspect that those who agree with you would appreciate if you or somebody volunteered

Re: Promoting Git developers

On Mon, Mar 16, 2015 at 6:06 PM, Stefan Beller sbel...@google.com wrote: On Mon, Mar 16, 2015 at 2:20 AM, David Kastrup d...@gnu.org wrote: Git Annotate? Git Praise as opposed to blame? Git Who as a pun on the subcommand structure which doesn't always follows grammar? Yeah these

Re: Promoting Git developers

On Sun, Mar 15, 2015 at 11:18 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: I wrote something about a potential Git Rev News news letter: I read it. Sounds promising. Thanks! [...] I obviously do not know how the actual contents would

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

On Tue, Mar 17, 2015 at 7:33 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Mon, Mar 16, 2015 at 10:05 PM, Junio C Hamano gits...@pobox.com wrote: However, you can say git bisect bad rev (and git bisect good rev for that matter) on a rev

Re: Promoting Git developers

On Tue, Mar 17, 2015 at 10:43 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Sun, Mar 15, 2015 at 9:46 AM, Christian Couder christian.cou...@gmail.com wrote: I wrote something about a potential Git Rev News news letter: https://github.com/git/git.github.io/pull/15 I would love

Re: [PATCH v4] rev-list: refuse --first-parent combined with --bisect

On Mon, Mar 16, 2015 at 10:05 PM, Junio C Hamano gits...@pobox.com wrote: Philip Oakley philipoak...@iee.org writes: From: Junio C Hamano gits...@pobox.com Hence, if you have a history that looks like this: G...1---2---3---4---6---8---B \

Re: Promoting Git developers

On Sun, Mar 15, 2015 at 11:43 PM, Randall S. Becker rsbec...@nexbridge.com wrote: On March 15, 2015 6:19 PM Christian Couder wrote: snip Just one suggestion on the name and half a comment. How would Git Review (or Git Monthly Review, or replace your favourite how-often-per-period-ly in its

Re: git-scm.com website

On Mon, Mar 9, 2015 at 5:37 PM, David Kastrup d...@gnu.org wrote: Shawn Pearce spea...@spearce.org writes: On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote: Shawn Pearce spea...@spearce.org writes: On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber g...@drmicha.warpmail.net

Re: Promoting Git developers (was: Bashing freelancers)

On Mon, Mar 9, 2015 at 2:57 PM, Michael J Gruber g...@drmicha.warpmail.net wrote: Christian Couder venit, vidit, dixit 07.03.2015 08:18: Hi, On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote: At some point of time I think it may be worth reevaluating the toxic atmosphere

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

Hi, On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote: I wanted to make one more announcement about this, since a few more details have been posted at: http://git-merge.com/ since my last announcement. Specifically, I wanted to call attention to the contributor's summit on

Re: [GSoC microproject] Add XDG support to the credential-store helper

Hi, On Thu, Mar 5, 2015 at 9:51 PM, Luis Ressel ara...@aixah.de wrote: I'm contributing this patch in preparation for a GSoC15 application with the git project. In particular, I'm interested in the two bisect improvements listed on the Ideas page. Does anyone have other suggestions for

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

On Thu, Mar 5, 2015 at 11:24 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote: I wanted to make one more announcement about this, since a few more details have been posted

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

On Fri, Mar 6, 2015 at 11:52 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Junio C Hamano venit, vidit, dixit 05.03.2015 23:24: Christian Couder christian.cou...@gmail.com writes: I'd like the Git project to set up a more organized way to pay back the travel costs and the conference

Promoting Git developers (was: Bashing freelancers)

Hi, On Fri, Mar 6, 2015 at 6:41 PM, David Kastrup d...@gnu.org wrote: At some point of time I think it may be worth reevaluating the toxic atmosphere against freelancers doing Git development. My opinion on this is that the Git community has not been good especially lately at promoting its

Re: Promoting Git developers

On Tue, Mar 10, 2015 at 6:23 PM, Junio C Hamano gits...@pobox.com wrote: Christian Couder christian.cou...@gmail.com writes: I don't want to write again about each of these points now. I am more interested in discussing a good strategy to try to revert the sad trend of Git developers being

Git Rev News edition 1 published

Hi, Git Rev News edition 1 is now available: http://git.github.io/rev_news/edition-1.html Thanks a lot to all the contributors and helpers, especially Junio! Enjoy, Christian and Thomas. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to

Re: Draft of Git Rev News edition 1

On Mon, Mar 23, 2015 at 5:49 AM, Junio C Hamano gits...@pobox.com wrote: Thomas Ferris Nicolaisen tfn...@gmail.com writes: Good point. There hasn't been a decision on frequency. Weekly is a good rhythm for publications seeking readership, but that's a lot of work. My vote is we should first

Re: [msysGit] Re: [RFH] GSoC 2015 application

On Wed, Feb 25, 2015 at 9:44 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: Hi Matthieu, On 2015-02-25 00:56, Matthieu Moy wrote: Johannes Schindelin johannes.schinde...@gmx.de writes: On 2015-02-24 19:25, Junio C Hamano wrote: On Tue, Feb 24, 2015 at 9:32 AM, Matthieu Moy

Re: [PATCH] apply: refuse touching a file beyond symlink

On Thu, Jan 29, 2015 at 9:45 PM, Junio C Hamano gits...@pobox.com wrote: Instead, for any patch in the input that leaves a path (i.e. a non deletion) in the result, we check all leading paths against interim result and then either the index or the working tree. The interim results of

Re: gitk won't show notes?

On Sat, Apr 11, 2015 at 12:31 PM, Paul Mackerras pau...@samba.org wrote: On Wed, Apr 08, 2015 at 01:51:40PM +0200, Michael J Gruber wrote: Phillip Susi venit, vidit, dixit 07.04.2015 19:08: On 4/7/2015 10:13 AM, Michael J Gruber wrote: Seriously: gitk knows F5 and Shift-F5 for refresh, and I

Draft of Git Rev News edition 2

Hi, A draft of Git Rev News edition 2 is available here: https://github.com/git/git.github.io/blob/master/rev_news/draft/edition-2.md Everyone is welcome to contribute in any section either by editing the above page on GitHub and sending a pull request, or by commenting on this GitHub issue:

[ANNOUNCE] Git Rev News edition 2 published

Hi, Git Rev News edition 2 is now available: https://git.github.io/rev_news/2015/04/05/edition-2/ 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

Re: [ANNOUNCE] Git Merge Contributors Summit, April 8th, Paris

On Mon, Apr 6, 2015 at 12:48 AM, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: On Tue, Feb 24, 2015 at 11:09 PM, Jeff King p...@peff.net wrote: I wanted to make one more announcement about this, since a few more details have been posted at: http://git-merge.com/ since my last

Re: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas andreas.gon...@dwpbank.de 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:

Re: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

On Fri, Jun 5, 2015 at 10:07 AM, Christian Couder christian.cou...@gmail.com wrote: On Fri, Jun 5, 2015 at 7:56 AM, Gondek, Andreas andreas.gon...@dwpbank.de wrote: Thanks, thanks, thanks. One last question. If I don't want to compile Git myself, how long may the pu branch take approx

Re: Suggestion: group files in GIT

On Mon, Jun 8, 2015 at 10:50 AM, Konrád Lőrinczi klorin...@gmail.com 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

Re: PATCH [git/contrib] Avoid failing to create ${__git_tcsh_completion_script} when 'set noclobber' is in effect (af7333c)

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 github.2...@yendor.com 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,

Re: [RFC/PATCH 0/9] add options to ref-filter

On Sat, Jun 6, 2015 at 10:03 PM, Karthik Nayak karthik@gmail.com 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/

Re: [PATCH 1/1]: git-completion.tcsh fails w/ noclobber

, he probably emailed you using another address. Mentored-by: Christian Couder christian.cou...@gmail.com 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 you can add

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

On Tue, Jun 9, 2015 at 9:01 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Subject: Re: [PATCH 3/4] bisect: simplify the add of new bisect terms s/add/addition/ Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr writes: +static const char *name_bad; +static const char

Re: [PATCH 2/4] bisect: replace hardcoded bad|good by variables

On Tue, Jun 9, 2015 at 8:45 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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]'

Re: Permission denied ONLY after pulling bundles

On Fri, Jun 5, 2015 at 8:54 AM, Rossella Barletta rossella.barle...@gmail.com 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,

Re: [PATCH 1/2] git-bisect.sh : create a file if the bisection is in old/new mode, named BISECT_OLDNEWMODE, so it can easily be seen outside the program without having to read BISECT_TERMS. This wil

On Fri, Jun 5, 2015 at 6:34 PM, Louis Stuber stub...@ensimag.grenoble-inp.fr wrote: Signed-off-by: Louis Stuber stub...@ensimag.grenoble-inp.fr Signed-off-by: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr --- It looks like this patch applies on top of the bisect old/new series

Re: [WIP/PATCH v5 0/10] create ref-filter from for-each-ref

On Sat, Jun 6, 2015 at 9:04 AM, Karthik Nayak karthik@gmail.com 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() *

[ANNOUNCE] Git Rev News edition 4

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

Re: Permission denied ONLY after pulling bundles

Hi, On Thu, Jun 4, 2015 at 3:04 PM, Rossella Barletta rossella.barle...@gmail.com 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

Re: [WIP PATCH 1/3] git bisect old/new

On Thu, Jun 4, 2015 at 9:59 AM, Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr wrote: From: Christian Couder chrisc...@tuxfamily.org 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

Re: [PATCH v9 4/5] bisect: add the terms old/new

On Thu, Jun 25, 2015 at 8:50 PM, Matthieu Moy matthieu@imag.fr 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 +

Re: [PATCH] commit: add commit.signoff config option

On Thu, Jun 25, 2015 at 9:32 AM, Caio Marcelo de Oliveira Filho cmarc...@gmail.com 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

Re: config commands not working _Noobe question

On Tue, Jun 23, 2015 at 1:31 AM, Greg Ledger gled...@glcdelivers.com 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

Re: [PATCH] bisect: revise manpage

On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 06/26/2015 03:15 PM, Christian Couder wrote: On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM

Re: [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option

, the entire shortened refname is printed. Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by: Matthieu Moy matthieu@grenoble-inp.fr Signed-off-by: Karthik Nayak karthik@gmail.com --- ref-filter.c | 17 - 1 file changed, 16 insertions(+), 1 deletion

Re: [PATCH v10 5/7] bisect: simplify the addition of new bisect terms

On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy matthieu@imag.fr 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 =

Re: [PATCH v10 7/7] bisect: allow any terms set by user

On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy matthieu@imag.fr wrote: From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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.

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

On Sat, Jun 27, 2015 at 12:25 AM, Junio C Hamano gits...@pobox.com wrote: Matthieu Moy matthieu@imag.fr writes: Matthieu Moy matthieu@imag.fr writes: + git bisect terms term-old term-new I think this is the other way around. Indeed. I hate to be saying this, but this is a strong

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

On Sat, Jun 27, 2015 at 6:25 AM, Junio C Hamano gits...@pobox.com wrote: On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder christian.cou...@gmail.com wrote: If we don't want to support positional arguments, then I would suggest supporting first the following instead: git bisect

Re: [PATCH 4/4] bisect: add the terms old/new

On Wed, Jun 10, 2015 at 5:24 PM, Junio C Hamano gits...@pobox.com wrote: Matthieu Moy matthieu@grenoble-inp.fr 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

Re: [PATCH v2 05/11] ref-filter: add parse_opt_merge_filter()

On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak karthik@gmail.com 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

Re: [PATCH v2 09/11] parse-options.h: add macros for '--contains' option

On Sat, Jun 13, 2015 at 10:18 PM, Karthik Nayak karthik@gmail.com 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 this new macro Mentored-by: Christian

Re: [PATCH v7 03/12] for-each-ref: change comment in ref_sort

On Fri, Jun 12, 2015 at 8:29 PM, Karthik Nayak karthik@gmail.com wrote: On 06/12/2015 11:34 PM, Junio C Hamano wrote: Karthik Nayak karthik@gmail.com writes: What change since 9f613dd do you have in mind, exactly, though? Well initially the atoms were indexed into used_atom array,

Re: [PATCH v2 1/2] config: add options to list only variable names

On Thu, May 28, 2015 at 9:20 PM, Junio C Hamano gits...@pobox.com wrote: SZEDER Gábor sze...@ira.uka.de writes: @@ -16,11 +16,12 @@ SYNOPSIS 'git config' [file-option] [type] [-z|--null] --get-all name [value_regex] 'git config' [file-option] [type] [-z|--null] --get-regexp name_regex

Re: seg fault in git format-patch

On Sun, May 31, 2015 at 9:13 PM, Bruce Korb bruce.k...@gmail.com 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

Re: seg fault in git format-patch

On Sun, May 31, 2015 at 10:45 PM, Bruce Korb bruce.k...@gmail.com 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

Re: [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h'

On Sun, May 31, 2015 at 10:50 PM, Karthik Nayak karthik@gmail.com 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

Re: seg fault in git format-patch

On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder christian.cou...@gmail.com wrote: On Sun, May 31, 2015 at 10:45 PM, Bruce Korb bruce.k...@gmail.com 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

Re: seg fault in git format-patch

On Mon, Jun 1, 2015 at 1:53 AM, Christian Couder christian.cou...@gmail.com wrote: On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder christian.cou...@gmail.com wrote: On Sun, May 31, 2015 at 10:45 PM, Bruce Korb bruce.k...@gmail.com wrote: Oh, you can also clone the gnu-pw-mgr and likely get

Re: Bug in 'git am' when applying a broken patch

Hi Greg, On Mon, Jun 1, 2015 at 3:54 AM, Greg KH gre...@linuxfoundation.org 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

Re: seg fault in git format-patch

On Mon, Jun 1, 2015 at 3:44 PM, Christian Couder christian.cou...@gmail.com 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

Re: seg fault in git format-patch

On Mon, Jun 1, 2015 at 2:01 AM, Christian Couder christian.cou...@gmail.com wrote: On Mon, Jun 1, 2015 at 1:53 AM, Christian Couder christian.cou...@gmail.com wrote: On Mon, Jun 1, 2015 at 1:14 AM, Christian Couder christian.cou...@gmail.com wrote: On Sun, May 31, 2015 at 10:45 PM, Bruce Korb

Re: [WIP/PATCH v4 5/8] for-each-ref: introduce 'ref_filter_clear_data()'

On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak karthik@gmail.com 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 christian.cou...@gmail.com

Re: [WIP/PATCH v4 8/8] ref-filter: add 'ref-filter.h'

On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak karthik@gmail.com 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;

Re: [WIP/PATCH v4 6/8] for-each-ref: rename some functions and make them public

On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak karthik@gmail.com 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()... [...]

Re: [WIP/PATCH v4 6/8] for-each-ref: rename some functions and make them public

On Sun, May 31, 2015 at 10:04 AM, Christian Couder christian.cou...@gmail.com wrote: On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak karthik@gmail.com wrote: -static void sort_refs(struct ref_sort *sort, struct ref_array *array) +void sort_ref_array(struct ref_sort *sort, struct ref_array

Draft of Git Rev News edition 4

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

Re: [WIP/PATCH v4 6/8] for-each-ref: rename some functions and make them public

On Sun, May 31, 2015 at 11:17 AM, Karthik Nayak karthik@gmail.com wrote: On 05/31/2015 01:41 PM, Christian Couder wrote: On Sun, May 31, 2015 at 10:04 AM, Christian Couder christian.cou...@gmail.com wrote: On Sat, May 30, 2015 at 7:53 PM, Karthik Nayak karthik@gmail.com wrote

Re: [PATCH 1.5/2] config: add options to list only variable names

On Wed, May 27, 2015 at 10:11 PM, SZEDER Gábor sze...@ira.uka.de wrote: Recenty I created a multi-line branch description with '.' and '=' characters on one of the lines, and noticed that fragments of that line show up when completing set variable names for 'git config', e.g.: $ git config

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

On Mon, Jun 29, 2015 at 11:32 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com 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 and [%s

Re: [RFC/PATCH 1/9] ref-filter: add %(refname:lalignX) option

On Sat, Jun 27, 2015 at 10:02 PM, Christian Couder christian.cou...@gmail.com wrote: On Thu, Jun 25, 2015 at 1:43 PM, Karthik Nayak karthik@gmail.com wrote: + if (starts_with(formatp, lalign)) { + const char *valp

Draft of Git Rev News edition 5

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

Re: Draft of Git Rev News edition 5

On Sun, Jul 5, 2015 at 9:11 PM, Eric Sunshine sunsh...@sunshineco.com 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 welcome

Re: Pushing and pulling the result of `git replace` and objects/info/alternates

On Mon, May 25, 2015 at 11:49 AM, Stephen Kelly steve...@gmail.com wrote: On 05/24/2015 07:28 AM, Christian Couder wrote: Hi, On Fri, May 22, 2015 at 4:38 PM, Stephen Kelly steve...@gmail.com wrote: I have tried out using `git replace --graft` and .git/objects/info/alternates to 'refer

Re: [PATCH 2/4] ref-filter: add ref-filter API

On Sat, May 23, 2015 at 4:42 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: karthik nayak karthik@gmail.com writes: At some point, I'd expect something like filtered_list_of_refs = filer(full_list_of_refs, description_of_filter); That would remove some refs from

Re: Pushing and pulling the result of `git replace` and objects/info/alternates

Hi, On Fri, May 22, 2015 at 4:38 PM, Stephen Kelly steve...@gmail.com wrote: Hello, I have an 'integration repo' which contains other git repos as submodules. One of the submodules is to be split in two to extract a library. A common way of doing that is to use git-filter-branch. A

Re: Troubleshoot clone issue to NFS.

On Thu, May 21, 2015 at 3:13 PM, steve.nor...@thomsonreuters.com wrote: [...] So the questions are: 1) Should I expect a clone to NFS to be that much slower? 2) Is there anything I could do to speed it up (I've tried --bare as that is what the repositories will be when stored on NFS and

Re: Pushing and pulling the result of `git replace` and objects/info/alternates

On Tue, May 26, 2015 at 4:10 PM, Stephen Kelly steve...@gmail.com wrote: On Tue, May 26, 2015 at 12:39 PM, Christian Couder christian.cou...@gmail.com wrote: 1) How would Alice push the content to a remote host so that Bob would get that automatically? I am not sure what you want exactly

Re: [PATCH v3 7/8] branch.c: use 'ref-filter' APIs

On Sat, Aug 22, 2015 at 8:51 AM, Karthik Nayak karthik@gmail.com 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

[PATCH] trailer: ignore first line of message

with 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 chrisc...@tuxfamily.org --- t/t7513-interpret-trailers.sh | 15

Re: Minor annoyance with 'git interpret-trailers'

On Thu, Aug 20, 2015 at 6:37 PM, Matthieu Moy matthieu@grenoble-inp.fr 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

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 06/28/2015 08:15 AM, Junio C Hamano wrote: On Sat, Jun 27, 2015 at 10:51 PM, Michael Haggerty mhag...@alum.mit.edu wrote: I would like to remind everybody of my old claim that it would be possible to teach `git

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

On Mon, Jun 29, 2015 at 9:34 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Sun, Jun 28, 2015 at 8:46 AM, Michael Haggerty mhag...@alum.mit.edu wrote: I understand that the user might make a mistake when marking the initial

Re: [PATCH] bisect: revise manpage

On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu 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

Re: [PATCH] bisect: revise manpage

On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +Eventually there will be no more revisions left to bisect

Re: [RFC/PATCH 09/11] branch.c: use 'ref-filter' data structures

On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak karthik@gmail.com 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 /*

Re: [RFC/PATCH 10/11] branch.c: use 'ref-filter' APIs

On Tue, Jul 28, 2015 at 9:11 AM, Karthik Nayak karthik@gmail.com 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'

Re: [RFC/PATCH 09/11] branch.c: use 'ref-filter' data structures

On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak karthik@gmail.com 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); +

Re: [RFC/PATCH 02/11] ref-filter: add 'colornext' atom

On Tue, Jul 28, 2015 at 8:56 AM, Karthik Nayak karthik@gmail.com wrote: @@ -712,6 +713,15 @@ static void populate_value(struct ref_array_item *ref) v-modifier_atom = 1; v-pad_to_right = 1; continue; + }

Indenting lines starting with die in shell after ||

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 looks

Re: [PATCH v3 9/9] tag.c: implement '--merged' and '--no-merged' options

. 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 christian.cou...@gmail.com Mentored-by: Matthieu Moy matthieu@grenoble

Re: [PATCH v3 5/9] ref-filter: add option to match literal pattern

On Mon, Jul 20, 2015 at 8:24 AM, Eric Sunshine sunsh...@sunshineco.com wrote: On Sat, Jul 18, 2015 at 3:12 PM, Karthik Nayak karthik@gmail.com 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

Watchman/inotify support and other ways to speed up git status

Hi everyone, I am starting to investigate ways to speed up git status and other git commands for Booking.com (thanks to AEvar) and I'd be happy to discuss the current status or be pointed to relevant documentation or mailing list threads. >From the threads below ([0], [1], [2], [3], [4], [5],

Re: Watchman/inotify support and other ways to speed up git status

On Wed, Oct 28, 2015 at 12:54 AM, David Turner <dtur...@twopensource.com> wrote: > > On Thu, 2015-10-22 at 07:59 +0200, Christian Couder wrote: >> Hi everyone, >> >> I am starting to investigate ways to speed up git status and other git >> commands for B

Re: Make "git checkout" automatically update submodules?

On Fri, Oct 23, 2015 at 5:46 AM, Kannan Goundan wrote: > Junio C Hamano pobox.com> writes: > >> We are unfortunately not set up to handle money well. For a >> background explanation, please go read [*1*], which I wrote my take >> on "money" some time ago. Note that it is an

<    3   4   5   6   7   8   9   10   11   12   >