Re: git submodules implementation question

Junio C Hamano writes: > I was wondering if we should unconditionally stuff GIT_DIR= repository location for the submodule> in the cp.env_array passed to > the function prepare_submodule_repo_env(). As cp.dir will be set to > the submodule's working tree, there is no need to

Re: Literate programming with git

> How does the linearify/dendrify work with already non-linear history? The current implementation using magic strings in commit messages seems incompatible with existing projects. How about annotating an existing project with git-notes instead? You could add notes to existing commits without

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

On Wed, Aug 31, 2016 at 3:36 AM Johannes Schindelin wrote: > On Tue, 30 Aug 2016, Junio C Hamano wrote: > > Jeff King writes: > > > Hmm, interesting. Your approach seems reasonable, but I have to wonder > > > if writing the pid in the first place is

Re: [PATCH v12 0/8] submodule inline diff format

Jacob Keller writes: > @@ -523,8 +523,10 @@ char *git_pathdup_submodule(const char *path, const char > *fmt, ...) > va_start(args, fmt); > err = do_submodule_path(, path, fmt, args); > va_end(args); > - if (err) > + if (err) { > +

Re: git submodules implementation question

Here's one more attempt where I changed prepare_submodule_repo_env() to take the submodule git dir as an argument. Sorry for including this long code diff inline. If there's a better way to have this discussion with code please let me know. Thanks, Uma diff --git a/builtin/submodule--helper.c

Re: [GIT PULL] l10n updates for 2.10.0 round 2

On 31/08/2016 21:14, Jiang Xin wrote: > Hi Junio, > > Would you please pull the following git l10n updates. Please wait! Jiang Xin probably missing pull my one commit[1]. [1] Thanks, -- Trần Ngọc Quân.

Re: [PATCH v12 0/8] submodule inline diff format

On Wed, Aug 31, 2016 at 4:27 PM, Jacob Keller wrote: > From: Jacob Keller > > Hopefully the final revision here. I've squashed in the memory leak fix > suggested by Stefan, and the suggested changes from Junio, including his > re-worded commit

[PATCH v12 0/8] submodule inline diff format

From: Jacob Keller Hopefully the final revision here. I've squashed in the memory leak fix suggested by Stefan, and the suggested changes from Junio, including his re-worded commit messages. interdiff between v11 and v12 diff --git c/path.c w/path.c index

[PATCH v12 5/8] allow do_submodule_path to work even if submodule isn't checked out

From: Jacob Keller Currently, do_submodule_path will attempt locating the .git directory by using read_gitfile on /.git. If this fails it just assumes the /.git is actually a git directory. This is good because it allows for handling submodules which were cloned in a

[PATCH v12 4/8] diff: prepare for additional submodule formats

From: Jacob Keller A future patch will add a new format for displaying the difference of a submodule. Make it easier by changing how we store the current selected format. Replace the DIFF_OPT flag with an enumeration, as each format will be mutually exclusive.

[PATCH v12 2/8] diff.c: remove output_prefix_length field

From: Junio C Hamano "diff/log --stat" has a logic that determines the display columns available for the diffstat part of the output and apportions it for pathnames and diffstat graph automatically. 5e71a84a (Add output_prefix_length to diff_options, 2012-04-16) added the

[PATCH v12 6/8] submodule: convert show_submodule_summary to use struct object_id *

From: Jacob Keller Since we're going to be changing this function in a future patch, lets go ahead and convert this to use object_id now. Signed-off-by: Jacob Keller Signed-off-by: Junio C Hamano --- diff.c | 2 +-

[PATCH v12 7/8] submodule: refactor show_submodule_summary with helper function

From: Jacob Keller A future patch is going to add a new submodule diff format which displays an inline diff of the submodule changes. To make this easier, and to ensure that both submodule diff formats use the same initial header, factor out show_submodule_header()

[PATCH v12 3/8] graph: add support for --line-prefix on all graph-aware output

From: Jacob Keller Add an extension to git-diff and git-log (and any other graph-aware displayable output) such that "--line-prefix=" will print the additional line-prefix on every line of output. To make this work, we have to fix a few bugs in the graph API that force

[PATCH v12 8/8] diff: teach diff to display submodule difference with an inline diff

From: Jacob Keller Teach git-diff and friends a new format for displaying the difference of a submodule. The new format is an inline diff of the contents of the submodule between the commit range of the update. This allows the user to see the actual code change caused by

[PATCH v12 1/8] cache: add empty_tree_oid object and helper function

From: Jacob Keller Similar to is_null_oid(), and is_empty_blob_sha1() add an empty_tree_oid along with helper function is_empty_tree_oid(). For completeness, also add an "is_empty_tree_sha1()", "is_empty_blob_sha1()", "is_empty_tree_oid()" and "is_empty_blob_oid()"

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

On Wed, Aug 31, 2016 at 10:29 AM, Jakub Narębski wrote: > > BTW. perhaps we would be able to continue with 'git continue', regardless > of what we have started with, I wonder... > git continue as a shorthand for `git --continue` sounds great. If we were to introduce that, I

Re: [PATCH v11 0/8] submodule inline diff format

On Wed, Aug 31, 2016 at 9:45 AM, Junio C Hamano wrote: > Jacob Keller writes: > >>> We probably should release for the error case. I'll do that. I don't >>> believe do_submodule_path ensures that the passed in argument is >>> guaranteed to not be

Re: [PATCH v13 14/14] builtin/am: use apply API in run_apply()

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > + > + if (opts_left != 0) > + die("unknown option passed thru to git apply"); Through and thru are different spellings of the same word. Thru is the less preferred form, however, and it

Re: [PATCH v13 10/14] apply: change error_routine when silent

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > To avoid printing anything when applying with > `state->apply_verbosity == verbosity_silent`, let's save the > existing warn and error routines before applying, and let's > replace them with a routine that

Re: [PATCH v13 00/14] libify apply and use lib in am, part 3

Christian Couder writes: > On Mon, Aug 29, 2016 at 9:04 PM, Junio C Hamano wrote: >> Christian Couder writes: >> >>> Highlevel view of the patches in the series >>> ~~~ >>> >>>

Re: [PATCH V2] git-send-email: Add ability to cc: any "bylines" in the commit message

On Wed, 2016-08-31 at 11:51 -0700, Joe Perches wrote: > Many commits have various forms of bylines similar to > "Acked-by: Name " and "Reported-by: Name " > > Add the ability to cc: bylines (e.g. Acked-by:) when using git send- > email. > > This can be suppressed with --suppress-cc=bylines.

Re: [PATCH v13 06/14] apply: make it possible to silently apply

> Printing on stdout, and calls to warning() or error() are not > taken care of in this patch, as that will be done in following > patches. > - if (state->apply_verbosely) > + if (state->apply_verbosity > verbosity_normal) > error(_("while

Re: [PATCH v13 05/14] apply: use error_errno() where possible

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > To avoid possible mistakes and to uniformly show the errno > related messages, let's use error_errno() where possible. > > Signed-off-by: Christian Couder > --- Looks good, Thanks

Re: [PATCH v13 04/14] apply: make some parsing functions static again

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > Some parsing functions that were used in both "apply.c" and > "builtin/apply.c" are now only used in the former, so they > can be made static to "apply.c". > > Signed-off-by: Christian Couder

Re: [PATCH v13 03/14] Move libified code from builtin/apply.c to apply.{c,h}

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > As most of the apply code in builtin/apply.c has been libified by a number of > previous commits, it can now be moved to apply.{c,h}, so that more code can > use it. > > Helped-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v13 02/14] apply: rename and move opt constants to apply.h

On Sat, Aug 27, 2016 at 11:45 AM, Christian Couder wrote: > extern int check_apply_state(struct apply_state *state, int force_apply); > With greater scope comes greater responsibility. Nit of the day: In case a reroll is necessary, consider putting a comment here.

What's cooking in git.git (Aug 2016, #09; Wed, 31)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Now that final set of l10n

Re: Literate programming with git

On Wed, Aug 31, 2016 at 1:41 PM, Ben North wrote: > > https://github.com/bennorth/git-dendrify So looking at the Readme there: * Add printing facility |\ | * Add watermarks | |\ | | * Allow choice of colour | | * Add known-good test cases |

Re: [PATCH 18/22] sequencer: support amending commits

W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > This teaches the sequencer_commit() function to take an argument that > will allow us to implement "todo" commands that need to amend the commit > messages ("fixup", "squash" and "reword"). > > Signed-off-by: Johannes Schindelin

Re: [PATCH 17/22] sequencer: allow editing the commit message on a case-by-case basis

W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > In the upcoming commits, we will implement more and more of rebase > -i's functionality. One particular feature of the commands to come is > that some of them allow editing the commit message while others don't, > i.e. we cannot define in

Re: [PATCH v2 2/4] cat-file: introduce the --filters option

Johannes Schindelin writes: >> > + if (S_ISREG(mode)) { >> > + struct strbuf strbuf = STRBUF_INIT; >> > + if (convert_to_working_tree(path, *buf, *size, )) { >> > + free(*buf); >> > + *size = strbuf.len; >> > +

Re: [PATCH 05/34] sequencer (rebase -i): learn about the 'verbose' mode

Hi Dennis, On Wed, 31 Aug 2016, Dennis Kaarsemaker wrote: > On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > > > +   if (file_exists(rebase_path_verbose())) > > +   opts->verbose = 1; > > I don't see anything in this series that creates this file,

Literate programming with git

Hi, I've recently been experimenting with using git to make software more human-readable. Presenting software for humans to read is not a new idea (Knuth's 'literate programming'), but I think git can be a new tool for showing the development of code in a structured way. Merge-commits can break

Re: [PATCH v2 0/4] cat-file: optionally convert to worktree version

Hi Junio, On Mon, 29 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > When third-party tools need to access to contents of blobs in the > > database, they might be more interested in the worktree version than in > > the "clean" version of said

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Jakub Narębski writes: > Though xstrdup(buf.buf + 2) followed by strbuf_release() would > make free(opts->gpg_sign) possible without crash. That is we can > work without *_entrust() mechanism at the cost of strdups. Absolutely. It is not like entrust() thing is free of

Re: [PATCH v2 2/4] cat-file: introduce the --filters option

Hi Junio, On Wed, 24 Aug 2016, Junio C Hamano wrote: > Johannes Schindelin writes: > > > +static int filter_object(const char *path, unsigned mode, > > +const unsigned char *sha1, > > +char **buf, unsigned long *size) > > +{ >

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

W dniu 31.08.2016 o 22:12, Junio C Hamano pisze: > Jakub Narębski writes: >> Johannes Schindelin wrote: >>> + else { >>> + opts->gpg_sign = buf.buf + 2; >>> + strbuf_detach(, NULL); >> >> Wouldn't we leak 2

Re: [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately

Johannes Schindelin writes: > However, I do not want to hold this patch series up just by being > stubborn. Peff and I disussed this further in the thread in which the message appears, and agreed that it does not matter

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Jakub Narębski writes: >> +else { >> +opts->gpg_sign = buf.buf + 2; >> +strbuf_detach(, NULL); > > Wouldn't we leak 2 characters that got skipped? Maybe xstrdup would > be better (if it is leaked, and

Re: [PATCH 16/22] sequencer: prepare for rebase -i's GPG settings

Hello Johannes, W dniu 29.08.2016 o 10:06, Johannes Schindelin pisze: > The rebase command sports a `--gpg-sign` option that is heeded by the > interactive rebase. Should it be "sports" or "supports"? > > This patch teaches the sequencer that trick, as part of the bigger > effort to make the

Re: [PATCH V2] git-send-email: Add ability to cc: any "bylines" in the commit message

Joe Perches writes: > On Wed, 2016-08-31 at 12:34 -0700, Junio C Hamano wrote: >> Joe Perches writes: >> > Many commits have various forms of bylines similar to >> A missing blank line (I can tweak while queuing). > [] >> > + next if

Re: [PATCH 0/2] squelch some "gcc -O3 -Wmaybe-uninitialized" warnings

Jeff King writes: > I happened to be compiling git with -O3 today, and noticed we generate > some warnings about uninitialized variables (I actually compile with > -Wall, but the only false positives I saw were these). > > Here are patches to squelch them. > > [1/2]:

Re: [PATCH v2 3/4] cat-file --textconv/--filters: allow specifying the path separately

Hi Junio, On Wed, 24 Aug 2016, Junio C Hamano wrote: > Junio C Hamano writes: > > > Mentioned elsewhere, but I think the above should be > > > > if (!path) > > path = obj_context.path; > > > > if (obj_context.mode == S_IFINVALID) > >

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Jakub Narębski writes: @@ -709,6 +709,8 @@ static int read_and_refresh_cache(struct replay_opts *opts) struct todo_item { enum todo_command command; struct commit *commit; + const char *arg; + int arg_len; > >> I am not sure what

Re: [PATCH V2] git-send-email: Add ability to cc: any "bylines" in the commit message

On Wed, 2016-08-31 at 12:34 -0700, Junio C Hamano wrote: > Joe Perches writes: > > Many commits have various forms of bylines similar to > A missing blank line (I can tweak while queuing). [] > > + next if $suppress_cc{'bylines'} and $what !~ > >

Re: [PATCH V2] git-send-email: Add ability to cc: any "bylines" in the commit message

Joe Perches writes: > Many commits have various forms of bylines similar to A missing blank line (I can tweak while queuing). > "Acked-by: Name " and "Reported-by: Name " > > Add the ability to cc: bylines (e.g. Acked-by:) when using git send-email. > > This can be

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

W dniu 31.08.2016 o 21:10, Junio C Hamano pisze: > Jakub Narębski writes: > >>> diff --git a/sequencer.c b/sequencer.c >>> index 06759d4..3398774 100644 >>> --- a/sequencer.c >>> +++ b/sequencer.c >>> @@ -709,6 +709,8 @@ static int read_and_refresh_cache(struct replay_opts >>>

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

Jakub Narębski writes: >> diff --git a/sequencer.c b/sequencer.c >> index 06759d4..3398774 100644 >> --- a/sequencer.c >> +++ b/sequencer.c >> @@ -709,6 +709,8 @@ static int read_and_refresh_cache(struct replay_opts >> *opts) >> struct todo_item { >> enum todo_command

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Johannes Schindelin writes: > The problem is that the `git-rebase-todo` most definitely does *not* want > to be restricted to a single command. Looking at the test in question, it is about what happens when "git cherry-pick A..B" runs, and the test assumes it gets a

Re: git submodules implementation question

> We want to affect only the process we are going to spawn to work > inside the submodule, not ourselves, which is what this call does; > this does not sound like a good idea. Okay, in that case I would have to pass the "git_dir" as a new argument to prepare_submodule_repo_env(). I know what to

[PATCH V2] git-send-email: Add ability to cc: any "bylines" in the commit message

Many commits have various forms of bylines similar to "Acked-by: Name " and "Reported-by: Name " Add the ability to cc: bylines (e.g. Acked-by:) when using git send-email. This can be suppressed with --suppress-cc=bylines. Signed-off-by: Joe Perches ---

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Hello Johannes, W dniu 31.08.2016 o 20:36, Johannes Schindelin pisze: > On Wed, 31 Aug 2016, Jakub Narębski wrote: >> W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > I am of the opinion that overzealous checking of certain implementation > details is something to be avoided. I agree.

Re: git submodules implementation question

Uma Srinivasan writes: > diff --git a/submodule.c b/submodule.c > index 5a62aa2..23443a7 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -960,6 +960,9 @@ unsigned is_submodule_modified(const char *path, > int ignore_untracked) > return 0; > >

Re: git submodules implementation question

FWIW, I tried the following quick change based on the info. provided by Junio and it seems to "fix" my original problem. I'll let you experts figure out if we need a more complete fix or not. diff --git a/submodule.c b/submodule.c index 5a62aa2..23443a7 100644 --- a/submodule.c +++ b/submodule.c

Re: [PATCH 06/34] sequencer (rebase -i): write the 'done' file

On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > In the interactive rebase, commands that were successfully processed are > not simply discarded, but appended to the 'done' file instead. This is > used e.g. to display the current state to the user in the output of > `git status` or

Re: [PATCH 15/34] sequencer (rebase -i): leave a patch upon error

On wo, 2016-08-31 at 10:55 +0200, Johannes Schindelin wrote: > Just like the interactive rebase, we want to leave a 'patch' file for > further inspection by the user (even if we never tried to actually apply > that patch, since we're cherry-picking instead). > > Signed-off-by: Johannes Schindelin

Re: [PATCH 00/34] Teach the sequencer to act as rebase -i's backend

On wo, 2016-08-31 at 10:53 +0200, Johannes Schindelin wrote: > This marks the count down to '3': two more patch series after this > (really tiny ones) and we have a faster rebase -i. I got to 16/34 (and skipped 07/34), will continue tomorrow. I hope the comments are useful. D.

Re: [PATCH 05/34] sequencer (rebase -i): learn about the 'verbose' mode

On wo, 2016-08-31 at 10:54 +0200, Johannes Schindelin wrote: > +   if (file_exists(rebase_path_verbose())) > +   opts->verbose = 1; I don't see anything in this series that creates this file, will that be part of a later series? D.

Re: [PATCH 13/22] sequencer: remember the onelines when parsing the todo file

W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > The `git-rebase-todo` file contains a list of commands. Most of those > commands have the form > > > > The is displayed primarily for the user's convenience, as > rebase -i really interprets only the part. However, there > are

Re: [PATCH 08/22] sequencer: remove overzealous assumption

Hi Kuba, On Wed, 31 Aug 2016, Jakub Narębski wrote: > W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > > The sequencer was introduced to make the cherry-pick and revert > > functionality available as library function, with the original idea > > being to extend the sequencer to also

Re: [PATCH 11/22] sequencer: get rid of the subcommand field

W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > The subcommands are used exactly once, at the very beginning of > sequencer_pick_revisions(), to determine what to do. This is an > unnecessary level of indirection: we can simply call the correct > function to begin with. So let's do that.

Re: [PATCH] git-send-email: Add ability to cc: any "trailers" from commit message

On Wed, 2016-08-31 at 10:54 -0700, Junio C Hamano wrote: > Joe Perches writes: > > > > Many commits have various forms of trailers similar to > >  "Acked-by: Name " and "Reported-by: Name " > > > > Add the ability to cc these trailers when using git send-email. > I thought

Re: [PATCH] git-send-email: Add ability to cc: any "trailers" from commit message

Joe Perches writes: > On Wed, 2016-08-31 at 10:54 -0700, Junio C Hamano wrote: >> Joe Perches writes: >> >> > >> > Many commits have various forms of trailers similar to >> > "Acked-by: Name " and "Reported-by: Name " >> > >> > Add the ability to cc

Re: [PATCH 10/22] sequencer: avoid completely different messages for different actions

CC-ed to Jiang Xin, L10N coordinator. W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > Signed-off-by: Johannes Schindelin > --- > sequencer.c | 7 ++- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/sequencer.c b/sequencer.c > index

Re: [PATCH] git-send-email: Add ability to cc: any "trailers" from commit message

On Wed, 2016-08-31 at 10:54 -0700, Junio C Hamano wrote: > Joe Perches writes: > > > > > Many commits have various forms of trailers similar to > >  "Acked-by: Name " and "Reported-by: Name " > > > > Add the ability to cc these trailers when using git send-email. > I

Re: [PATCH] git-send-email: Add ability to cc: any "trailers" from commit message

Joe Perches writes: > Many commits have various forms of trailers similar to > "Acked-by: Name " and "Reported-by: Name " > > Add the ability to cc these trailers when using git send-email. I thought you were asking what we call these " followed by " at the end of the log

Re: [PATCH 09/22] sequencer: completely revamp the "todo" script parsing

W dniu 29.08.2016 o 10:05, Johannes Schindelin pisze: > When we came up with the "sequencer" idea, we really wanted to have > kind of a plumbing equivalent of the interactive rebase. Hence the > choice of words: the "todo" script, a "pick", etc. > > However, when it came time to implement the

Re: [PATCH v2 00/11] Mark strings in perl script for translation

Vasco Almeida writes: > Mark messages in some perl scripts for translation. > > Since v1, adds brackets so parameter grouping of sprintf parameters is easier > to see. > > Interdiff included below. Thanks; it is way too late for this cycle for i18n so I won't be picking

Re: [GIT PULL] l10n updates for 2.10.0 round 2

Jiang Xin writes: > Would you please pull the following git l10n updates. > > The following changes since commit d5cb9cbd64165153a318e1049f8bf14b09a16b11: > > Git 2.10-rc2 (2016-08-26 13:59:20 -0700) > > are available in the git repository at: > >

Request for advice: visual diffing kicad EDA schematics

Hi all, I would like to be able to visually see the differences between two versions of schematic sheets of a kicad project. Kicad file format is ascii based, which allows to generate text diff between versions of schematic files. However, except for adding and removing components, when the

Re: [PATCH v11 0/8] submodule inline diff format

Jacob Keller writes: >> We probably should release for the error case. I'll do that. I don't >> believe do_submodule_path ensures that the passed in argument is >> guaranteed to not be initialized or used. >> >> Thanks, >> Jake > > Here's the squash for this fix. It

Re: git submodules implementation question

Uma Srinivasan writes: >> I might suggest to update prepare_submodule_repo_env() so that the >> spawned process will *NOT* have to guess where the working tree and >> repository by exporting GIT_DIR (set to "git_dir" we discover above) >> and GIT_WORK_TREE (set to "." as

Re: [PATCH v6 00/12] Update git revisions

Philip Oakley writes: > These are the quick fixes to Marc's comments to patches 5,6,11, > and a consequential change to 12. > > Only the changed patches are included. I gave a cursory re-read on the whole thing again, and spotted no further issue. This has been kept in

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

On wo, 2016-08-31 at 06:48 -0400, Jeff King wrote: > On Wed, Aug 31, 2016 at 11:12:26AM +0200, Dennis Kaarsemaker wrote: > > > > > That is indeed a bug. git reads the config of t1 and then thinks a > > template config has set that value, so it won't override it. > This is a regression in v2.9.0

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

Hi Ævar, On Wed, 31 Aug 2016, Ævar Arnfjörð Bjarmason wrote: > I haven't used it myself (or any Windows thing) but people say good > things about http://strawberryperl.com Ah yes. This comes up frequently. Many a Git for Windows user pointed me into that direction. The biggest problem with

git-completion.zsh does not escape spaces in filenames

Hi, git-completion.zsh does not seem to properly escape spaces in filenames. My git version: 2.9.2 My zsh version: 5.0.8 Expected behaviour: When completing filenames that contain spaces, for example "foo bar", I would expect the git completion to complete "git add foo" to "git add foo\ bar".

[GIT PULL] l10n updates for 2.10.0 round 2

Hi Junio, Would you please pull the following git l10n updates. The following changes since commit d5cb9cbd64165153a318e1049f8bf14b09a16b11: Git 2.10-rc2 (2016-08-26 13:59:20 -0700) are available in the git repository at: git://github.com/git-l10n/git-po tags/l10n-2.10.0-rnd2 for you to

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

On Wed, Aug 31, 2016 at 12:29 PM, Johannes Schindelin wrote: > Hi Ævar, > > On Tue, 30 Aug 2016, Ævar Arnfjörð Bjarmason wrote: > >> On Tue, Aug 30, 2016 at 10:51 PM, Jeff King wrote: >> > On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð

Re: [PATCH 08/22] sequencer: remove overzealous assumption

W dniu 29.08.2016 o 10:04, Johannes Schindelin pisze: > The sequencer was introduced to make the cherry-pick and revert > functionality available as library function, with the original idea > being to extend the sequencer to also implement the rebase -i > functionality. > > The test to ensure

Re: [PATCH v6 12/13] convert: add filter..process option

Hi, W dniu 31.08.2016 o 06:57, Torsten Bögershausen pisze: > On Tue, Aug 30, 2016 at 03:23:10PM -0700, Junio C Hamano wrote: >> Lars Schneider writes: >>> On 30 Aug 2016, at 20:59, Junio C Hamano wrote: Torsten, could you please in the future remove

[PATCH v2 11/11] i18n: difftool: mark warnings for translation

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

[PATCH v2 10/11] i18n: send-email: mark string with interpolation for translation

Mark warnings, errors and other messages that are interpolated for translation. We must call sprintf() before calling die() and in few other circumstances in order to interpolation take place. Signed-off-by: Vasco Almeida --- git-send-email.perl | 71

[PATCH v2 06/11] 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 | 65 +++ 1 file

[PATCH v2 05/11] i18n: add--interactive: mark message for translation

Mark 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 we must

[PATCH v2 01/11] 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 v2 09/11] 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 | 36 ++-- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/git-send-email.perl b/git-send-email.perl index

[PATCH v2 03/11] i18n: add--interactive: mark strings with interpolation for translation

Use of sprintf following die or error_msg is necessary for placeholder substitution take place. Signed-off-by: Vasco Almeida --- git-add--interactive.perl | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git

[PATCH v2 04/11] 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 subrotine Q__() for plural strings handling. Signed-off-by: Vasco Almeida --- Makefile | 3 ++-

[PATCH v2 07/11] 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 uses cases, but left it for easier change in the future, e.g., wanting

[PATCH v2 08/11] i18n: send-email: mark strings for translation

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

[PATCH v2 02/11] i18n: add--interactive: mark simple here documents for translation

Mark messages in here document without interpolation for translation. Marking for translation by removing here documents this way, rather than take advantage of "print __ << EOF" way, makes other instances of help messages in clean.c match the first two in this file. Otherwise, reusing here

[PATCH v2 00/11] Mark strings in perl script for translation

Mark messages in some perl scripts for translation. Since v1, adds brackets so parameter grouping of sprintf parameters is easier to see. Interdiff included below. Vasco Almeida (11): i18n: add--interactive: mark strings for translation i18n: add--interactive: mark simple here documents for

Re: [PATCH 20/20] builtin/reset: convert to use struct object_id

Hi Brian, On Sun, 28 Aug 2016, brian m. carlson wrote: > Signed-off-by: brian m. carlson I now looked through the rest of this patch series, and they all look good (incidentally, I spotted the same update_ref() thing before reading Paul's reply, so I guess my

Re: [PATCH 10/20] notes-merge: convert struct notes_merge_pair to struct object_id

Hi Brian, On Sun, 28 Aug 2016, brian m. carlson wrote: > assert(!"Invalid existing change recorded"); > } else { > - hashcpy(mp->obj, obj); > - hashcpy(mp->base, p->one->oid.hash); > -

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

On Wed, Aug 31, 2016 at 11:12:26AM +0200, Dennis Kaarsemaker wrote: > That is indeed a bug. git reads the config of t1 and then thinks a > template config has set that value, so it won't override it. This is a regression in v2.9.0 due to my ae5f677 (lazily load core.sharedrepository,

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

Hi, [Sverre: we are considering to remove the - suffix in test-results/, see more below.] On Tue, 30 Aug 2016, Junio C Hamano wrote: > Jeff King writes: > > > Hmm, interesting. Your approach seems reasonable, but I have to wonder > > if writing the pid in the first place is

Re: [PATCH v2] t/Makefile: add a rule to re-run previously-failed tests

Hi Ævar, On Tue, 30 Aug 2016, Ævar Arnfjörð Bjarmason wrote: > On Tue, Aug 30, 2016 at 10:51 PM, Jeff King wrote: > > On Tue, Aug 30, 2016 at 10:48:19PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > >> > -failed: $(patsubst trash,,$(patsubst directory.%,%.sh,$(wildcard > >> >

Re: bug: 'core.logallrefupdates' is not set by default in non-bare repository

That is indeed a bug. git reads the config of t1 and then thinks a template config has set that value, so it won't override it. This is caused by git init reading the config via get_shared_repository. The comment above it indicates that this may not be needed, and indeed not doing it makes this

[PATCH 14/34] sequencer (rebase -i): update refs after a successful rebase

An interactive rebase operates on a detached HEAD (to keep the reflog of the original branch relatively clean), and updates the branch only at the end. Now that the sequencer learns to perform interactive rebases, it also needs to learn the trick to update the branch before removing the directory

  1   2   >