Re: [PATCHv1 2/2] git-p4: work with a detached head

On 9 September 2015 at 22:52, Junio C Hamano wrote: > Luke Diamand writes: > >> def run(self, args): >> if len(args) == 0: >> self.master = currentGitBranch() >> -if len(self.master) == 0 or not

Re: [ANNOUNCE] Git Rev News edition 7

On Thu, Sep 10, 2015 at 11:13 AM, Jeff King wrote: > In more technical matters, you may be interested in: > > https://github.com/blog/2053-easier-feeds-for-github-pages > > I don't know of any problems with the current RSS solution, but 1 line > of code maintained by somebody

Re: What's cooking in git.git (Sep 2015, #02; Wed, 9)

On Wed, Sep 09, 2015 at 01:56:26PM -0700, Junio C Hamano wrote: > * ti/glibc-stdio-mutex-from-signal-handler (2015-09-04) 1 commit > (merged to 'next' on 2015-09-08 at c8047ba) > + pager: don't use unsafe functions in signal handlers > > Allocation related functions and stdio are unsafe

Re: [ANNOUNCE] Git Rev News edition 7

On Wed, Sep 09, 2015 at 11:30:35AM +0200, Christian Couder wrote: > I'm happy announce that the 7th edition of Git Rev News is now published: > > https://git.github.io/rev_news/2015/09/09/edition-7/ > > Thanks a lot to all the contributors! Thanks for working on this. I admit that I don't

git clone in windows after a linux push

Hi to all, This is what i have done for initialize a local git archive, and a remote git repository. daniele@daniele-nb /var/www/localhost/htdocs $ mkdir provagit && cd provagit daniele@daniele-nb /var/www/localhost/htdocs/provagit $ git init Inizializzato un repository Git in

Re: [PATCHv1 0/2] git-p4: work on a detached head

On 10 September 2015 at 02:59, Jacob Keller wrote: > On Wed, Sep 9, 2015 at 6:57 PM, Jacob Keller wrote: >> On Wed, Sep 9, 2015 at 5:03 AM, Lars Schneider >> wrote: >>> I wanted to play with the patch and apply it to my

Re: git clone svn: authors from authors file are ignored, authors-prog works, but crashes on branch points

Till Schäfer venit, vidit, dixit 26.08.2015 21:57: > Hi, > i am observing some weired "git svn clone" behavior during my try to migrate > the Scaffold Hunter [1] SVN repository [2] to Git: > > if i just use the command > > $ git svn clone svn://svn.code.sf.net/p/scaffoldhunter/code

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

Currently, git-svn parses an authors file using the perl regex /^(.+?|\(no author\))\s*=\s*(.+?)\s*<(.+)>\s*$/ in order to extract svn user name, real name and e-mail. This does not match an empty e-mail field like "<>". On the other hand, the output of an authors-prog is parsed with the perl

Hi

This is Sandeep largest Mega Millions winner giving you cash,reply with your full name and location. -- 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

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

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 16): article.gmane.org/gmane.comp.version-control.git/277394 Changes in this version: * The arguments of the %(align) atom are interchangeable. *

[PATCH v17 01/14] ref-filter: move `struct atom_value` to ref-filter.c

Since atom_value is only required for the internal working of ref-filter it doesn't belong in the public header. Helped-by: Eric Sunshine Mentored-by: Christian Couder Mentored-by: Matthieu Moy Signed-off-by:

[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 v17 04/14] ref-filter: introduce handler function for each atom

Introduce a handler function for each atom, which is called when the atom is processed in show_ref_array_item(). In this context make append_atom() as the default handler function and extract quote_formatting() out of append_atom(). Bump this to the top. Mentored-by: Christian Couder

[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 09/14] ref-filter: add support to sort by version

From: Karthik Nayak Add support to sort by version using the "v:refname" and "version:refname" option. This is achieved by using the 'versioncmp()' function as the comparing function for qsort. This option is included to support sorting by versions in `git tag -l` which

[PATCH v17 02/14] ref-filter: introduce ref_formatting_state and ref_formatting_stack

Introduce ref_formatting_state which will hold the formatted output strbuf instead of directly printing to stdout. This will help us in creating modifier atoms which modify the format specified before printing to stdout. Implement a stack machinery for ref_formatting_state, this allows us to push

[PATCH v17 10/14] ref-filter: add option to match literal pattern

From: Karthik Nayak Since 'ref-filter' only has an option to match path names add an option for plain fnmatch pattern-matching. This is to support the pattern matching options which are used in `git tag -l` and `git branch -l` where we can match patterns like `git tag -l

[PATCH v17 07/14] ref-filter: add option to filter out tags, branches and remotes

From: Karthik Nayak Add a function called 'for_each_fullref_in()' to refs.{c,h} which iterates through each ref for the given path without trimming the path and also accounting for broken refs, if mentioned. Add 'filter_ref_kind()' in ref-filter.c to check the kind of ref

[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 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 14/14] tag.c: implement '--merged' and '--no-merged' options

Use 'ref-filter' APIs to implement the '--merged' and '--no-merged' options into 'tag.c'. The '--merged' option lets the user to only list tags merged into the named commit. The '--no-merged' option lets the user to only list tags not merged into the named commit. If no object is provided it

[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

storing cover letter of a patch series?

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 this doesn't get emailed *as* the cover letter... Is there some other way? Would

Re: What's cooking in git.git (Sep 2015, #02; Wed, 9)

Jeff King writes: > I did wonder if we needed to deal with any fallout from f4c3edc > (vreportf: avoid intermediate buffer, 2015-08-11). That _is_ new in this > release, so regressions are fair game during the -rc period. Yeah, and the most obvious way to deal with it is just to

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

Karthik Nayak writes: > 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

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

Karthik Nayak writes: > diff --git a/ref-filter.c b/ref-filter.c > index 7d2732a..b098b16 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -56,6 +56,7 @@ static struct { > { "color" }, > { "align" }, > { "end" }, > + { "contents:lines" }, Do we

Re: [PATCHv1 2/2] git-p4: work with a detached head

Luke Diamand writes: > On 9 September 2015 at 22:52, Junio C Hamano wrote: >> Luke Diamand writes: >> >>> def run(self, args): >>> if len(args) == 0: >>> self.master = currentGitBranch() >>> -if

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

On Thu, Sep 10, 2015 at 10:26 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> 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

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

Matthieu Moy writes: > OTOH, you are now accepting %(atom:) as a synonym to %(atom), and it's > not clear whether this is a deliberate decition. I would say so. When the caller wants to reject %(atom:), the caller can tell it by checking val[0] == '\0' and reject

Re: git clone svn: authors from authors file are ignored, authors-prog works, but crashes on branch points

Hi, I can confirm, that the patch (see mail: "[PATCH] git-svn: parse authors file more leniently") fixes the "Author: not defined in file" problem in my case. Downgrading to subversion 1.8.13 (from 1.8.14) also fixes the branching crash in revision 17. With subversion 1.8.14 i

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

Karthik Nayak writes: > + /* > + * TODO: Implement a function similar to > strbuf_split_str() > + * which would omit the separator from the end of each > value. > + */ > +

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

Junio C Hamano writes: > Karthik Nayak writes: > >> -} else if (starts_with(name, "color:")) { >> +} else if (match_atom_name(name, "color", )) { > > Why use the helper only for this one? Aren't existing calls to > starts_with()

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

Karthik Nayak writes: > Implement an `align` atom which left-, middle-, or right-aligns the > content between %(align:...) and %(end). Nicely done. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

Bug in handling $ character in GIT SVN

Hi, I was redirected here from Git-users list (https://groups.google.com/forum/#!topic/git-users/mftroAtEfvE). We have recently a problem my dcommiting renamed files containing $ character in their names. GIT SVN crashed with the error: Assertion failed: (svn_uri_is_canonical(child_uri,

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

Karthik Nayak writes: > 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

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

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 16): > article.gmane.org/gmane.comp.version-control.git/277394 > > Changes in this version:

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

Karthik Nayak writes: > The check was for checking if there is anything after the colon, Why do you even care? If %(color) expects more specific customization by adding colon followed by specific data after it, i.e. %(color:something), %(color:) should clearly be that

[PATCH v17 11/14] tag.c: use 'ref-filter' data structures

From: Karthik Nayak Make 'tag.c' use 'ref-filter' data structures and make changes to support the new data structures. This is a part of the process of porting 'tag.c' to use 'ref-filter' APIs. This is a temporary step before porting 'tag.c' to use 'ref-filter'

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

On Thu, Sep 10, 2015 at 11:29 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> -static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting) >> +static int list_tags(struct ref_filter *filter, struct ref_sorting >> *sorting, const

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 10:41 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> Is there some other way? Would others be interested in such a feature? > > Not me. > >> I get very annoyed when I've written a nice long patch cover letter in >> vim

Re: storing cover letter of a patch series?

Martin Fick writes: > As a Gerrit developer and user, I would like a way to > see/review cover letters in Gerrit. We have had many > internal proposals, most based on git notes, but we have > also used the empty commit trick. It would be nice if there > were some

Re: storing cover letter of a patch series?

Hi Jake, On 2015-09-10 18:28, Jacob Keller wrote: > does anyone know of any tricks for storing a cover letter for a patch > series inside of git somehow? It is not stored as a blob, but I use `git branch --edit-description` to write the cover letter for patch series when I expect a couple of

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

On Thu, Sep 10, 2015 at 10:58 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> The check was for checking if there is anything after the colon, > > Why do you even care? If %(color) expects more specific > customization by adding colon followed by

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

Karthik Nayak writes: > It is one thing that the user can actually do the check themselves, > but doesn't it make more sense that when we're using colon we expect a > value after it, and something like %(color:) makes no sense when color > specifically needs a value after

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

On Thu, Sep 10, 2015 at 11:15 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> It is one thing that the user can actually do the check themselves, >> but doesn't it make more sense that when we're using colon we expect a >> value after it, and

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

Karthik Nayak writes: > -static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting) > +static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting, > const char *format) > { > struct ref_array array; > - char *format, *to_free

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

Matthieu Moy writes: > Junio C Hamano writes: > >> Karthik Nayak writes: >> >>> - } else if (starts_with(name, "color:")) { >>> + } else if (match_atom_name(name, "color", )) { >> >> Why use the helper

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

Junio C Hamano writes: > Matthieu Moy writes: > >> OTOH, you are now accepting %(atom:) as a synonym to %(atom), and it's >> not clear whether this is a deliberate decition. > > I would say so. When the caller wants to reject %(atom:), the >

Re: storing cover letter of a patch series?

+repo-disc...@googlegroups.com (to hit Gerrit developers also) On Thursday, September 10, 2015 09:28:52 AM Jacob Keller wrote: > 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

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

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 both cases. > > Reported-by: Till Schäfer

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 11:02 AM, Martin Fick wrote: > On Thursday, September 10, 2015 10:41:54 AM Junio C Hamano > wrote: >> >> I think "should" is too strong here. Yes, you could >> implement that way. It is debatable if it is better, or >> a flat file kept in a

Re: storing cover letter of a patch series?

Jacob Keller writes: > I hadn't thought of separating the cover letter from git-send-email. > That would be suitable for me. Yeah, I said this number of times over time, and I said it once recently in another thread, but I think it was a mistake to allow git-send-email

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 11:44 AM, Junio C Hamano wrote: > Jacob Keller writes: > >> I hadn't thought of separating the cover letter from git-send-email. >> That would be suitable for me. > > Yeah, I said this number of times over time, and I said it

[PATCH v8 0/2] Submodule object path

* Rebased to recent master (v2.6.0-rc0). * Use git_pathdup_submodule() instead of git_path_submodule() * There are more conflicts in pu with [1], not sure what should I do about it. * Style fixes as Stefan suggested [1] http://thread.gmane.org/gmane.comp.version-control.git/276628 Max Kirillov

[PATCH v8 2/2] path: implement common_dir handling in git_pathdup_submodule()

When submodule is a linked worktree, "git diff --submodule" and other calls which directly access the submodule's object database do not correctly calculate its path. Fix it by changing the git_pathdup_submodule() behavior, to use either common or per-worktree directory. Do it similarly as for

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

Functions which directly operate submodule's object database do not handle the case when the submodule is linked worktree (which are introduced in c7b3a3d2fe). Instead of fixing the path calculation use already existing git_pathdup_submodule() function without changing overall behavior. Then it

[PATCH 2/2] Documentation/git-rebase: fix --no-autostash formatting

All of the other "--option" and "--no-option" pairs in this file are formatted as separate options. Signed-off-by: John Keeping --- Documentation/git-rebase.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt

[PATCH 1/2] rebase: support --no-autostash

This is documented as an option but we don't actually accept it. Support it so that it is possible to override the "rebase.autostash" config variable. Reported-by: Daniel Hahler Signed-off-by: John Keeping --- git-rebase.sh | 5

Re: [PATCH] Makefile: use SHELL_PATH when running generate-cmdlist.sh

On Thu, Sep 10, 2015 at 7:37 PM, Alejandro R. Sedeño wrote: > Some /bin/sh implementations can't deal with $() arithmetic and command > substitution. If we already have a better shell on hand, we should use it. > > Fixes the build on SunOS, probably others. Makes sense.

Re: [PATCH v8 0/2] Submodule object path

Max Kirillov writes: > * There are more conflicts in pu with [1], not sure > what should I do about it. > > [1] http://thread.gmane.org/gmane.comp.version-control.git/276628 I do not think conflicts got any worse than before. Between the result of merging this round and the

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

The first patch is the fix so that git-rebase supports the --no-autostash option that it's documentation claims it does. The second is a slight tweak to the documentation to make it consistent with the remainder of the file. John Keeping (2): rebase: support --no-autostash

Re: storing cover letter of a patch series?

From: "Johannes Schindelin" On 2015-09-10 23:00, Jacob Keller wrote: On Thu, Sep 10, 2015 at 11:58 AM, Johannes Schindelin wrote: On 2015-09-10 18:28, Jacob Keller wrote: does anyone know of any tricks for storing a cover letter for a

[PATCH] Makefile: use SHELL_PATH when running generate-cmdlist.sh

Some /bin/sh implementations can't deal with $() arithmetic and command substitution. If we already have a better shell on hand, we should use it. Fixes the build on SunOS, probably others. Signed-off-by: Alejandro R. Sedeño --- Makefile | 2 +- 1 file changed, 1 insertion(+),

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

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 on the Subject line, or is s/Including/Include/ necessary? > diff --git

Re: storing cover letter of a patch series?

From: "Jacob Keller" On Thu, Sep 10, 2015 at 11:44 AM, Junio C Hamano wrote: Jacob Keller writes: I hadn't thought of separating the cover letter from git-send-email. That would be suitable for me. Yeah, I said this

git submodule ignores --git-dir

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: mkdir repo1 subm (cd subm; git init; git commit -m 1

git submodule ignores --git-dir

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: mkdir repo1 subm (cd subm; git init; git commit -m 1

Announcing Git for Windows 2.5.2

Dear Git users, it is my pleasure to announce Git for Windows 2.5.2. The installers and portable versions can be downloaded from our home page at https://git-for-windows.github.io/. We have been quite busy, lots of contributions (mostly bug reports, but also the occasional Pull Request).

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 1:09 PM, Philip Oakley wrote: > From: "Jacob Keller" >> >> On Thu, Sep 10, 2015 at 11:44 AM, Junio C Hamano >> wrote: >>> >>> Jacob Keller writes: >>> I hadn't thought of

Bug: "git rebase --no-autostash" not recognized

Although the man page mentions the "--no-autostash" option, it is not supported: % git rebase --no-autostash error: unknown option `no-autostash' % git --version git version 2.5.1.dirty Please CC me in case of replies. Regards, Daniel. -- http://daniel.hahler.de/

Re: [PATCH] push: don't show Done with --quiet --porcelain

Hello, Junio and other recipients: Thanks for your response. It just seems very very unlikely that anyone would be depending on a non-error from git pull --porcelain --quiet' to producing the "Done" string. In my case, it's something I didn't expect and wanted to suppress. (I've automated the

[ANNOUNCE] Git v2.5.2, v2.4.9, v2.3.9 and v2.2.3

The latest maintenance release Git v2.5.2 is now available at the usual places, together with updates to older maintenance tracks, v2.4.9, v2.3.9 and v2.2.3. These updates to older tracks are to plug buffer overflows due to fixed-sized buffers used to store pathnames in a handful of codepaths

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 11:58 AM, Johannes Schindelin wrote: > Hi Jake, > > On 2015-09-10 18:28, Jacob Keller wrote: > >> does anyone know of any tricks for storing a cover letter for a patch >> series inside of git somehow? > > It is not stored as a blob, but I use

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

Eric Wong writes: > 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 both

Re: storing cover letter of a patch series?

Hi Jake, On 2015-09-10 23:00, Jacob Keller wrote: > On Thu, Sep 10, 2015 at 11:58 AM, Johannes Schindelin > wrote: >> >> On 2015-09-10 18:28, Jacob Keller wrote: >> >>> does anyone know of any tricks for storing a cover letter for a patch >>> series inside of git

допоможіть нашому сайту http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок

Доброго дня, будь ласка, просимо переглянути наш сайт, якщо це не важко для вас, http://kamenyary.info/ - будь ласка, відкрийте його для перегляду однієї-двох сторінок, і на будь-якій сторінці один раз натисніть на рекламний банер, який вам найбільш цікавий, це Ваша допомога, щоб ми могли

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

On Thu, Sep 10, 2015 at 10:44 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> diff --git a/ref-filter.c b/ref-filter.c >> index 7d2732a..b098b16 100644 >> --- a/ref-filter.c >> +++ b/ref-filter.c >> @@ -56,6 +56,7 @@ static struct { >> {

Re: storing cover letter of a patch series?

Jacob Keller writes: > Is there some other way? Would others be interested in such a feature? Not me. > I get very annoyed when I've written a nice long patch cover letter in > vim before an email and then realize I should fix something else up, > or accidentally cancel