Re: Small rerere in rebase regression

Hi Hannes, On Wed, 25 May 2016, Johannes Schindelin wrote: > On Tue, 24 May 2016, Johannes Sixt wrote: > > > Could not apply fa62fea... mastergittest@master|REBASE-i 1/1:1008> 5~ > > > > (Take note of the missing LF at the end of the message.) > > Oops. Good catch, thank you! I just fixed

Re: Small rerere in rebase regression

Hi Hannes, On Tue, 24 May 2016, Johannes Sixt wrote: > Am 24.05.2016 um 15:18 schrieb Johannes Schindelin: > > Hannes, could you quickly test whether > > https://github.com/dscho/git/tree/interactive-rebase calls rerere twice, > > too? (Please call interactive rebase with the

Re: [PATCH v8 2/3] bisect: rewrite `check_term_format` shell function in C

Hey Johannes, On Wed, May 25, 2016 at 10:34 AM, Johannes Schindelin wrote: > Hi Pranit, > > I think this patch series is now in a fine shape. Just one minor nit: Thanks! > On Tue, 24 May 2016, Pranit Bauva wrote: > >> + OPT_CMDMODE(0,

Re: [BUG] can not escape sharps in git config file

On 05/24/2016 01:23 PM, Jean-Noël Avila wrote: My mistake, sorry for the noise, JFTR: * only double quotes can fully escape a string (it is safer to enclose the whole value in double quotes) * backslashes have to be doubled because they are interpreted by git So [filter "kicad_sch"]

Re: [PATCH v8 2/3] bisect: rewrite `check_term_format` shell function in C

Hi Pranit, I think this patch series is now in a fine shape. Just one minor nit: On Tue, 24 May 2016, Pranit Bauva wrote: > + OPT_CMDMODE(0, "check-term-format", , > + N_("check format of the term"), CHECK_TERM_FMT), Just like with cmd_mode and CMD_MODE, it

Offre de prêts

Bonjour Vous aviez besoin de prêts d'argent entre particuliers pour faire face aux difficultés financières pour enfin sortir de l'impasse que provoquent les banques, par le rejet de vos dossiers de demande de crédits ? Je suis un un citoyen français a la retraite en mesure de vous faire un prêt

Re: Odd Difference Between Windows Git and Standard Git

On 05/24/2016 01:57 PM, Johannes Schindelin wrote: Hi, On Tue, 24 May 2016, Torsten Bögershausen wrote: On 05/23/2016 08:52 PM, Junio C Hamano wrote: Johannes Schindelin writes: Of course, if you are doing network mount between systems with and without filemode

Re: Please add a git config option to make --show-signature the default

On Tue, May 24, 2016 at 6:20 AM, Johannes Schindelin wrote: > Hi Austin, > > On Mon, 23 May 2016, Austin English wrote: > >> As stated in title, I'd like to see an option to enable GPG signature >> by default. > > I see an option was mentioned in the mail's subject

[PATCH] daemon: enable SO_KEEPALIVE for all sockets

While --init-timeout and --timeout options exist and I've never run git-daemon without them, some users may forget to set them and encounter hung daemon processes when connections fail. Enable socket-level timeouts so the kernel can send keepalive probes as necessary to detect failed connections.

[PATCH] add: add --chmod=+x / --chmod=-x options

Users on deficient filesystems that lack an execute bit may still wish to add files to the repository with the appropriate execute bit set (or not). Although this can be done in two steps (`git add foo && git update-index --chmod=+x foo`), providing the `--chmod=+x` option to the add command

[PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

Check that we are configured to display colors in the given context when the user specifies a format string of `%C(auto)`. This brings that behavior in line with the behavior of `%C(auto,)`, which will display the given color only when the configuration specifies to do so. This allows the user

Re: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

On Tue, May 24, 2016 at 05:55:02PM -0700, Junio C Hamano wrote: > Looks obviously the right thing to do from a cursory read. > Missing sign-off? Yes, apologies for the oversight; will re-send. Thanks- -ed -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message

Re: [PATCH/RFC 0/6] pack-objects hook for upload-pack

On Wed, May 18, 2016 at 3:37 PM, Jeff King wrote: > I've often wanted to intercept the call from upload-pack to > pack-objects. The final patch in this series goes into more detail, but > basically it's good for: > > 1. Capturing the output from pack-objects for

Re: [PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

On Tue, May 24, 2016 at 12:48 PM, Edward Thomson wrote: > Check that we are configured to display colors in the given context when > the user specifies a format string of `%C(auto)`, instead of always > displaying the default color for the given context. This makes >

Re: [PATCH v7 1/2] http.c: implement the GIT_TRACE_CURL environment variable

On Mon, May 23, 2016 at 6:44 AM, Elia Pinto wrote: > +static void curl_dump_header(const char *text, unsigned char *ptr, size_t > size, int hide_sensitive_header) > +{ > + struct strbuf out = STRBUF_INIT; > + const char *sensitive_header; This variable now

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

On 05/25/16 00:30, Aaron Schrab wrote: > At 14:49 +0200 24 May 2016, Matthieu Moy > wrote: >> Samuel GROOT writes: >> >>> What kind of help text would you want to see? >>> >>> Maybe something like this: >>> >>> GIT: Quoted message

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

On 05/23/2016 10:00 PM, Matthieu Moy wrote: I don't think this is right: I often reply to an email with a single patch, for which it would clearly be overkill to have a cover-letter. Yes indeed, we are working on inserting the quoted message body in the patch's "below-triple-dash" section.

Re: [BUG?] Spaces not allowed in directory names in .git/info/attributes

On Mon, May 23, 2016 at 1:30 PM, Junio C Hamano wrote: > Nathan Collins writes: > >> Example session: >> >> $ git init test.git >> Initialized empty Git repository in /tmp/test.git/.git/ >> $ cd test.git >> $ mkdir "dir name" >> $

Re: [WIP PATCH 00/14] Protocol v2 patches

On Wed, May 25, 2016 at 5:46 AM, David Turner wrote: > I was looking at this again today, and noticed that it doesn't really > address the HTTP case. > > The central problem is that protocol v2 goes like this: > server: I have capabilities w,x,y, and z > client: I want

Re: [BUG?] Spaces not allowed in directory names in .git/info/attributes

Duy Nguyen writes: > Maybe bring back [1] (cquoting paths) and optionally optionally with > backslash escaping? The conclusion at the end of that thread seems to > be "ok, we may break rare setups, we just need to be upfront about > it". Yup, even though I do not think this

Re: [WIP PATCH 00/14] Protocol v2 patches

I was looking at this again today, and noticed that it doesn't really address the HTTP case. The central problem is that protocol v2 goes like this: server: I have capabilities w,x,y, and z client: I want capabilities x and z. But HTTP goes like this: client: [request] server: [response] I

Re: [Opinion gathering] Git remote whitelist/blacklist

At 14:55 +0200 24 May 2016, Matthieu Moy wrote: So, when trying a forbidden push, Git would deny it and the only way to force the push would be to remove the blacklist from the config, right? Probably the sanest way to go. I thought about adding a "git push

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

At 14:49 +0200 24 May 2016, Matthieu Moy wrote: Samuel GROOT writes: What kind of help text would you want to see? Maybe something like this: GIT: Quoted message body below. GIT: Feel free to trim down the quoted text GIT:

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

Matthieu Moy writes: >> More importantly, when is this function evaluated and returned value >> used to fill commit_editmsg_path[]? > > I may have missed something, but I'd say "never", as the code is not > compilable at least with my gcc: It was a rhetorical

Re: [PATCH] userdiff: add built-in pattern for CSS

William Duclot writes: > I did have considered IPATTERN(), but assumed that case-sensitive was > default and case-insensitive was the exception. Don't assume, but ask ;-) > As the CSS pattern > does not deal with letters at all it seemed sensible to me

Re: [PATCH] userdiff: add built-in pattern for CSS

> It is not a big deal for a small single-patch topic like this, but > it often is hard to reviewers if you do not respond to comments you > received and instead just send a new version of the patch with > "changes since..." comment. Please make it a habit to do both. Apologies, I am not quite

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

Samuel GROOT wrote: > On 05/23/2016 09:55 PM, Eric Wong wrote: > >Cool! There should probably be some help text to encourage > >trimming down the quoted text to only relevant portions. > > What kind of help text would you want to see? > > Maybe something like

Re: [PATCH] transport, send-pack: append period to up-to-date message

On Tue, May 24, 2016 at 1:51 PM, Yong Bakos wrote: > Appending a period to "Everything up-to-date" makes the output message > consistent with similar output in builtin/merge.c. > > Signed-off-by: Yong Bakos > --- > builtin/send-pack.c | 2 +- >

[PATCH] transport, send-pack: append period to up-to-date message

Appending a period to "Everything up-to-date" makes the output message consistent with similar output in builtin/merge.c. Signed-off-by: Yong Bakos --- builtin/send-pack.c | 2 +- transport.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git

RE: [Opinion gathering] Git remote whitelist/blacklist

On May 24, 2016 3:25 PM Lars Schneider wrote: > > On 24 May 2016, at 12:16, Randall S. Becker > wrote: > > > > On May 24, 2016 12:08 PM, Matthieu Moy wrote: > >>> So, when trying a forbidden push, Git would deny it and the only way > >>> to force the push would be to

Re: Small rerere in rebase regression

Am 24.05.2016 um 00:11 schrieb Junio C Hamano: Johannes Sixt writes: However, calling "git rerere" after a failed "git commit" may be destructive: it would record a resolution even though the commit has not be completed. Think of an squash commit being aborted because the user

[PATCH] format_commit_message: honor `color=auto` for `%C(auto)`

Check that we are configured to display colors in the given context when the user specifies a format string of `%C(auto)`, instead of always displaying the default color for the given context. This makes `%C(auto)` obey the `color=auto` setting and brings its behavior in line with the behavior of

Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

Junio C Hamano writes: > Others, I am not sure how seriously we would want to support those > who use "set -u"; the damage to test-lib.sh so far (see below) does > not look _too_ bad, but the reason why I have "set -u" after > including lib-bash.sh is because it will trigger a

Re: Small rerere in rebase regression

Am 24.05.2016 um 15:18 schrieb Johannes Schindelin: Hannes, could you quickly test whether https://github.com/dscho/git/tree/interactive-rebase calls rerere twice, too? (Please call interactive rebase with the GIT_USE_REBASE_HELPER=true to avoid running the interactive rebase twice.) I have a

Re: Signing off, for now

David Turner writes: > June 3rd will be my last day at Twitter. I hope that my new job > (starting in July after a month of vacation) will give me time to work > on Git, but I don't know exactly what parts I'll be working on, or on > what schedule. Thanks for your

Re: [Opinion gathering] Git remote whitelist/blacklist

> On 24 May 2016, at 12:16, Randall S. Becker wrote: > > On May 24, 2016 12:08 PM, Matthieu Moy wrote: >>> So, when trying a forbidden push, Git would deny it and the only way >>> to force the push would be to remove the blacklist from the config, right? >>> >>>

Re: [Opinion gathering] Git remote whitelist/blacklist

Junio C Hamano writes: > On Tue, May 24, 2016 at 5:55 AM, Matthieu Moy > wrote: >> So, when trying a forbidden push, Git would deny it and the only way to >> force the push would be to remove the blacklist from the config, right? >> >> Probably

[PATCH v2] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

This is a follow up commit for f932729c (memoize common git-path "constant" files, 10-Aug-2015). The many function calls to git_path() are replaced by git_path_commit_editmsg() and which thus eliminates the need to repeatedly compute the location of "COMMIT_EDITMSG". Mentored-by: Lars Schneider

Signing off, for now

June 3rd will be my last day at Twitter. I hope that my new job (starting in July after a month of vacation) will give me time to work on Git, but I don't know exactly what parts I'll be working on, or on what schedule. As a result, some of my patchsets may get significantly less of my

Re: [Opinion gathering] Git remote whitelist/blacklist

> On 24 May 2016, at 12:07, Junio C Hamano wrote: > > On Tue, May 24, 2016 at 5:55 AM, Matthieu Moy > wrote: >> So, when trying a forbidden push, Git would deny it and the only way to >> force the push would be to remove the blacklist from the

Re: [PATCH] userdiff: add built-in pattern for CSS

William Duclot writes: > CSS is widely used, motivating it being included as a built-in pattern. > > It must be noted that the word_regex for CSS (i.e. the regex defining > what is a word in the language) does not consider '.' and '#' characters > (in CSS

[PATCH v9 1/3] bisect--helper: use OPT_CMDMODE instead of OPT_BOOL

`--next-all` is meant to be used as a subcommand to support multiple "operation mode" though the current implementation does not contain any other subcommand along side with `--next-all` but further commits will include some more subcommands. Helped-by: Johannes Schindelin

[PATCH v9 3/3] bisect--helper: `write_terms` shell function in C

Reimplement the `write_terms` shell function in C and add a `write-terms` subcommand to `git bisect--helper` to call it from git-bisect.sh . Also remove the subcommand `--check-term-format` as it can now be called from inside the function write_terms() C implementation. Also `|| exit` is added

[PATCH v9 2/3] bisect: rewrite `check_term_format` shell function in C

Reimplement the `check_term_format` shell function in C and add a `--check-term-format` subcommand to `git bisect--helper` to call it from git-bisect.sh Using `--check-term-format` subcommand is a temporary measure to port shell function to C so as to use the existing test suite. As more

[PATCH v9 0/3] bisect--helper: check_term_format() and write_terms()

Here is the link to v8[1]. This has a few modifications. Changes wrt v8 as suggested by Christian are: * Remove the redundant `|| exit` Pranit Bauva (3): bisect--helper: use OPT_CMDMODE instead of OPT_BOOL bisect: rewrite `check_term_format` shell function in C bisect--helper:

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

Richard Braun writes: > On Tue, May 24, 2016 at 11:17:28AM -0700, Junio C Hamano wrote: >> Pinging... > > Hum, see [1]. > > Tell me if I need to resend. Sorry, check the "To:" field of the message you are responding to. The ping was not meant to (and was not addressed to) you.

Re: [PATCH v7 2/2] convert: ce_compare_data() checks for a sha1 of a path

tbo...@web.de writes: > From: Torsten Bögershausen > > To compare a file in working tree with the index, convert_to_git() is used, > the result is hashed and the hash value compared with ce->sha1. > > Deep down would_convert_crlf_at_commit() is invoked, to check if CRLF > are

Re: [PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

Hey Christian, On Tue, May 24, 2016 at 1:03 PM, Christian Couder wrote: > On Tue, May 24, 2016 at 9:21 AM, Pranit Bauva wrote: >> diff --git a/git-bisect.sh b/git-bisect.sh >> index 7d7965d..cd39bd0 100755 >> --- a/git-bisect.sh >> +++

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

On Tue, May 24, 2016 at 11:17:28AM -0700, Junio C Hamano wrote: > Pinging... Hum, see [1]. Tell me if I need to resend. -- Richard Braun Pacte Novation / Novasys Ingénierie [1] http://git.661346.n2.nabble.com/PATCH-gitweb-fix-link-to-parent-diff-with-pathinfo-td7655482.html -- To unsubscribe

Re: [PATCH] gitweb: fix link to parent diff with pathinfo

Richard Braun writes: > Gitweb, when used with PATH_INFO, shows a link to parent diff > like http://somedomain/somerepo.git/commitdiff/somehash?hp=parenthash. > That link reports "400 - Invalid hash parameter". > > As I understand it, it should instead directly point to the

Re: [Bug?] log -p -W showing the whole file for a patch that adds to the end?

René Scharfe writes: > diff: factor out match_func_rec() > diff: handle appended chunks better with -W > diff: ignore empty lines before added functions with -W > diff: don't include common trailing empty lines with -W > grep: don't extend context to trailing empty lines

Re: [PATCH v8 3/3] bisect--helper: `write_terms` shell function in C

Christian Couder writes: >> diff --git a/git-bisect.sh b/git-bisect.sh >> index 7d7965d..cd39bd0 100755 >> --- a/git-bisect.sh >> +++ b/git-bisect.sh >> @@ -210,7 +210,7 @@ bisect_start() { >> eval "$eval true" && >> if test $must_write_terms -eq 1 >>

Re: t7800 test failure

Armin Kunaschik writes: >> I wouldn't allow it in our scripted Porcelain, but the environment >> of our test scripts are under our control, so I do not think it is a >> problem ("ls piped to sed" has been an established idiom before >> readlink(1) was widely accepted,

Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

Ville Skyttä writes: > When the shell is in "nounset" or "set -u" mode, referencing unset or > null variables results in an error. Protect $ZSH_VERSION and > $BASH_VERSION against that. > local ps1_expanded=yes > - [ -z "$ZSH_VERSION" ] || [[ -o PROMPT_SUBST ]] ||

Re: t7800 test failure

On Tue, May 24, 2016 at 6:57 PM, Junio C Hamano wrote: > Matthieu Moy writes: > >> Armin Kunaschik writes: >> >>> t7800 fails on systems where readlink (GNUism?) is not available. >> >> I don't think it's POSIX, but it

Re: [PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

Ville Skyttä writes: > When the shell is in "nounset" or "set -u" mode, referencing unset or > null variables results in an error. Protect $ZSH_VERSION and > $BASH_VERSION against that. > > Signed-off-by: Ville Skyttä > --- Makes sense from a cursory

Re: t7800 test failure

Matthieu Moy writes: > Armin Kunaschik writes: > >> t7800 fails on systems where readlink (GNUism?) is not available. > > I don't think it's POSIX, but it is present on all POSIX-like systems I > know. On which system did you get the

Re: t7610-mergetool.sh test failure

On Tue, May 24, 2016 at 6:45 PM, Junio C Hamano wrote: > 3. find and install mktemp? Sure, but which one? :-) mktemp is not mentioned in POSIX. http://stackoverflow.com/questions/2792675/how-portable-is-mktemp1 -- To unsubscribe from this list: send the line "unsubscribe git"

Re: t7800 test failure

Armin Kunaschik writes: > t7800 fails on systems where readlink (GNUism?) is not available. I don't think it's POSIX, but it is present on all POSIX-like systems I know. On which system did you get the issue? > +readlink() { ls -ld "$1" | sed 's/.* -> //'; } This is

Re: t7610-mergetool.sh test failure

On Tue, May 24, 2016 at 9:44 AM, Armin Kunaschik wrote: > t7610-mergetool.sh fails on systems without mktemp. > > mktemp is used in git-mergetool.sh and throws an error when it's not > available. > error: mktemp is needed when 'mergetool.writeToTemp' is true > > I see 2

t7610-mergetool.sh test failure

t7610-mergetool.sh fails on systems without mktemp. mktemp is used in git-mergetool.sh and throws an error when it's not available. error: mktemp is needed when 'mergetool.writeToTemp' is true I see 2 options: 1. code around it, write an own mktemp, maybe use the test-mktemp as a basis. 2.

Re: [Opinion gathering] Git remote whitelist/blacklist

On Tue, May 24, 2016 at 9:16 AM, Randall S. Becker wrote: > May be missing the point, but isn't the original intent to provide > policy-based to control the push I didn't get the impression that those who are proposing were interested in a "policy that you have to obey"

RE: [Opinion gathering] Git remote whitelist/blacklist

On May 24, 2016 12:08 PM, Matthieu Moy wrote: > > So, when trying a forbidden push, Git would deny it and the only way > > to force the push would be to remove the blacklist from the config, right? > > > > Probably the sanest way to go. I thought about adding a "git push > >

Re: [Opinion gathering] Git remote whitelist/blacklist

On Tue, May 24, 2016 at 5:55 AM, Matthieu Moy wrote: > So, when trying a forbidden push, Git would deny it and the only way to > force the push would be to remove the blacklist from the config, right? > > Probably the sanest way to go. I thought about adding a "git

[L10N] Kickoff of translation for Git 2.9.0 round 1

Hi guys, Git v2.9.0-rc0 has been released, and it's time to start new round of git l10n. This time there are 104 updated messages need to be translated since last update: l10n: git.pot: v2.9.0 round 1 (104 new, 37 removed) Generate po/git.pot from v2.9.0-rc0 for git v2.9.0 l10n round 1.

t7800 test failure

t7800 fails on systems where readlink (GNUism?) is not available. An easy workaround for the very basic readlink usage of this test would be to use a shell function like this: --- diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index ff7a9e9..be3d19f 100755 --- a/t/t7800-difftool.sh +++

[PATCH] userdiff: add built-in pattern for CSS

CSS is widely used, motivating it being included as a built-in pattern. It must be noted that the word_regex for CSS (i.e. the regex defining what is a word in the language) does not consider '.' and '#' characters (in CSS selectors) to be part of the word. This behavior is documented by the test

Re: Small rerere in rebase regression

Hi, On Mon, 23 May 2016, Junio C Hamano wrote: > Johannes Sixt writes: > > > I also come to the conclusion that die_with_patch shouldn't have to > > have a call to "git rerere". die_with_patch can be called after "git > > cherry-pick", "git merge", "git commit", all of which

Re: [Opinion gathering] Git remote whitelist/blacklist

Lars Schneider writes: > To answer your question, > I would reject the push (because the remote is in the denied list) and > print a warning to point out the conflicting configs to the user. So, when trying a forbidden push, Git would deny it and the only way to force

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

Samuel GROOT writes: > On 05/23/2016 09:55 PM, Eric Wong wrote: >> Tom Russello wrote: >>> This new option takes an email message file, parses it, fills the "To", >>> "Subject" and "Cc" fields appropriately and quote the message. >>>

Re: [RFC-PATCH 1/2] send-email: new option to quote an email and reply to

On 05/23/2016 09:55 PM, Eric Wong wrote: Tom Russello wrote: This new option takes an email message file, parses it, fills the "To", "Subject" and "Cc" fields appropriately and quote the message. This option involves the `--compose` mode to edit the cover

Re: Odd Difference Between Windows Git and Standard Git

Hi, On Tue, 24 May 2016, Torsten Bögershausen wrote: > On 05/23/2016 08:52 PM, Junio C Hamano wrote: > > Johannes Schindelin writes: > > > > > > Of course, if you are doing network mount between systems with and > > > > without filemode support, the result would

Re: Reviews for the first patches of pclouds/narrow-checkout

On Tue, May 24, 2016 at 1:26 AM, Stefan Beller wrote: > Hi, > > so I started looking into your narrow checkout branch and started reviewing > the patches. Thanks for working on the narrow checkout! > > Reviewed-by: Stefan Beller (just asking for signoff) >

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

Hey Matthieu, On Tue, May 24, 2016 at 1:41 PM, Matthieu Moy wrote: > Junio C Hamano writes: > >> Pranit Bauva writes: >> >>> static const char *use_message_buffer; >>> -static const char commit_editmsg[] =

Re: Please add a git config option to make --show-signature the default

Hi Austin, On Mon, 23 May 2016, Austin English wrote: > As stated in title, I'd like to see an option to enable GPG signature > by default. I see an option was mentioned in the mail's subject line, but no indication which command you want to assume implicitly that this option was passed. Care

Re: [BUG] can not escape sharps in git config file

My mistake, sorry for the noise, JFTR: * only double quotes can fully escape a string (it is safer to enclose the whole value in double quotes) * backslashes have to be doubled because they are interpreted by git So [filter "kicad_sch"] clean = "sed -E 's/#(PWR|FLG)[0-9]+/#\\1?/'"

t1400 test failures

Hello, I have 2 failed tests here: large transaction creating branches does not burst open file limit large transaction deleting branches does not burst open file limit both tests fail because of the decreased file limit: git-2.8.3/t/../bin-wrappers/git: bad file unit number The tests run fine

Re: [Opinion gathering] Git remote whitelist/blacklist

> On 24 May 2016, at 06:12, Francois Beutin > wrote: > On May 20, 2016 10:22 AM, Francois Beutin wrote: We (Ensimag students) plan to implement the "remote whitelist/blacklist" feature described in the SoC 2016 ideas, but first I would like to be

Re: [BUG] can not escape sharps in git config file

Forgot to add: ± git --version git version 2.8.3 -- 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

[BUG] can not escape sharps in git config file

Hi everyone, I stumbled on this: config file: [filter "kicad_sch"] clean = sed -E 's/#(PWR|FLG)[0-9]+/#\1?/' smudge = cat Then in the shell: ± git add -u sed -E 's/: 1: sed -E 's/: Syntax error: Unterminated quoted string error: external filter sed -E 's/ failed 2 error:

Re: [Opinion gathering] Git remote whitelist/blacklist

> > > On May 20, 2016 10:22 AM, Francois Beutin wrote: > > > We (Ensimag students) plan to implement the "remote whitelist/blacklist" > > > feature described in the SoC 2016 ideas, but first I would like to be > > > sure > > > we > > > agree on what exactly this feature would be, and that the

Re: [PATCH v3 00/49] libify apply and use lib in am, part 1

On Tue, May 24, 2016 at 10:10 AM, Christian Couder wrote: > > I will send a diff between this version and the 50 first patches of v2 > soon as a reply to this email. Here is the diff: diff --git a/builtin/apply.c b/builtin/apply.c index ec55768..c1c5592 100644 ---

[PATCH] git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION

When the shell is in "nounset" or "set -u" mode, referencing unset or null variables results in an error. Protect $ZSH_VERSION and $BASH_VERSION against that. Signed-off-by: Ville Skyttä --- contrib/completion/git-prompt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2

Re: [PATCH v2 48/94] builtin/apply: rename 'prefix_' parameter to 'prefix'

On Sat, May 14, 2016 at 8:27 PM, Junio C Hamano wrote: > Christian Couder writes: > >> On Thu, May 12, 2016 at 10:43 PM, Junio C Hamano wrote: >>> Junio C Hamano writes: >>> Up to this point, the

[PATCH v3 05/49] builtin/apply: extract line_by_line_fuzzy_match() from match_fragment()

The match_fragment() function is very big and contains a big special case algorithm that does line by line fuzzy matching. So let's extract this algorithm in a separate line_by_line_fuzzy_match() function. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder

Re: [PATCH v2 48/94] builtin/apply: rename 'prefix_' parameter to 'prefix'

On Fri, May 13, 2016 at 9:42 PM, Christian Couder wrote: > On Thu, May 12, 2016 at 9:56 PM, Junio C Hamano wrote: >> Christian Couder writes: >> >>> This is just a small cleanup. >> >> ... which may have been better

[PATCH v3 03/49] builtin/apply: avoid parameter shadowing 'linenr' global

Let's just rename the global 'state_linenr' as it will become 'state->linenr' in a following patch. This also avoid errors when compiling with -Wshadow and makes it safer to later move global variables into a "state" struct. Reviewed-by: Stefan Beller Signed-off-by:

[PATCH v3 04/49] builtin/apply: avoid local variable shadowing 'len' parameter

This is just a cleanup to avoid errors when compiling with -Wshadow and to make it safer to later move global variables into a "state" struct. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 20 ++--

[PATCH v3 09/49] builtin/apply: move 'state' init into init_apply_state()

When the apply functionality will be libified, the 'struct apply_state' will be used by different pieces of code. To properly initialize a 'struct apply_state', let's provide a nice and easy to use init_apply_state() function. Let's also provide clear_apply_state() to release memory used by

[PATCH v3 31/49] builtin/apply: move 'has_include' global into 'struct apply_state'

To libify the apply functionality the 'has_include' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 6 +++--- 1 file

[PATCH v3 46/49] builtin/apply: move 'state' check into check_apply_state()

To libify the apply functionality we should provide a function to check that the values in a 'struct apply_state' instance are coherent. Let's move the code to do that into a new check_apply_state() function. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder

[PATCH v3 29/49] builtin/apply: move 'patch_input_file' global into 'struct apply_state'

To libify the apply functionality the 'patch_input_file' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 27

Re: [PATCH] builtin/commit.c: memoize git-path for COMMIT_EDITMSG

Junio C Hamano writes: > Pranit Bauva writes: > >> static const char *use_message_buffer; >> -static const char commit_editmsg[] = "COMMIT_EDITMSG"; >> +static const char commit_editmsg_path[] = git_path_commit_editmsg(); > > The function defined with

[PATCH v3 22/49] builtin/apply: move 'threeway' global into 'struct apply_state'

To libify the apply functionality the 'threeway' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 14 +++--- 1

[PATCH v3 36/49] builtin/apply: move 'whitespace_option' into 'struct apply_state'

This will enable further refactoring, and it is more coherent and simpler if all the option_parse_*() functions are passed a 'struct apply_state' instance in opt->value. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c

[PATCH v3 24/49] builtin/apply: move 'unsafe_paths' global into 'struct apply_state'

To libify the apply functionality the 'unsafe_paths' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 8 1 file

[PATCH v3 20/49] builtin/apply: move 'numstat' global into 'struct apply_state'

To libify the apply functionality the 'numstat' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 9 - 1 file

[PATCH v3 19/49] builtin/apply: move 'diffstat' global into 'struct apply_state'

To libify the apply functionality the 'diffstat' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 11 ++- 1 file

[PATCH v3 28/49] builtin/apply: move 'apply' global into 'struct apply_state'

To libify the apply functionality the 'apply' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 31

[PATCH v3 34/49] builtin/apply: move 'root' global into 'struct apply_state'

To libify the apply functionality the 'root' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller Signed-off-by: Christian Couder --- builtin/apply.c | 82

  1   2   >