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 git" in
the body of a
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 previous one to 'p
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. 527ec39^:generate-cmdlist.
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(+), 1 deletion(-)
di
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
Documentation/git-r
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 b/Documentation/git-rebase.txt
index
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 -
t/t3420-rebase-autostash.sh | 10 ++
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
series inside of git somehow?
It is not stored
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
wil
* 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
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 par
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 somehow?
>>
>> It is not stored a
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 cases.
>>
>> Reported-by: Till Schäfer
>> Signed
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/
signatu
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 separating the cover letter from git-send-email.
That would be suitable for me.
>>>
>>>
>>
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 `git branch --edit-description`
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). Thank
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 (kud
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 us
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 number of times over time, and I said it once
recently in another thread,
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 -
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 -
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 a/worktree.c b/worktree.c
> new
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 it
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
> caller can tell it by checking val[0] == '\0' and rej
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 once
> recently in another thread, but I think
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 to drive format-patch. It
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 standard git way to do this
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 directory (my-topic/ in the exa
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 before an email and then realize I should fix s
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> Karthik Nayak writes:
>>
>>> - } else if (starts_with(name, "color:")) {
>>> + } else if (match_atom_name(name, "color", &valp)) {
>>
>> Why use the helper only for this one? Aren't existing calls to
>> starts_with() in the
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
> Signed-off-by: Michael J Gruber
Tha
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 char *format)
>> {
>> struct ref_arr
+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 currently is to store it at the
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 = NULL;
> + char *to
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 something like %(color:) makes no sense when co
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 the colon.
If you imagi
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 it because I didn't use
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 {
>> { "color" },
>> { "align" },
>> { "e
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 specific data after it,
> i.e. %(color:som
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 still
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 "%(color)"
thing with no c
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 that.
So it is better if you d
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 even need "contents:line
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 instead of starts_with() for checking the val
Junio C Hamano writes:
> Karthik Nayak writes:
>
>> -} else if (starts_with(name, "color:")) {
>> +} else if (match_atom_name(name, "color", &valp)) {
>
> Why use the helper only for this one? Aren't existing calls to
> starts_with() in the same if/else if/... cascade al
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 majordomo info at http
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:
> * The arguments of the
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 for the same.
>
> Mentore
Karthik Nayak writes:
> + /*
> + * TODO: Implement a function similar to
> strbuf_split_str()
> + * which would omit the separator from the end of each
> value.
> + */
> + s = to_free = strbuf
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 for the same.
>
> Mentore
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 other
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 'ref-filter'
to filter out
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 assum
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
Signed-off-by: Karthik Nayak
---
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 len(self.master) == 0 or not
>>> gitBranchExists("refs/heads
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 revert,
but as y
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'
completely. As this is a temporary
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, NULL))
Add strbuf_utf8_align() which will align a given string into a strbuf
as per given align_type and width. If the width is greater than the
string length then no alignment is performed.
Helped-by: Eric Sunshine
Mentored-by: Christian Couder
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
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 foo*` which would match
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 being
handled and retur
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 will eventually be ported
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
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
Mentored-by: M
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 alig
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.
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
Mentored-by
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.
*
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: Karthik Nayak
---
ref-filter.c | 5 +
ref-filter.h | 5 +
2 files changed, 6
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 reg
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 --no-metada
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 source but the process
>>> is really complicated for me. I wonder if you c
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
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 else is perhaps bet
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 thing
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 gener
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 /var/www/localhost/h
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 gitBranchExists("refs/heads/%s"
>> % self.master):
>> -
79 matches
Mail list logo
