Re: [PATCH] stop it from failing silently when git apply patch and show err info

rage/ceph_**.*.** && git apply 001.patch I check code and I find that root directory need to be set using "--directory" I think we need show some info about it. thinks simon gao 于2019年7月25日周四 下午6:43写道： > > Signed-off-by: simon gao > --- > apply.c | 4 +++- >

[PATCH] stop it from failing silently when git apply patch and show err info

Signed-off-by: simon gao --- apply.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apply.c b/apply.c index 4992eca..47b16aa 100644 --- a/apply.c +++ b/apply.c @@ -2093,8 +2093,10 @@ static int use_patch(struct apply_state *state, struct patch *p) /* Paths

[PATCH] stop it from failing silently when git apply patch and show err info

Signed-off-by: simon gao --- apply.c | 1 + 1 file changed, 1 insertion(+) diff --git a/apply.c b/apply.c index 4992eca..f66a6ff 100644 --- a/apply.c +++ b/apply.c @@ -2094,6 +2094,7 @@ static int use_patch(struct apply_state *state, struct patch *p) if (state->prefix && *st

[PATCH v2] git-p4: Allow unshelving of branched files

targets) are classed as new. However, files integrated from other branches (i.e. a 'branch' action) also need to be considered as added, for this purpose. Signed-off-by: Simon Williams Signed-off-by: Luke Diamand --- git-p4.py | 2 +- t/t9832-unshelve.sh | 8 +++- 2 fil

Re: [PATCH] git-p4: Allow unshelving of branched files

On Wed, May 22, 2019 at 06:49:38AM +0100, Luke Diamand wrote: > On Tue, 21 May 2019 at 23:50, Simon Williams wrote: > > > > When unshelving a changelist, git-p4 tries to work out the appropriate > > parent commit in a given branch (default: HEAD). To do this, it looks > &

[PATCH] git-p4: Allow unshelving of branched files

targets) are classed as new. However, files integrated from other branches (i.e. a 'branch' action) also need to be considered as added, for this purpose. Signed-off-by: Simon Williams --- git-p4.py | 2 +- t/t9832-unshelve.sh | 8 +++- 2 files changed, 8 insertions(+), 2

Re: [PATCH/RFC] commit: add short option for --amend

-verbose --amend --date=now Besides the obvious g=git alias in the shell. I really like one character aliases for often used commands/subcommands. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: Git clone and case sensitivity

the advice message should list the problematic file names. Even though this might be quite verbose it will help those affected to quickly find the problematic files to either fix this on their own or report to upstream (unless there's already an easy way to find those files - if so it should be mentioned in the message). Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v3 04/11] rerere: mark strings for translation

On Sat, Jul 14, 2018 at 10:44:36PM +0100, Thomas Gummerer wrote: > 'git rerere' is considered a plumbing command and as such its output s/plumbing/porcelain/? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v1 01/25] structured-logging: design document

t. (Described later) Please write out "slog_detail, "slog_timers", etc. Using the abbreviated forms makes searching a pain. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH] Makefile: make NO_ICONV really mean "no iconv"

;undefine NEEDS_LIBICONV", however, 'undefine' was added to GNU make in > 3.82 but MacOS is stuck on 3.81 (from 2006) so 'undefine' was avoided. Should we put the part about MacOS's make into the commit message? Seems like relevant information for future readers. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v2] Use proper syntax for replaceables in command docs

7 @@ cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver > git-cvsserver pserver > Usage: > > [verse] > -'git-cvsserver' [options] [pserver|server] [ ...] > +'git-cvsserver' [] [pserver|server] [ ...] No space in front of "..." for consistenc

Re: [PATCH 6/8] diff.c: decouple white space treatment from move detection algorithm

ot; can be a major pain when looking for documentation. So maybe something like this instead: > +--color-moved-ignore-space-at-eol:: > +--color-moved-no-ignore-space-at-eol:: > + Ignore changes in whitespace at EOL when performing the move > + detection for --color-moved. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 23/41] upload-pack: replace use of several hard-coded constants

int get_reachable_list(struct object_array *src, > struct child_process cmd = CHILD_PROCESS_INIT; > int i; > struct object *o; > - char namebuf[42]; /* ^ + SHA-1 + LF */ > + char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + SHA-1 + LF */ > + const unsigned hexsz = the_hash_algo->hexsz; Dito. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: Silly "git gc" UI issue.

+ if (parse_expiry_date(arg, (timestamp_t *)opt->value)) > + die("malformed expiration date '%s'", arg); > + return 0; > } Should this error get translated? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

On Thu, Apr 19, 2018 at 01:26:18PM +0200, SZEDER Gábor wrote: > On Thu, Apr 19, 2018 at 12:37 PM, Simon Ruderich wrote: >> This doesn't occur on a non-parallel build. > > It does occur in non-parallel builds, too. > > See: > > > http

Re: [PATCH/RFC 0/5] Keep all info in command-list.txt in git binary

CC hex.o CC json-writer.o ./generate-cmdlist.sh: 73: ./generate-cmdlist.sh: Bad substitution This doesn't occur on a non-parallel build. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: Silly "git gc" UI issue.

argcount; } else if ((argcount = parse_long_opt("until", argv, &optarg))) { - revs->min_age = approxidate(optarg); + int err = 0; + revs->min_age = approxidate_careful(optarg, &err); + if (err) + return error(&q

Re: [PATCH 02/10] t5812: add 'test_i18ngrep's missing filename parameter

led" stderr || > - test_i18ngrep "your curl version is too old" > + test_i18ngrep -E "(ftp.*disabled|your curl version is too old)" > stderr > } I think we can drop the curly braces as well, as they were only used to group the ||; leaving only:

Re: [PATCH v4 5/6] convert: add 'working-tree-encoding' attribute

enerated patch). Cases like a->b = xcalloc() are not matched, I don't know enough coccinelle for that. If there's interest I could prepare patches, but it will create quite some code churn. Regards Simon @@ type T; identifier x; @@ - T *x = xmalloc(sizeof(T)); + T *x = xmalloc(sizeof(*x)

Re: [PATCH v4 5/6] convert: add 'working-tree-encoding' attribute

lingering files could > always surprise writers of future tests (at least they surprised > me in other tests). Sure, that sounds good. Just noticed the inconsistency and wanted to mention it. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v4 5/6] convert: add 'working-tree-encoding' attribute

> + git checkout test.utf16 && > + test_cmp_bin test.utf16.raw test.utf16 && > + > + # cleanup > + rm test.utf16.raw Micro-nit: For consistency with the previous test, remove the empty line and comment (or just keep the files generated from the "setup test repo" phase and don't explicitly delete them)? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH/RFC] diff: add --compact-summary option to complement --stat

m either always (also for "(A+l)") or never? Was there a specific reason why you added them just in one place? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

[PATCH] config: document default value of http.sslVerify

Remove any doubt that certificates might not be verified by default. Signed-off-by: Simon Ruderich --- Documentation/config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 3a1304874..0d49bcd70 100644 --- a

feature-request: git "cp" like there is git mv.

please develop a new feature, git "cp" like there is git mv tomovefile1 tofile2 (to save space). there is a solution in https://stackoverflow.com/a/44036771/466363 however, it is not single easy command.

Re: [PATCH 2/2] grep: fix segfault under -P + PCRE2 + (*NO_JIT)

izearg); > + if (patinforet) > + die("BUG: The patinforet variable should be 0 after the > pcre2_pattern_info() call, not %d", > + patinforet); I think BUG() should be used here, and maybe shorten the error message: BUG("pcre2_patter

Re: Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file())

On Mon, Nov 06, 2017 at 05:13:15PM +0100, Simon Ruderich wrote: > On Sat, Nov 04, 2017 at 10:07:00PM -0400, Jeff King wrote: >> Yes, I think what you've written here (and below) is quite close to the >> error_context patches I linked elsewhere in the thread. In other >>

Re: Improved error handling (Was: [PATCH 1/2] sequencer: factor out rewrite_file())

git functions, but there are some in usage.c (error_errno, error, error_routine). And as general question, is this approach to error handling something we should pursue or are there objections? If there's consensus that this might be a good idea I'll look into converting some parts of the

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

te_in_full(fd, buf, len, err) < 0) > return -1; > if (xclose(fd, err) < 0) > return -1; > return 0; > } This looks interesting as well, but it misses the feature of custom error messages which is really useful. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

ust calling die("write_file_buf") feels ugly, as the real error was already printed on screen by error_errno() and I didn't find any function to just exit without writing a message (which still respects die_routine). Suggestions welcome. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 1/2] wrapper.c: consistently quote filenames in error messages

didn't notice. Sorry, didn't think about the tests. I've re-checked and I think those are the only affected tests. The test suite passes with your squashed changes. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

[PATCH 2/2] sequencer.c: check return value of close() in rewrite_file()

Not checking close(2) can hide errors as not all errors are reported during the write(2). Signed-off-by: Simon Ruderich --- On Wed, Nov 01, 2017 at 02:00:11PM +0100, René Scharfe wrote: > Most calls are not checked, but that doesn't necessarily mean they need > to (or should) st

[PATCH 1/2] wrapper.c: consistently quote filenames in error messages

All other error messages in the file use quotes around the file name. This change removes two translations as "could not write to '%s'" and "could not close '%s'" are already translated and these two are the only occurrences without quotes. Signed-of

Re: [PATCH 1/2] sequencer: factor out rewrite_file()

truncate '%s'"), path); > + close(fd); We might want to check the return value of close() as some file systems report write errors only on close. But I'm not sure how the rest of Git's code-base handles this. > + return rc; > +} Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 0/2] color-moved: ignore all space changes by default

dangerous. The new options sound like a good addition but I don't think the defaults should change. However unrelated to this decision, please add config settings in addition to these new options so users can globally configure the behavior they want. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 2/3] t5615: avoid re-using descriptor 4

n't, > then we're happy. If it does, then we can always switch then. I think switching the 4 to 9 (which you already brought up in this thread) is a good idea. It makes accidental conflicts less likely (it's rare to use so many file descriptors) and is easy to implement. Regard

Re: [PATCH 4/5] diff: fix whitespace-skipping with --color-moved

actual > ' > > +test_expect_failure 'move detection ignoring whitespace at eol' ' Shouldn't this be test_expect_success? According to the commit message "and a new "--ignore-space-at-eol" shows off the breakage we're fixing.". I didn&#x

Re: [PATCH 1/3] write_entry: fix leak when retrying delayed filter

On Tue, Oct 10, 2017 at 05:25:43AM -0400, Jeff King wrote: > On Tue, Oct 10, 2017 at 11:23:19AM +0200, Simon Ruderich wrote: >> On Tue, Oct 10, 2017 at 09:00:09AM +0900, Junio C Hamano wrote: >>>> --- a/entry.c >>>> +++ b/entry.c >>>> @@ -283,6 +283,7

Re: [PATCH 1/3] write_entry: fix leak when retrying delayed filter

/* Do not send the blob in case of a retry. */ >> if (dco->state == CE_RETRY) { >> +free(new); >> new = NULL; >> size = 0; &

Re: [PATCH v3 03/10] protocol: introduce protocol extention mechanisms

the "version x is insecure/slow"-issue raised by Stefan Beller). The current code always uses the latest protocol supported by the git binary. Minor nit, s/extention/extension/ in the patch name? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: Are the 'How to' documents present as man pages?

use only round brackets to refer to another man page with the given section (like stat(1) or stat(2)). Square brackets have no special meaning, but are useful for references like URLs. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: Are the 'How to' documents present as man pages?

stingly they use square brackets for these references which confused me a little. Not sure if it's worth changing though. Regards Simon [1]: https://git-scm.com/docs/git-revert -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH] hashmap: add API to disable item counting when threaded

); > + while ((item = hashmap_iter_next(&iter))) > + n++; > + > + map->do_count_items = 1; > + map->private_size = n; > +} Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

git add -p breaks after split on change at the top of the file

your editor and save. error: patch failed: file:1 error: file: patch does not apply I expected git add -p to stage this change without error. It works fine without splitting the hunk (by deleting the first and last + line in the diff). Regards Simon -- + privacy is necessary + using gnu

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

On Fri, Aug 11, 2017 at 10:52:51AM +0200, René Scharfe wrote: > Am 11.08.2017 um 09:50 schrieb Simon Ruderich: >> On Thu, Aug 10, 2017 at 10:56:40PM +0200, René Scharfe wrote: >>> getdelim(3) returns -1 at the end of the file and if it encounters an >>> error, but se

Re: [PATCH] strbuf: clear errno before calling getdelim(3)

errno). I don't think that it matters in practice, but the "most" correct way to handle this would be to check if feof(3) is true to check for the non-errno case. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH 25/25] diff: document the new --color-moved setting

quot;excluded from move detection" to make it clear that the change is still shown to the user, just not handled by move detection and using the usual diff colors. In your example above, what exactly is "omitted"? The complete hunk from the output or the special coloring? That

Re: [PATCH 25/25] diff: document the new --color-moved setting

n a malicious move can hide smaller changes, correct? If so, I find this sentence misleading. Maybe something like: Small blocks of 3 moved lines or fewer are excluded from move detection and colored as regular diff. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.o

Re: your mail

Somebody might want to update the documentation, but personally I see no reason to change anything. If you want to send a patch to improve it, that would be great of course. Regards Simon PS: Please don't top-post on this mailing list. -- + Privatsphäre ist notwendig + Ich verwende GnuPG ht

Re: your mail

ithout having to subscribe. Regards Simon -- + Privatsphäre ist notwendig + Ich verwende GnuPG http://gnupg.org + Öffentlicher Schlüssel: 0x92FEFDB7E44C32F9

No "invalid option" message with git diff --cached --invalid-option

know that --compaction-heuristic is no longer supported but I was using it an alias and was confused that I got no proper error message warning me which option was wrong. It seems to happen for any invalid option which is used in combination with --cached or --staged. Regards Simon -- + priva

Re: your mail

On Thu, Jun 22, 2017 at 11:50:01AM +0200, Jessie Hernandez wrote: > subscribe git You need to write to majord...@vger.kernel.org (with subscribe git in the body) to subscribe. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH] die routine: change recursion limit from 1 to 1024

> recursion_limit) return 1; if (dying == 1) warning(); return 0; Btw. is there a reason why recursion_limit is a static variable and not a constant/define? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v2 1/2] refs: Add for_each_worktree_ref for iterating over all worktree HEADs

think it's wrong? How does it look on your end? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9

Re: [PATCH v2 4/7] grep: add support for the PCRE v1 JIT API

+#ifdef PCRE_CONFIG_JIT > + if (p->pcre1_jit_on) { > + pcre_free_study(p->pcre1_extra_info); > + pcre_jit_stack_free(p->pcre1_jit_stack); > + } else { > + pcre_free(p->pcre1_extra_info); > + } > +#else > pcre_free

Re: [PATCH v2] l10n: de.po: update German translation

fuzzy > msgid "--broken is incompatible with commit-ishes" > -msgstr "Die Option --dirty kann nicht mit Commits verwendet werden." > +msgstr "Die Option --broken kann nicht nit Commits verwendet werden." ^^^ mit > #: bu

[PATCH] githooks.txt: clarify push hooks are always executed in $GIT_DIR

Listing the specific hooks might feel verbose but without it the reader is left to wonder which hooks are triggered during the push. Something which is not immediately obvious when only trying to find out where the hook is executed. Signed-off-by: Simon Ruderich --- Documentation/githooks.txt

Unexpected working directory in post-receive hook in non-bare repository

works fine in my setup.) The same happens for all hooks executed by git-receive-pack: pre-receive, update, post-receive, post-update. Is this a documentation issue or unexpected behavior? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 signature.asc Description: PGP signature

Re: [PATCH] push: document & test --force-with-lease with multiple remotes

gt; ++ > + git push --force-with-lease origin I think this should be origin-push. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 signature.asc Description: PGP signature

Re: git email From: parsing (was Re: [GIT PULL] Staging/IIO driver patches for 4.11-rc1)

only for stable kernel > > work. > > > > So either the mail is malformed, or git couldn't figure it out, I've > > attached the original message below, and cc:ed the git mailing list. > > > > Also, Simon emailed me after this was committed saying

Re: [PATCH 2/4] t7610: make tests more independent and debuggable

l file3 >/dev/null 2>&1 ) && This change seems unrelated to the changes mentioned in the commit message. Was it intended? Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 signature.asc Description: PGP signature

Re: [ANNOUNCE] Git v2.11.0-rc0

hich lines are added/deleted >intelligently when the lines before and after the changed section >are the same. A command line option is added to help with the >experiment to find a good heuristics. Maybe the name of the command line option should be added he

Re: [PATCH 27/36] attr: convert to new threadsafe API

statically, using the constants PTHREAD_MUTEX_INITIALIZER (for fast mutexes), PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP (for recursive mutexes), and PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP (for error checking mutexes). Regards Simon -- + Privatsphäre ist notwendig + Ich verwend

Crash when using git blame on untracked file

3 0x00405321 in ?? () #4 0x76f9f700 in __libc_start_main (main=0x4051c0, argc=0x3, argv=0x7fffe1a8, init=, fini=, rtld_fini=, stack_end=0x7fffe198) at ../csu/libc-start.c:291 #5 0x004057d9 in ?? () Regards Simon -- + privacy is necessary + usin

Re: [ANNOUNCE] git-series: track changes to a patch series over time

of handling To/Cc addresses for patches and the cover > letter (beyond just scripts/get_maintainer.pl), and more automatic > handling of series versioning (v2, v3, ...) and associated series > changelogs. Suggestions welcome. Patman builds the cover letter change lists from the commits. The

Re: [PATCH 2/2] color: support "italic" attribute

Wow I wasn't expecting such a rapid response, you're awesome! :-D Simon Courtois On 23 June 2016 at 15:10:33, Jeff King (p...@peff.net) wrote: > We already support bold, underline, and similar attributes. > Let's add italic to the mix. According to the Wikipedia > p

Italics formatting

like to take the occasion to thank everybody working on Git, I've been using it for 7 years now and it's a real pleasure! Thank you all. Regards, Simon Courtois -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.ke

Re: [PATCH 1/2] strbuf: add tests

t;)) { > > + /* > > +* Check if strbuf_grow(0) allocate a new NUL-terminated buffer > > +*/ > > + strbuf_init(&sb, 0); > > + strbuf_grow(&sb, 0); > > + if (sb.buf == strbuf_slopbuf) &g

Re: [PATCH 1/2] strbuf: add tests

+ /* > > +* size_t overflow: should die() > > +*/ > > + strbuf_init(&sb, 1000); > > + strbuf_grow(&sb, maximum_unsigned_value_of_type((size_t)1)); > > A comment "If this does not die(), fall through to returning success, to > indicate an error" might be nice here. Agreed. > > + } else { > > + usage("test-strbuf mode"); > > + } > > + > > + return 0; > > +} > > diff --git a/t/t0082-strbuf.sh b/t/t0082-strbuf.sh > > new file mode 100755 > > index 000..0800d26 > > --- /dev/null > > +++ b/t/t0082-strbuf.sh > > @@ -0,0 +1,19 @@ > > +#!/bin/sh > > + > > +test_description="Test the strbuf API. > > +" > > This description does not need a new-line, and existing one-liner test > descriptions seem not to be terminated by a period. OK. > The rest of this patch looks good. > > Ciao, > Johannes > Thanks for the Review, Simon Rabourg -- 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

Re: [PATCH] git-prompt: make colors available in custom prompts

calculated correctly by bash and it messed up the commandline with very long commands (relative to the terminal width), when browsing the command history. However I think I've seen this effect even with the new code, but I've never dug into this. Cheers Simon -- 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

Re: [git-multimail] smtplib, check certificate

code equivalent to my patch under MIT license here: https://github.com/cybercase/django-smtp-starttls (code in django_smtp_starttls.py, licence in setup.py) I think there is not problem to re-use MIT code. Simon. -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [git-multimail] smtplib, check certificate

ificate is not verified (like before the patch) but a warning is emitted. If the var is set, the targeted file is used to verify the server certificate. For now, only the tls configuration is supported. Simon P. -- 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

[git-multimail] smtplib, check certificate

/etc/ssl/certs/ca-certificates.crt) Best regards, Simon P. diff --git a/git-multimail/git_multimail.py b/git-multimail/git_multimail.py index fae5c91..b49ed9d 100755 --- a/git-multimail/git_multimail.py +++ b/git-multimail/git_multimail.py @@ -57,6 +57,7 @@ import subprocess import shlex i

Re: storing cover letter of a patch series?

t; standalone application. > > -- > [1] - http://git.denx.de/?p=u-boot.git;a=blob;f=tools/patman/README If you do end up trying it out I'd appreciate any feedback you have. I've sent 1000s of patches through it over the past few years. Regards, Simon -- 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

Re: [PATCH] Documentation clarification on git-checkout regarding ours/theirs

Am 10.07.2015 um 22:07 schrieb Junio C Hamano: "Simon A. Eugster" writes: From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- For those who are looking from the sideline, this is a reroll from a month-old thread $gmane/271680. Documentation/g

[PATCH] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..d69306f 100644 --- a/Documen

Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

2015-06-16 17:41 GMT+02:00 Junio C Hamano : > Simon Eugster writes: > >> 2015-06-15 22:10 GMT+02:00 Junio C Hamano : >>> >>> "Simon A. Eugster" writes: >>> >>> > --- >>> >>> - Lack of explanation as to why this

Re: [PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

2015-06-15 22:10 GMT+02:00 Junio C Hamano : > > "Simon A. Eugster" writes: > > > --- > > - Lack of explanation as to why this is a good thing. > - Lack of sign-off. > > Why is there still 1/2, if its effect is wholly annulled by a > subsequent step 2/2?

[PATCH 1/2] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..5c3ef86 100644 --- a/Documen

[PATCH 2/2] Documentation on git-checkout --ours/--theirs improved

--- Documentation/git-checkout.txt | 39 +++ 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 5c3ef86..ec0be28 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git

[PATCH] Documentation clarification on git-checkout

I hope I managed to get this working with replying to your response, Junio, git send-email is all new to me. Thanks a lot for your detailled answer. I tried to integrate it and hope it is understandable this way? Simon -- To unsubscribe from this list: send the line "unsubscribe git&qu

[PATCH] Documentation clarification on git-checkout regarding ours/theirs

From: "Simon A. Eugster" Signed-off-by: Simon A. Eugster --- Documentation/git-checkout.txt | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index d263a56..5c3ef86 100644 --- a/Documen

Git on tomcat via LDAP

Hi All, I am Simon working for VISA. I am new to Git and planning to migrate the projects from ClearCase. Could anyone share the steps to configure git over http on Tomcat and enable the authentication through ldap to access the repositories? Cheers, Simon Sent from my iPhone-- To

Cleaning projects with submodules

a good way to clean a project, leaving valid submodules in place (these are then switched to the new tip and cleaned in separate commands) while removing submodules that are no longer referenced? Simon signature.asc Description: OpenPGP digital signature

Git commit amend empty emails

Git is having empty email problems I think, I'm on git v2.1.3. Steps to reproduce: $ git init Initialized empty Git repository in /tmp/test_git/.git/ $ echo 'test' > abc $ git add --all 1 ↵ $ git commit --message 'test' [master (root-commit) 3cc2793] test 1 file chan

Re: Colors in __git_ps1

operly, but it passed the tests where command substitution mode failed. IMHO the way colours are now implemented could very well be considered a workaround for a bug in bash. Only I'm not skilled enough (or have enough time) to get to the bottom of it... I hope this answers your que

Re: [SECURITY PATCH] git-prompt.sh: don't put unsanitized branch names in $PS1

* G?bor Szeder [2014-04-24 23:10:10 +0430]: > > I'd like to see this patch eyeballed by those who have been involved > > in the script (shortlog and blame tells me they are SZEDER and > > Simon, CC'ed), so that we can hopefully merge it by the time -rc1 is > &

Re: Repository formats

gt; to tell which format you are using? Hello, The documentation is available in Documentation/technical/, e.g. index-format.txt and pack-format.txt. However not everything is available there. For current work on those formats, check the mailing list archive, e.g. [1] Regards Simon [1]: http://pe

Re: File extension conflict when working with git and latex

On Fri, Mar 21, 2014 at 05:46:51PM +0100, Matthias Beyer wrote: > Hi Simon, > > I think so. I executed: > > git fsck # reports N missing blobs, commits, trees and dangling stuff > git index-pack ... > git fsck # reports only dangling commits and blobs > >

Re: File extension conflict when working with git and latex

this ugly name collision. Hello Matthias, You can recreate the .idx files by running git index-pack .git/objects/pack/pack-.pack for each pack file. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 -- To unsubscribe from this list

Re: [PATCH] clean: respect pathspecs with "-d"

mkdir foo && mkdir foobar && git clean -df foo && test_path_is_missing foo && test_path_is_dir foobar ' Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 -- To unsubscribe from this list: send t

Re: [PATCH v2] git-config: document interactive.singlekey requires Term::ReadKey

Most distributions don't require Term::ReadKey as dependency, leaving the user to wonder why the setting doesn't work. Signed-off-by: Simon Ruderich --- On Mon, Mar 03, 2014 at 10:58:58AM -0800, Junio C Hamano wrote: > Thanks, but is it true that interactive.singlekey "requrie

[PATCH] git-add--interactive: warn if module for interactive.singlekey is missing

Suggested-by: Junio C Hamano Signed-off-by: Simon Ruderich --- git-add--interactive.perl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git-add--interactive.perl b/git-add--interactive.perl index 24bb1ab..d3bca12 100755 --- a/git-add--interactive.perl +++ b/git-add--interactive.perl

[PATCH] git-config: document interactive.singlekey requires Term::Readkey

Most distributions don't require Term::Readkey as dependency, leaving the user to wonder why the setting doesn't work. Signed-off-by: Simon Ruderich --- Documentation/config.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/config.txt b/Doc

Re: `git stash pop` UX Problem

> done resolving the merge, you may run the following to drop the stash: > > git stash drop Maybe just the following to keep the output on a single line: Use 'git stash drop' to remove the stash after resolving the conflicts. But maybe that's too short as it does

Git v1.8.4.2 test failure in ./t5570-git-daemon.sh

se the current output, as the output is already internationalized and therefore unstable. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [PATCH] gitweb: Fix the author initials in blame for non-ASCII names

ry for that. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9 -- 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

Re: The gitweb author initials feature from a36817b doesn't work with i18n names

On Thu, Aug 29, 2013 at 04:26:29PM +0200, Ævar Arnfjörð Bjarmason wrote: > I haven't gotten an env where I can test gitweb running, but that > looks like it should work to me. I've tested the patch and it works fine. Tested-by: Simon Ruderich Regards Simon -- + privacy is n

Re: [PATCH v2 00/13] bash prompt speedup

perhaps most important that it would be very easy to build a customised version of __git_ps1() using those functions from the standard code. I know this is pretty vague, I wish it wasn't so... If it's somehow possible to eliminate the PROMPT_COMMAND mode, I'm all for it. But I dou

Re: [PATCH] git-imap-send.txt: remove the use of sslverify=false in GMail example

On Thu, Apr 11, 2013 at 06:55:03PM +0300, Barbu Paul - Gheorghe wrote: > Should I create a new patch removing them all? Sounds like a good idea to me. And update the commit message with Junio's suggestions. Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + publi

  1   2   >