Re: [PATCH 0/2] rebase: support --no-autostash

John Keeping writes: > John Keeping (2): > rebase: support --no-autostash > Documentation/git-rebase: fix --no-autostash formatting Looks good to me, thanks. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

Jeff King writes: > I'm not too familiar with the code, but this _seems_ to work for me: > > diff --git a/builtin/blame.c b/builtin/blame.c > index 21321be..2e03d47 100644 > --- a/builtin/blame.c > +++ b/builtin/blame.c > @@ -1375,6 +1375,10 @@ static struct commit_list

Re: [PATCH] Pass graph width to pretty formatting, so '%>|' can work properly

This "feels" correct ;-), but let me summon Duy who did the %>< padding at around a5752342 (pretty: support padding placeholders, %< %> and %><, 2013-04-19) for an extra set of eyes. Care to add a test or two while at it? Thanks. -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH v17 00/14] port tag.c to use ref-filter APIs

On Fri, Sep 11, 2015 at 11:00 PM, Eric Sunshine wrote: > > Hmm, but what actually changed in the re-sent patches? Without a link > to the discussion leading up to the re-send of changed-only patches, > and without an interdiff, the re-send is opaque and less accessible to

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

Michael Rappazzo writes: > The code formerly in branch.c was largely the basis of the > get_worktree_list implementation is now moved to worktree.c, > and the find_shared_symref implementation has been refactored > to use get_worktree_list > > Signed-off-by: Michael Rappazzo

Re: [PATCH v2 2/9] Documentation/git-send-pack.txt: Flow long synopsis line

Junio C Hamano writes: > Dave Borowitz writes: > >> I produced the patch with "git format-patch --subject-prefix='PATCH >> v2' --cover-letter @{u}.." and mailed with "git send-email >> --to=git@vger.kernel.org,gits...@pobox.com 0*.patch"; is there a way

v2.5.2 installation on Windows 10

Installation of 64bit could complete, but running Git GUI always prompt the error below: Couldn’t read file “C:\Program Files\Git\cmd\mingw64\libexec\git-core\git-gui”: no such file or directoryN�r��yb�X��ǧv�^�)޺{.n�+ا���ܨ}���Ơz�:+v���zZ+��+zf���h���~i���z�

error opening "git gui"

Hi, I´m in trouble just after installation of my Git for Windows. I get a box with error saying: couldn´t read file "C:\Program Files\Git\cmd\mingw64\libexec\git-core\git-gui": no such file or directory I´ve just installed git as normal. Git Bash works perfectly, and if I call "git gui" on bash

Re: [PATCH] tag, update-ref: improve description of option "create-reflog"

Ralf Thielow writes: > The description of option "create-reflog" is "create_reflog", which > is neither a good description, nor a sensible string to translate. > Change it to a more meaningful message. > > Signed-off-by: Ralf Thielow > --- This

[PATCH] Add tests for "Pass graph width to pretty formatting, so '%>|' can work properly"

--- t/t4205-log-pretty-formats.sh | 23 +++ 1 file changed, 23 insertions(+) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 7398605..3358837 100755 --- a/t/t4205-log-pretty-formats.sh +++ b/t/t4205-log-pretty-formats.sh @@ -319,6 +319,18 @@

Re: [PATCH] Pass graph width to pretty formatting, so '%>|' can work properly

Ok, there are the two tests (see the second e-mail). It should cover two cases where something may go wrong. Junio C Hamano wrote, on 11.9.2015 18:54: > This "feels" correct ;-), but let me summon Duy who did the %>< > padding at around a5752342 (pretty: support padding placeholders, %< > %> and

[PATCH] tag, update-ref: improve description of option "create-reflog"

The description of option "create-reflog" is "create_reflog", which is neither a good description, nor a sensible string to translate. Change it to a more meaningful message. Signed-off-by: Ralf Thielow --- builtin/tag.c| 2 +- builtin/update-ref.c | 2 +- 2

Re: [PATCH v17 00/14] port tag.c to use ref-filter APIs

On Fri, Sep 11, 2015 at 11:08 AM, Karthik Nayak wrote: > On Thu, Sep 10, 2015 at 10:27 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >>> Changes in this version: >>> * The arguments of the %(align) atom are

Re: storing cover letter of a patch series?

On Fri, Sep 11, 2015 at 4:28 AM, Jacob Keller wrote: > Hey, > > does anyone know of any tricks for storing a cover letter for a patch > series inside of git somehow? I'd guess the only obvious way currently > is to store it at the top of the series as an empty commit.. but

Re: [PATCH] git-svn: parse authors file more leniently

Eric Wong venit, vidit, dixit 10.09.2015 20:08: > Michael J Gruber wrote: >> Instead, make git svn uses the perl regex >> >> /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.*)>\s*$/ >> >> for parsing the authors file so that the same (slightly more lenient) >> regex is used in

Re: [PATCH v8 1/2] submodule refactor: use git_pathdup_submodule() in add_submodule_odb()

On Fri, Sep 11, 2015 at 12:57:10AM +0300, Max Kirillov wrote: > diff --git a/submodule.c b/submodule.c > index 245ed4d..7340069 100644 > --- a/submodule.c > +++ b/submodule.c > @@ -119,43 +119,37 @@ void stage_updated_gitmodules(void) > > static int add_submodule_odb(const char *path) > { > -

Re: [PATCH] Add tests for "Pass graph width to pretty formatting, so '%>|' can work properly"

On Fri, Sep 11, 2015 at 1:50 PM, Josef Kufner wrote: > --- Missing sign-off. Or is this intended to be concatenated with the patch you sent earlier? > diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh > index 7398605..3358837 100755 > ---

Re: error opening

I'm having the same problem. In fact, my post was right in front of yours. Another thing I notice is that Git commands are not listed in Windows Explorer. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

Junio C Hamano writes: > Jeff King writes: > >> I'm not too familiar with the code, but this _seems_ to work for me: >> >> diff --git a/builtin/blame.c b/builtin/blame.c >> index 21321be..2e03d47 100644 >> --- a/builtin/blame.c >> +++ b/builtin/blame.c >> @@

Re: [PATCH] Add tests for "Pass graph width to pretty formatting, so '%>|' can work properly"

Eric Sunshine wrote, on 11.9.2015 21:37: > On Fri, Sep 11, 2015 at 1:50 PM, Josef Kufner wrote: >> --- > > Missing sign-off. Or is this intended to be concatenated with the > patch you sent earlier? Just forgot to add it. Fixed patch on the way. >> diff --git

[PATCH] Add tests for "Pass graph width to pretty formatting, so '%>|' can work properly"

Signed-off-by: Josef Kufner --- t/t4205-log-pretty-formats.sh | 23 +++ 1 file changed, 23 insertions(+) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 7398605..3358837 100755 --- a/t/t4205-log-pretty-formats.sh +++

Re: [PATCH] Add tests for "Pass graph width to pretty formatting, so '%>|' can work properly"

Eric Sunshine writes: >> + qz_to_tab_space > You don't seem to be taking advantage of qz_to_tab_space's > transliteration of Q to tab and Z to space, so s/qz_to_tab_space/cat/ > would make the code clearer. Don't cat into a pipe unless you are

Re: error opening

Renato Akaboci gmail.com> writes: > > Hi, > > I´m in trouble just after installation of my Git for Windows. > I get a box with error saying: > > couldn´t read file "C:\Program > Files\Git\cmd\mingw64\libexec\git-core\git-gui": no such file or > directory > > I´ve just installed git as

Re: storing cover letter of a patch series?

Junio C Hamano writes: > Ideally, I would think that you want that information when the > series is fully cooked and gets merged to a more permanent place in > the log message of the merge commit. At that point, where the > series started may become more clear from the

[RFC PATCHv1 0/2] Parallel git submodule fetching

This is a new approach to making git submodules faster without using threads. We'll directly run commands in parallel without an intermediate thread pool. patch 1 is fixing an error, which was hard to come by in a parallel world, but is not much of a problem in a single-childed world. The second

[PATCH 2/2] fetch: fetch submodules in parallel

If we run external commands in parallel we cannot pipe the output directly to the our stdout/err as it would mix up. So each process's output will flow through a pipe, which we buffer. One subprocess can be directly piped to out stdout/err for a low latency feedback to the user. Example: Let's

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Fri, Sep 11, 2015 at 5:52 PM, Junio C Hamano wrote: > Mike Rappazzo writes: >> On Fri, Sep 11, 2015 at 12:16 PM, Junio C Hamano wrote: >>> Michael Rappazzo writes: The code formerly in branch.c was largely

Bloom filters for have/want negotiation

I have been thinking about Wilhelm Bierbaum's talk at the last GitMerge conference [1] in which he describes a scheme for using Bloom filters to make the initial reference advertisement less expensive. In his scheme (if I understand correctly) the client starts off the conversation by passing the

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Fri, Sep 11, 2015 at 12:16 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> The code formerly in branch.c was largely the basis of the >> get_worktree_list implementation is now moved to worktree.c, >> and the find_shared_symref implementation

Re: [PATCH v7 3/3] worktree: add 'list' command

Michael Rappazzo writes: > diff --git a/builtin/worktree.c b/builtin/worktree.c > index 71bb770..a0c0fe8 100644 > --- a/builtin/worktree.c > +++ b/builtin/worktree.c > @@ -8,10 +8,13 @@ > #include "run-command.h" > #include "sigchain.h" > #include "refs.h" > +#include

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

Mike Rappazzo writes: > On Fri, Sep 11, 2015 at 12:16 PM, Junio C Hamano wrote: >> Michael Rappazzo writes: >> >>> The code formerly in branch.c was largely the basis of the >>> get_worktree_list implementation is now moved to

Re: --progress option for git submodule update?

On Wed, Sep 9, 2015 at 8:06 PM, Vitali Lovich wrote: >> Doh! I see what you're missing now after rereading the email closely. >> You can add a --quiet option, >> but --verbose or --progress just errors out, but you want that as a >> possible argument for git clone >> inside the

[PATCH 1/2] Sending "Fetching submodule " output to stderr

From: Jonathan Nieder The "Pushing submodule " progress output correctly goes to stderr, but "Fetching submodule " is going to stdout by mistake. Fix it to write to stderr. Noticed while trying to implement a parallel submodule fetch. When this particular output line went

Re: Bloom filters for have/want negotiation

Michael Haggerty writes: > 1. The server advertises the references that it has in the way that it > is currently done. > 2. The client advertises the objects that it has (or some subset of > them; see below) via a Bloom filter. > 3. The server sends the client the packfile

[PATCH 2/3] Add tests for "pretty: Pass graph width to pretty formatting for use in '%>|(N)'"

Signed-off-by: Josef Kufner --- t/t4205-log-pretty-formats.sh | 23 +++ 1 file changed, 23 insertions(+) diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh index 7398605..3358837 100755 --- a/t/t4205-log-pretty-formats.sh +++

[PATCH 1/3] pretty: Pass graph width to pretty formatting for use in '%>|(N)'

Pass graph width to pretty formatting, so N in '%>|(N)' includes columns consumed by graph rendered when --graph option is in use. Example: git log --all --graph --pretty='format: [%>|(20)%h] %ar%d' All commit hashes should be aligned at 20th column from edge of the terminal, not from the

[PATCH 3/3] t4205: remove unnecessary use of qz_to_tab_space

Many existing tests in this script pipes the result thru qz_to_tab_space, but the payload does not need any Q or Z to be replaced to tab or space. Redirect the input directly into iconv or use cat instead. Signed-off-by: Josef Kufner --- t/t4205-log-pretty-formats.sh | 8

Re: --progress option for git submodule update?

& then do a git submodule init? > On Sep 11, 2015, at 4:05 PM, Stefan Beller wrote: > > On Wed, Sep 9, 2015 at 8:06 PM, Vitali Lovich wrote: >>> Doh! I see what you're missing now after rereading the email closely. >>> You can add a --quiet option, >>>

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

On Fri, Sep 11, 2015 at 11:47:30AM +0100, Stephen Connolly wrote: > A command line option to `git blame HEAD -- path` that instructs that > the revisions of blame be the revisions where the change was applied > to the current branch not the revision where the change first > originated (i.e. limit

Re: Bloom filters for have/want negotiation

On Fri, Sep 11, 2015 at 2:13 PM, Michael Haggerty wrote: > I have been thinking about Wilhelm Bierbaum's talk at the last GitMerge > conference [1] in which he describes a scheme for using Bloom filters to > make the initial reference advertisement less expensive. ... > But

Re: [PATCH v7 1/3] worktree: add top-level worktree.c

On Thu, Sep 10, 2015 at 4:04 PM, Junio C Hamano wrote: > Michael Rappazzo writes: > >> Including functions to get the list of all worktrees, and to get >> a specific worktree (primary or linked). > > Was this meant as a continuation of the sentence started

[Feature Request] git blame showing only revisions from git rev-list --first-parent

Background === My colleagues and I disagree on how exactly to handle feature development in branches. There are approximately two camps: Camp 1: All feature branches should be squashed after code review to a single commit before merging. Camp 2: Leave the history of development alone, being

Re: [PATCH v7 2/3] worktree: move/refactor find_shared_symref from branch.c

On Fri, Sep 11, 2015 at 7:10 PM, Eric Sunshine wrote: > On Fri, Sep 11, 2015 at 5:52 PM, Junio C Hamano wrote: > > Thanks for bringing this up. I haven't found a sufficient block of > time yet to review these patches, however, I had the same thought

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

On Fri, Sep 11, 2015 at 12:06:27PM -0700, Junio C Hamano wrote: > So here is an outline of what I had in mind when I was writing the > above. Instead of trusting that num_scapegoats() is always used to > limit the enumeration of commit->parents, we discard the second and > subsequent parents

[PATCH v17 06/14] ref-filter: implement an `align` atom

Implement an `align` atom which left-, middle-, or right-aligns the content between %(align:...) and %(end). The "align:" is followed by `` and `` in any order separated by a comma, where the `` is either left, right or middle, default being left and `` is the total length of the content with

[PATCH v17 06/14] ref-filter: implement an `align` atom

Implement an `align` atom which left-, middle-, or right-aligns the content between %(align:...) and %(end). The "align:" is followed by `` and `` in any order separated by a comma, where the `` is either left, right or middle, default being left and `` is the total length of the content with

[PATCH v17 05/14] ref-filter: introduce match_atom_name()

Introduce match_atom_name() which helps in checking if a particular atom is the atom we're looking for and if it has a value attached to it or not. Use it instead of starts_with() for checking the value of %(color:...) atom. Write a test for the same. Mentored-by: Christian Couder

[PATCH v17 08/14] ref-filter: add support for %(contents:lines=X)

In 'tag.c' we can print N lines from the annotation of the tag using the '-n' option. Copy code from 'tag.c' to 'ref-filter' and modify it to support appending of N lines from the annotation of tags to the given strbuf. Implement %(contents:lines=X) where X lines of the given object are obtained.

[PATCH] l10n: de.po: translate 121 new messages

Translate 121 new messages came from git.pot update in 47d73eb (l10n: git.pot: proposed updates for v2.6.0 (+121)). Signed-off-by: Ralf Thielow --- po/de.po | 384 ++- 1 file changed, 183 insertions(+), 201

Re: [PATCH] l10n: de.po: translate 121 new messages

Am 11. September 2015 um 17:17 schrieb Ralf Thielow : > Translate 121 new messages came from git.pot update in 47d73eb > (l10n: git.pot: proposed updates for v2.6.0 (+121)). > Hmpf. Please ignore this as the commit this translation is based on is not the latest. New patch

[PATCH v17 12/14] tag.c: use 'ref-filter' APIs

From: Karthik Nayak Make 'tag.c' use 'ref-filter' APIs for iterating through refs, sorting and printing of refs. This removes most of the code used in 'tag.c' replacing it with calls to the 'ref-filter' library. Make 'tag.c' use the 'filter_refs()' function provided by

[PATCH v17 13/14] tag.c: implement '--format' option

Implement the '--format' option provided by 'ref-filter'. This lets the user list tags as per desired format similar to the implementation in 'git for-each-ref'. Add tests and documentation for the same. Mentored-by: Christian Couder Mentored-by: Matthieu Moy

Re: [PATCH v17 00/14] port tag.c to use ref-filter APIs

On Thu, Sep 10, 2015 at 10:27 PM, Matthieu Moy wrote: > Karthik Nayak writes: > >> This is part of the series of unifying the code used by >> "git tag -l, git branch -l, git for-each-ref". >> >> The previous version can be found here (version

[PATCH] Pass graph width to pretty formatting, so '%>|' can work properly

Pass graph width to pretty formatting function, so it can handle '%>|(N)' paddings correctly when --graph option is used. Example: git log --all --graph --pretty='format: [%>|(20)%h] %ar%d' All commit hashes should be aligned at 20th column from edge of the terminal, not from the edge of

Re: git submodule ignores --git-dir

Am 10.09.2015 um 22:06 schrieb Filip Gospodinov: Hi! I use the `--git-dir` flag in some scripts such that I don't need to `cd` back and forth. Recently, I've discovered that `--git-dir` does not seem to work correctly for `git submodule`. Here is a short snippet to reproduce that behavior:

Re: git submodule ignores --git-dir

On Fri, Sep 11, 2015 at 05:15:52PM +0200, Jens Lehmann wrote: > Am 10.09.2015 um 22:06 schrieb Filip Gospodinov: > > I know that for this particular use case I can just use `git clone > > --recursive` > > and that other use cases can be worked around by using `cd`. Still, I > > wonder if > > the

Re: [Feature Request] git blame showing only revisions from git rev-list --first-parent

On 11 September 2015 at 15:01, Jeff King wrote: > On Fri, Sep 11, 2015 at 11:47:30AM +0100, Stephen Connolly wrote: > >> A command line option to `git blame HEAD -- path` that instructs that >> the revisions of blame be the revisions where the change was applied >> to the current

Re: [PATCH] l10n: de.po: translate 123 new messages

Am 11. September 2015 um 17:35 schrieb Ralf Thielow : > Translate 121 new messages came from git.pot update in df0617b I forgot to change this part of the message. Should be 123, obviously. > (l10n: git.pot: v2.6.0 round 1 (123 new, 41 removed)). > > Signed-off-by: Ralf

[PATCH] pull: don't mark values for option "rebase" for translation

"false|true|preserve" are actual values for option "rebase" of the "git-pull" command and should therefore not be marked for translation. Signed-off-by: Ralf Thielow --- builtin/pull.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/pull.c

Re: [PATCH v17 00/14] port tag.c to use ref-filter APIs

Eric Sunshine writes: > In addition to a link to the previous round and an interdiff, it would > be helpful to reviewers for you to annotate each patch (in the > commentary are below the "---" line after your sign-off) with a > description of the changes in that patch