Dear Friend,

Dear Friend, I am soliciting your partnership to relocation $9 Million to your country for investment on my behalf and you will be entitled to 30% of the sum once the transaction is successful made, please indicate your interest if you are capable so that i will send you details of the

Dear Friend,

Dear Friend, I am soliciting your partnership to relocation $9 Million to your country for investment on my behalf and you will be entitled to 30% of the sum once the transaction is successful made, please indicate your interest if you are capable so that i will send you details of the

Re: [PATCH v2] fix pushing to //server/share/dir on Windows

On 14/12/16 20:37, Johannes Sixt wrote: normalize_path_copy() is not prepared to keep the double-slash of a //server/share/dir kind of path, but treats it like a regular POSIX style path and transforms it to /server/share/dir. The bug manifests when 'git push //server/share/dir master' is

Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

On Thu, Dec 15, 2016 at 7:04 AM, Junio C Hamano wrote: > The last one 3/3 is a nice touch that makes sure that we do not > forget what we discovered during the discussion. Very much > appreciated. > > Will queue. Thanks. Did you want me to send a v4 to mark the strings for

git bug - merging JS / Node.js code with "git merge --squash"

@git-community I am on Git git version 2.7.4 This problem is happening on Ubuntu 16.04, but the same problem was also happening when I was running on MacOS. I am consistently seeing merge bugs, when merging between branches of a mostly Node.js project. I am seeing fairly bad merges that mangle

Re: [PATCH v10 0/6] transport protocol policy configuration

On Wed, Dec 14, 2016 at 02:39:49PM -0800, Brandon Williams wrote: > v10 of this series fixes the following: > * A few updates to the commit messages in order to better convey the reasoning > behind the a few of the patches. > * Additional test to verify that curl redirects respect configured

Re: [PATCH v10 2/6] http: always warn if libcurl version is too old

On Wed, Dec 14, 2016 at 02:39:51PM -0800, Brandon Williams wrote: > Always warn if libcurl version is too old because: > > 1. Even without a protocol whitelist, newer versions of curl have all >non-http protocols disabled by default. Technically, non-http and non-ftp. Maybe just

Re: [PATCHv3 4/4] rm: add absorb a submodules git dir before deletion

Stefan Beller writes: > if (list.entry[i].is_submodule) { > if (is_empty_dir(path)) { > + if (rmdir(path)) > + die_errno("git rm: '%s'", path);

Re: [PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

Stefan Beller writes: > diff --git a/submodule.c b/submodule.c > index 9f0b544ebe..2d13744b06 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -1019,7 +1019,7 @@ int submodule_uses_gitfile(const char *path) > return 1; > } > > -int ok_to_remove_submodule(const

Re: [PATCH v10 0/6] transport protocol policy configuration

Brandon Williams writes: > v10 of this series fixes the following: > * A few updates to the commit messages in order to better convey the reasoning > behind the a few of the patches. > * Additional test to verify that curl redirects respect configured protocol > policies.

Re: [PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

On 12/14, Stefan Beller wrote: > In different contexts the question whether deleting a submodule is ok > to remove may be answered differently. This sentence is oddly worded. Maybe this: In different context the question "Is it ok to delete a submodule?" may be answered differently. --

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On Wed, Dec 14, 2016 at 04:29:52PM -0600, Blake Burkhart wrote: > You may want to set CURLOPT_DEFAULT_PROTOCOL if we don't already. Apparently > the default value of NULL causes it to make a guess based on the host if no > protocol is present. But you are discussing a situation where "http://; is

[PATCHv3 2/4] submodule: modernize ok_to_remove_submodule to use argv_array

Instead of constructing the NULL terminated array ourselves, we should make use of the argv_array infrastructure. While at it, adapt the error messages to reflect the actual invocation. Signed-off-by: Stefan Beller --- submodule.c | 14 -- 1 file changed, 4

[PATCHv3 4/4] rm: add absorb a submodules git dir before deletion

When deleting a submodule, we need to keep the actual git directory around, such that we do not lose local changes in there and at a later checkout of the submodule we don't need to clone it again. Now that the functionality is available to absorb the git directory of a submodule, rewrite the

[PATCH v10 2/6] http: always warn if libcurl version is too old

Always warn if libcurl version is too old because: 1. Even without a protocol whitelist, newer versions of curl have all non-http protocols disabled by default. 2. A future patch will introduce default "known-good" and "known-bad" protocols which are allowed/disallowed by

[PATCHv3 3/4] submodule: add flags to ok_to_remove_submodule

In different contexts the question whether deleting a submodule is ok to remove may be answered differently. In 293ab15eea (submodule: teach rm to remove submodules unless they contain a git directory, 2012-09-26) a case was made that we can safely ignore ignored untracked files for removal as we

[PATCH v10 4/6] http: create function to get curl allowed protocols

Move the creation of an allowed protocols whitelist to a helper function. This will be useful when we need to compute the set of allowed protocols differently for normal and redirect cases. Signed-off-by: Brandon Williams --- http.c | 31 --- 1

[PATCH v10 3/6] transport: add protocol policy config option

Previously the `GIT_ALLOW_PROTOCOL` environment variable was used to specify a whitelist of protocols to be used in clone/fetch/push commands. This patch introduces new configuration options for more fine-grained control for allowing/disallowing protocols. This also has the added benefit of

[PATCH v10 6/6] http: respect protocol.*.allow=user for http-alternates

From: Jeff King The http-walker may fetch the http-alternates (or alternates) file from a remote in order to find more objects. This should count as a "not from the user" use of the protocol. But because we implement the redirection ourselves and feed the new URL to curl, it will

[PATCH v10 5/6] transport: add from_user parameter to is_transport_allowed

Add a from_user parameter to is_transport_allowed() to allow http to be able to distinguish between protocol restrictions for redirects versus initial requests. CURLOPT_REDIR_PROTOCOLS can now be set differently from CURLOPT_PROTOCOLS to disallow use of protocols with the "user" policy in

[PATCH v10 1/6] lib-proto-disable: variable name fix

The test_proto function assigns the positional parameters to named variables, but then still refers to "$desc" as "$1". Using $desc is more readable and less error-prone. Signed-off-by: Brandon Williams --- t/lib-proto-disable.sh | 12 ++-- 1 file changed, 6

[PATCHv3 0/4] git-rm absorbs submodule git directory before deletion

v3: * removed the patch to enhance ok_to_remove_submodule to absorb the submodule if needed * Removed all the error reporting from git-rm that was related to submodule git directories not absorbed. * instead just absorb the git repositories or let the absorb function die with an appropriate

[PATCH v10 0/6] transport protocol policy configuration

v10 of this series fixes the following: * A few updates to the commit messages in order to better convey the reasoning behind the a few of the patches. * Additional test to verify that curl redirects respect configured protocol policies. * Patch added by Jeff King to make http alternates

[PATCHv3 1/4] submodule.h: add extern keyword to functions

As the upcoming series will add a lot of functions to the submodule header, let's first make the header consistent to the rest of the project by adding the extern keyword to functions. As per the CodingGuidelines we try to stay below 80 characters per line, so adapt all those functions to stay

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On 12/14, Jeff King wrote: > On Wed, Dec 14, 2016 at 03:33:49PM -0500, Jeff King wrote: > > > One other "simple" fix is at the moment we parse http-alternates, to > > parse the URL ourself and check the policy. Like: > > [...] > > I may have convinced myself this is a reasonable approach. > > So

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On Wed, Dec 14, 2016 at 03:33:49PM -0500, Jeff King wrote: > One other "simple" fix is at the moment we parse http-alternates, to > parse the URL ourself and check the policy. Like: > [...] > I may have convinced myself this is a reasonable approach. So here it is in patch form, with a test. I

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On 12/14, Jeff King wrote: > On Wed, Dec 14, 2016 at 12:37:52PM -0800, Brandon Williams wrote: > > > Naively looking at the code (and your longer suggestion), is there a > > reason why we couldn't simply have http-walker set CURLOPT_PROTOCOLS > > with get_curl_allowed_protocols(0) in the

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On Wed, Dec 14, 2016 at 12:37:52PM -0800, Brandon Williams wrote: > Naively looking at the code (and your longer suggestion), is there a > reason why we couldn't simply have http-walker set CURLOPT_PROTOCOLS > with get_curl_allowed_protocols(0) in the fetch_alternates() function? > That way we

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On 12/14, Brandon Williams wrote: > On 12/14, Jeff King wrote: > > On Tue, Dec 13, 2016 at 05:40:37PM -0800, Brandon Williams wrote: > > > > > Add the from_user parameter to the 'is_transport_allowed' function. > > > This allows callers to query if a transport protocol is allowed, given > > >

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On Wed, Dec 14, 2016 at 12:13:23PM -0800, Brandon Williams wrote: > > I find it unlikely that anybody would ever care, but at least we'd do > > the safe thing. I dunno. Maybe I am just being lazy. > > Well, that's unfortunate! It does sound like a more full-proof solution > to these dumb http

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On 12/14, Jeff King wrote: > On Tue, Dec 13, 2016 at 05:40:37PM -0800, Brandon Williams wrote: > > > Add the from_user parameter to the 'is_transport_allowed' function. > > This allows callers to query if a transport protocol is allowed, given > > that the caller knows that the protocol is coming

[PATCH v2] fix pushing to //server/share/dir on Windows

normalize_path_copy() is not prepared to keep the double-slash of a //server/share/dir kind of path, but treats it like a regular POSIX style path and transforms it to /server/share/dir. The bug manifests when 'git push //server/share/dir master' is run, because tmp_objdir_add_as_alternate() uses

Re: [PATCH v2 01/34] sequencer: support a new action: 'interactive rebase'

Johannes Schindelin writes: > -/* We will introduce the 'interactive rebase' mode later */ > static inline int is_rebase_i(const struct replay_opts *opts) > { > - return 0; > + return opts->action == REPLAY_INTERACTIVE_REBASE; > } > > static const char

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

Am 14.12.2016 um 14:06 schrieb Jeff King: On Wed, Dec 14, 2016 at 07:53:23AM -0500, Jeff King wrote: On Wed, Dec 14, 2016 at 09:34:20AM +0100, Johannes Sixt wrote: I wanted to see what it would look like if we make it the caller's responsibility to throw away stderr. The patch is below, as

Re: [PATCHv2 5/5] rm: add absorb a submodules git dir before deletion

Stefan Beller writes: > diff --git a/builtin/rm.c b/builtin/rm.c > index fdd7183f61..8c9c535a88 100644 > --- a/builtin/rm.c > +++ b/builtin/rm.c > @@ -392,28 +392,14 @@ int cmd_rm(int argc, const char **argv, const char > *prefix) > for (i = 0; i < list.nr;

Re: [PATCH v7 00/16] Mark strings in Perl scripts for translation

Vasco Almeida writes: > Changes is this re-roll v7: > * Add get_comment_line_char subroutine to perl/Git.pm and use it. > * get_comment_line_char gets the value of core.commentchar configuration > variable. It handles the 'auto' value taking '#' in this case as the >

Re: [PATCHv2 4/5] ok_to_remove_submodule: absorb the submodule git dir

On Wed, Dec 14, 2016 at 10:46 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> It is a major reason to say no, when deciding if a submodule can be >> deleted, if the git directory of the submodule being contained in the >> submodule's working

Re: [PATCHv2 4/5] ok_to_remove_submodule: absorb the submodule git dir

Stefan Beller writes: > It is a major reason to say no, when deciding if a submodule can be > deleted, if the git directory of the submodule being contained in the > submodule's working directory. > > Migrate the git directory into the superproject instead of failing, > and

Re: [PATCHv2 2/5] submodule: modernize ok_to_remove_submodule to use argv_array

Stefan Beller writes: > Instead of constructing the NULL terminated array ourselves, we > should make use of the argv_array infrastructure. > > While at it, adapt the error messages to reflect the actual invocation. > > Signed-off-by: Stefan Beller > ---

Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

The last one 3/3 is a nice touch that makes sure that we do not forget what we discovered during the discussion. Very much appreciated. Will queue. Thanks.

Re: [PATCH v9 4/5] http: create function to get curl allowed protocols

On 12/14, Jeff King wrote: > On Tue, Dec 13, 2016 at 05:40:36PM -0800, Brandon Williams wrote: > > > Move the creation of an allowed protocols whitelist to a helper > > function. > > This is "what" but not "why". You can figure it out if you see the next > patch, but it's often nice to make a

Re: [PATCH] parse-options: print "fatal:" before usage_msg_opt()

Jeff King writes: > Programs may use usage_msg_opt() to print a brief message > followed by the program usage, and then exit. The message > isn't prefixed at all, though, so it doesn't match our usual > error output and is easy to overlook: > > $ git clone 1 2 3 > Too many

Re: [PATCH v9 3/5] http: always warn if libcurl version is too old

On 12/14, Jeff King wrote: > On Tue, Dec 13, 2016 at 05:40:35PM -0800, Brandon Williams wrote: > > > diff --git a/transport.c b/transport.c > > index e1ba78b..fbd799d 100644 > > --- a/transport.c > > +++ b/transport.c > > @@ -700,11 +700,6 @@ void transport_check_allowed(const char *type) > >

Re: [PATCH v2 4/6] update-unicode.sh: automatically download newer definition files

Beat Bolli writes: > On 14.12.16 00:31, Beat Bolli wrote: > >> [PATCH v2 4/6] update-unicode.sh: automatically download newer definition >> files > > Dang! And again I'm not capable of putting an underline instead of the > dash... > > Junio, would you please reword the

Re: [PATCH v2 4/6] update-unicode.sh: automatically download newer definition files

On 14.12.16 00:31, Beat Bolli wrote: > [PATCH v2 4/6] update-unicode.sh: automatically download newer definition > files Dang! And again I'm not capable of putting an underline instead of the dash... Junio, would you please reword the subject to Re: [PATCH v2 4/6] update_unicode.sh:

Re: [PATCHv2 0/7] Fix and generalize version sort reordering

Jeff King writes: > On Thu, Dec 08, 2016 at 03:23:54PM +0100, SZEDER Gábor wrote: > >> > With my patches it looks like this: >> > >> > $ git -c versionsort.prereleasesuffix=-pre \ >> > -c versionsort.prereleasesuffix=-prerelease \ >> > tag -l

Re: [PATCH] fix pushing to //server/share/dir paths on Windows

On Tue, Dec 13, 2016 at 10:32:01PM +0100, Johannes Sixt wrote: > normalize_path_copy() is not prepared to keep the double-slash of a > //server/share/dir kind of path, but treats it like a regular POSIX > style path and transforms it to /server/share/dir. > > The bug manifests when 'git push

Re: [PATCHv2 0/7] Fix and generalize version sort reordering

On Thu, Dec 08, 2016 at 03:23:54PM +0100, SZEDER Gábor wrote: > > With my patches it looks like this: > > > > $ git -c versionsort.prereleasesuffix=-pre \ > > -c versionsort.prereleasesuffix=-prerelease \ > > tag -l --sort=version:refname > > v1.0.0-prerelease1 > >

Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

Jeff King writes: > So not too bad (and you could probably refactor it to avoid some of the > duplication). Though it does get some obscure cases wrong, like: > > git merge --continue --verbose --quiet > > I dunno. Maybe I am leading you down a rabbit hole, and we should just >

Re: [PATCH v9 5/5] transport: add from_user parameter to is_transport_allowed

On Tue, Dec 13, 2016 at 05:40:37PM -0800, Brandon Williams wrote: > Add the from_user parameter to the 'is_transport_allowed' function. > This allows callers to query if a transport protocol is allowed, given > that the caller knows that the protocol is coming from the user (1) or > not from the

Re: [PATCH v9 4/5] http: create function to get curl allowed protocols

On Tue, Dec 13, 2016 at 05:40:36PM -0800, Brandon Williams wrote: > Move the creation of an allowed protocols whitelist to a helper > function. This is "what" but not "why". You can figure it out if you see the next patch, but it's often nice to make a brief mention, like: This will be useful

Re: [PATCH v9 3/5] http: always warn if libcurl version is too old

On Tue, Dec 13, 2016 at 05:40:35PM -0800, Brandon Williams wrote: > diff --git a/transport.c b/transport.c > index e1ba78b..fbd799d 100644 > --- a/transport.c > +++ b/transport.c > @@ -700,11 +700,6 @@ void transport_check_allowed(const char *type) > die("transport '%s' not

Re: [PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

On Wed, Dec 14, 2016 at 09:37:55PM +1300, Chris Packham wrote: > + if (continue_current_merge) { > + int nargc = 1; > + const char *nargv[] = {"commit", NULL}; > + > + if (orig_argc != 2) > + usage_msg_opt("--continue expects no

[PATCH] parse-options: print "fatal:" before usage_msg_opt()

Programs may use usage_msg_opt() to print a brief message followed by the program usage, and then exit. The message isn't prefixed at all, though, so it doesn't match our usual error output and is easy to overlook: $ git clone 1 2 3 Too many arguments. usage: git clone [] [--] []

Re: git stash filename - stashing single files.

On Wed, 2016-12-14 at 09:44 -0500, Jeff King wrote: > Personally, I think this is a pretty terrible interface. Besides the > fact that I have never written a stash message in all my years of using > git, it's totally inconsistent with the rest of git (which would use > "-m" for the message, and

Re: [RFC/PATCHv2] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 06:24:01AM -0500, Jeff King wrote: > On Wed, Dec 14, 2016 at 10:27:31PM +1300, Chris Packham wrote: > > > Changes in v2: > > - only run over actual git source files. > > - omit any files in t/ > > I actually wonder if FIND_SOURCE_FILES should be taking care of the "t/" >

[PATCH 3/4] Makefile: match shell scripts in FIND_SOURCE_FILES

We feed FIND_SOURCE_FILES to ctags to help developers navigate to particular functions, but we only feed C source code. The same feature can be helpful when working with shell scripts (especially the test suite). Modern versions of ctags know how to parse shell scripts; we just need to feed the

Re: git stash filename - stashing single files.

On Wed, Dec 14, 2016 at 02:53:20PM +0100, Jonas Hartmann wrote: > http://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git#comment32451416_3040833 > > Could it be possible to have "git stash [filename][filename]...", to > stash only single

[PATCH 4/4] Makefile: exclude contrib from FIND_SOURCE_FILES

When you're working on the git project, you're unlikely to care about random bits in contrib/ (e.g., you would not want to jump to the copy of xmalloc in the wincred credential helper). Nobody has really complained because there are relatively few C files in contrib. Now that we're matching shell

[PATCH 2/4] Makefile: exclude test cruft from FIND_SOURCE_FILES

The test directory may contain three types of files that match our patterns: 1. Helper programs in t/helper. 2. Sample data files (e.g., t/t4051/hello.c). 3. Untracked cruft in trash directories and t/perf/build. We want to match (1), but not the other two, as they just clutter up the

[PATCH 1/4] Makefile: reformat FIND_SOURCE_FILES

As we add to this in future commits, the formatting is going to make it harder and harder to read. Let's write it more as we would in a shell script, putting each logical block on its own line. Signed-off-by: Jeff King --- Just to make the other patches easier to read; no behavior

[PATCH 0/4] "make tags" improvements

A discussion earlier today made me notice that our "make tags" target includes some cruft that we shouldn't be indexing. This fixes that, and starts indexing some of the shell scripts, which is something I've been doing in a hacky way for a while. It's very convenient when working on the test

git stash filename - stashing single files.

Hello, http://stackoverflow.com/questions/3040833/stash-only-one-file-out-of-multiple-files-that-have-changed-with-git#comment32451416_3040833 Could it be possible to have "git stash [filename][filename]...", to stash only single files? There seems to be a broad community desire. Best --

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

On Wed, Dec 14, 2016 at 07:53:23AM -0500, Jeff King wrote: > On Wed, Dec 14, 2016 at 09:34:20AM +0100, Johannes Sixt wrote: > > > I wanted to see what it would look like if we make it the caller's > > responsibility to throw away stderr. The patch is below, as fixup > > of patch 29/34. The

[ANNOUNCE] Git Rev News edition 22

Hi everyone, The 22nd edition of Git Rev News is now published: https://git.github.io/rev_news/2016/12/14/edition-22/ Thanks a lot to all the contributors and helpers, especially David! Enjoy, Christian, Thomas, Jakub and Markus.

[PATCH v7 15/16] i18n: send-email: mark composing message for translation

When composing an e-mail, there is a message for the user whose lines begin in "GIT:" that can be marked for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git

[PATCH v7 02/16] i18n: add--interactive: mark strings for translation

Mark simple strings (without interpolation) for translation. Brackets around first parameter of ternary operator is necessary because otherwise xgettext fails to extract strings marked for translation from the rest of the file. Signed-off-by: Vasco Almeida ---

[PATCH v7 00/16] Mark strings in Perl scripts for translation

Changes is this re-roll v7: * Add get_comment_line_char subroutine to perl/Git.pm and use it. * get_comment_line_char gets the value of core.commentchar configuration variable. It handles the 'auto' value taking '#' in this case as the comment line character. * When core.commentchar is not set

[PATCH v7 07/16] i18n: add--interactive: mark patch prompt for translation

Mark prompt message assembled in place for translation, unfolding each use case for each entry in the %patch_modes hash table. Previously, this script relied on whether $patch_mode was set to run the command patch_update_cmd() or show status and loop the main loop. Now, it uses $cmd to indicate

[PATCH v7 14/16] i18n: send-email: mark string with interpolation for translation

Mark warnings, errors and other messages that are interpolated for translation. We call sprintf() before calling die() and in few other circumstances in order to replace the values on the placeholders. Signed-off-by: Vasco Almeida --- git-send-email.perl | 87

[PATCH v7 12/16] i18n: send-email: mark strings for translation

Mark strings often displayed to the user for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 54 +++-- 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/git-send-email.perl

[PATCH v7 08/16] i18n: add--interactive: i18n of help_patch_cmd

Mark help message of help_patch_cmd for translation. The message must be unfolded to be free of variables so we can have high quality translations. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 54 --- 1 file

[PATCH v7 03/16] i18n: add--interactive: mark simple here-documents for translation

Mark messages in here-documents without interpolation for translation. The here-document delimiter \EOF, which is the same as 'EOF', indicates that the text is to be treated literally without interpolation of its content. Unfortunately xgettext is not able to extract here-documents delimited

[PATCH v7 01/16] Git.pm: add subroutines for commenting lines

Add subroutines prefix_lines and comment_lines. Signed-off-by: Vasco Almeida --- perl/Git.pm | 38 ++ 1 file changed, 38 insertions(+) diff --git a/perl/Git.pm b/perl/Git.pm index b2732822a..bfce1f795 100644 --- a/perl/Git.pm +++

[PATCH v7 13/16] i18n: send-email: mark warnings and errors for translation

Mark warnings, errors and other messages for translation. Signed-off-by: Vasco Almeida --- git-send-email.perl | 34 +- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index

[PATCH v7 09/16] i18n: add--interactive: mark edit_hunk_manually message for translation

Mark message of edit_hunk_manually displayed in the editing file when user chooses 'e' option. The message had to be unfolded to allow translation of the $participle verb. Some messages end up being exactly the same for some use cases, but left it for easier change in the future, e.g., wanting

[PATCH v7 10/16] i18n: add--interactive: remove %patch_modes entries

Remove unnecessary entries from %patch_modes. After the i18n conversion, these entries are not used anymore. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 21 - 1 file changed, 21 deletions(-) diff --git a/git-add--interactive.perl

[PATCH v7 06/16] i18n: add--interactive: mark plural strings

Mark plural strings for translation. Unfold each action case in one entire sentence. Pass new keyword for xgettext to extract. Update test to include new subroutine __n() for plural strings handling. Update documentation to include a description of the new __n() subroutine. Signed-off-by:

[PATCH v7 04/16] i18n: add--interactive: mark strings with interpolation for translation

Since at this point Git::I18N.perl lacks support for Perl i18n placeholder substitution, use of sprintf following die or error_msg is necessary for placeholder substitution take place. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 25

[PATCH v7 11/16] i18n: add--interactive: mark status words for translation

Mark words 'nothing', 'unchanged' and 'binary' used to display what has been staged or not, in "git add -i" status command. Alternatively one could mark N__('nothing') no-op in order to xgettext(1) extract the string and then trigger the translation at run time only with __($print->{FILE}), but

[PATCH v7 05/16] i18n: clean.c: match string with git-add--interactive.perl

Change strings for help to match the ones in git-add--interactive.perl. The strings now represent one entry to translate each rather then two entries each different only by an ending newline character. Signed-off-by: Vasco Almeida --- builtin/clean.c | 10 +- 1

[PATCH v7 16/16] i18n: difftool: mark warnings for translation

Signed-off-by: Vasco Almeida --- git-difftool.perl | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/git-difftool.perl b/git-difftool.perl index a5790d03a..8d3632e55 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -22,6

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

On Wed, Dec 14, 2016 at 09:34:20AM +0100, Johannes Sixt wrote: > I wanted to see what it would look like if we make it the caller's > responsibility to throw away stderr. The patch is below, as fixup > of patch 29/34. The change is gross, but the end result is not that > bad, though not really a

RE: Creating remote git repository?

On December 14, 2016 1:01 AM, essam Ganadily wrote: > given that git is an old and mature product i wounder why there is no > command line (git.exe in windows) way of creating a remote git repository? > > "git remote create repo myreponame" Why not run the commands mkdir myreponame; cd

Re: [RFC/PATCHv2] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 10:27:31PM +1300, Chris Packham wrote: > Changes in v2: > - only run over actual git source files. > - omit any files in t/ I actually wonder if FIND_SOURCE_FILES should be taking care of the "t/" thing. I think "make tags" finds tags in t4051/appended1.c, which is just

Re: [RFC/PATCH] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 09:33:59PM +1300, Chris Packham wrote: > > I do see a few real problems, but many false positives, too. > > Unfortunately, one of the false positives is: > > > > int foo = foo; > > On I side note I have often wondered how this actually works to avoid > the

Admin Institutionen © 3M 1995-2016. Alla rättigheter reserverade.

Microsoft Office: Som en del av våra ansträngningar att förbättra din upplevelse över våra konsumenttjänster, uppdaterar vi för Microsoft-tjänster och Microsofts sekretesspolicy. Vi vill passa på att meddela dig om dessa uppdateringar. genom att KLICKA

[RFC/PATCHv2] Makefile: add cppcheck target

Add cppcheck target to Makefile. Cppcheck is a static analysis tool for C/C++ code. Cppcheck primarily detects the types of bugs that the compilers normally do not detect. It is an useful target for doing QA analysis. To run the default set of checks run make cppcheck Additional checks can

[PATCH 3/3] merge: Ensure '--abort' option takes no arguments

Like '--continue', the '--abort' option doesn't make any sense with other options or arguments to 'git merge' so ensure that none are present. Signed-off-by: Chris Packham --- Changes in v3: - new builtin/merge.c | 4 t/t7600-merge.sh | 2 ++ 2 files changed, 6

[PATCHv3 1/3] merge: Add '--continue' option as a synonym for 'git commit'

Teach 'git merge' the --continue option which allows 'continuing' a merge by completing it. The traditional way of completing a merge after resolving conflicts is to use 'git commit'. Now with commands like 'git rebase' and 'git cherry-pick' having a '--continue' option adding such an option to

[PATCH 2/3] completion: add --continue option for merge

Add 'git merge --continue' option when completing. Signed-off-by: Chris Packham --- Changes in v2: - new Changes in v3: - none contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

Re: [PATCH v2 28/34] run_command_opt(): optionally hide stderr when the command succeeds

Am 13.12.2016 um 16:32 schrieb Johannes Schindelin: > This will be needed to hide the output of `git commit` when the > sequencer handles an interactive rebase's script. > > Signed-off-by: Johannes Schindelin > --- > run-command.c | 23 +++ >

Re: [RFC/PATCH] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 1:15 AM, Jeff King wrote: > On Tue, Dec 13, 2016 at 10:22:25PM +1300, Chris Packham wrote: > >> $ make cppcheck >> cppcheck --force --quiet --inline-suppr . >> [compat/nedmalloc/malloc.c.h:4093]: (error) Possible null pointer >> dereference: sp >>

Re: [RFC/PATCH] Makefile: add cppcheck target

On Wed, Dec 14, 2016 at 1:28 AM, Jeff King wrote: > On Tue, Dec 13, 2016 at 07:15:10AM -0500, Jeff King wrote: > >> I think these last two are a good sign that we need to be feeding the >> list of source files to cppcheck. I tried your patch and it also started >> looking in

[PATCHv1 0/1] git-p4: handle symlinked directories

There's a long-standing bug around handling of symlinked directories in git-p4. If in git you create a directory, and then symlink it, when git-p4 tries to create the diff-summary of what it's about to do, it tries to open the symlink as a regular file, and fails. Luke Diamand (1): git-p4:

[PATCHv1 1/1] git-p4: avoid crash adding symlinked directory

When submitting to P4, if git-p4 came across a symlinked directory, then during the generation of the submit diff, it would try to open it as a normal file and fail. Spot this case, and instead output the target of the symlink in the submit diff. Add a test case. Signed-off-by: Luke Diamand

some updates for public-inbox readers

First, bad news: There's been some hardware problems the past week or so and a few minutes of scattered downtime and high latency as a result. Hopefully no lost messages, as SMTP should retry. Getting things migrated to different hardware in a few minutes, so maybe the new hardware will have