Here is a test that finds a bug in rebase -Xsubtree. With
--preserve-merges, commits are lost.
-David
--
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/majord
From: "David A. Greene"
This test merges an external tree in as a subtree, makes some commits
on top of it and splits it back out. In the process the added commits
are lost. This is marked to expect failure so that we don't forget to
fix it.
Signed-off-by: David A. Greene
---
t/t3427-rebase-
On Monday, January 04, 2016 07:36:05 PM Junio C Hamano wrote:
> Stephen & Linda Smith writes:
>
> > On Monday, January 04, 2016 03:44:33 PM Junio C Hamano wrote:
> >> Becoming tired of waiting for a reroll.
> >> ($gmane/271213).
> >> Anybody wants to help rerolling this? Otherwise will discar
On Mon, Jan 04, 2016 at 09:59:09AM -0600, gree...@obbligato.org wrote:
> I am attempting to teach cherry-pick to handle redundant commits
> gracefully (via a new --skip-redundant-commits option) instead of
> aborting. However, I'm struggling a bit with how to check if the
> changes in a commit wi
These were introduced back in 2006 at 3175aa1ec28c but
never documented.
Signed-off-by: Eric Wong
---
And I just found these very useful, today!
I also noticed creator{name,email} aren't supported, yet.
Perhaps they're worth implementing for consistency.
Documentation/git-for-each-ref.txt |
Stephen & Linda Smith writes:
> On Monday, January 04, 2016 03:44:33 PM Junio C Hamano wrote:
>> Becoming tired of waiting for a reroll.
>> ($gmane/271213).
>> Anybody wants to help rerolling this? Otherwise will discard.
>
>
>
>> Becoming tired of waiting for a reroll.
>> Anybody wants to
Jeff King writes:
> As much as it would be nice to clean this up before moving to multiple
> backends, though, I don't think we should make it a pre-requisite. This
> is a difficult topic as it is, and I'd rather see us make incremental
> improvement (backends, then hopefully more flexible mixing
Here's a re-roll with the commit message change suggested by
Sebastian. Please apply. Thanks!
--
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
From: "David A. Greene"
Remove --annotate. This obviates the need for an --unannotate
command, which is both an obvious addition and difficult to define
due to the numerous ways one might want to specify how to edit
commit messages. git has other tools more suited to rewriting
commit messages a
On Monday, January 04, 2016 03:44:33 PM Junio C Hamano wrote:
> Becoming tired of waiting for a reroll.
> ($gmane/271213).
> Anybody wants to help rerolling this? Otherwise will discard.
> Becoming tired of waiting for a reroll.
> Anybody wants to help rerolling this? Otherwise will discar
On Mon, Jan 04, 2016 at 12:26:01PM -0800, Junio C Hamano wrote:
> An API enhancement to allow us to handle refs in multiple
> repositories separately would be a very welcome move (it would get
> rid of the hacky interface for_each_ref_in_submodule(), for one
> thing), but even after that happens,
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
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.
Git 2.7 has been released. Also,
The latest feature release Git v2.7.0 is now available at the
usual places. It is comprised of 539 non-merge commits since
v2.6.0, contributed by 81 people, 26 of which are new faces.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories a
The latest maintenance release Git v2.6.5 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.6.5'
tag and the 'maint' branch that the tag points at:
url = https://kernel
On Mon, Jan 04, 2016 at 09:52:10AM -0800, Junio C Hamano wrote:
> >> We have this in cache.h, should it be fixed as well?
> >>
> >> /* CE_EXTENDED2 is for future extension */
> >> #define CE_EXTENDED2 (1 << 31)
> >
> > Sort of. We don't actually use it, and since it's a macro, that means
Andy Lutomirski writes:
> Anyway, the idea of merging test commits up to some lowest common
> denominator seems generally useful to me, and the idea of specifying a
> 'prepare the checked-out tree' (as you suggested, where 'git merge
> --no-commit whatever' would be specified) would also be handy
On Mon, Jan 4, 2016 at 12:31 PM, Junio C Hamano wrote:
> Andy Lutomirski writes:
>
>> git bisect run is great, but it's not so great when the test process
>> is "sudo make modules_install && sudo make install && reboot", then
>> boot new kernel, then run emacs, then see if it worked... There
>>
On 4 January 2016 at 10:52, Romain Picard wrote:
> After changing the type of a file in the git repository, it is not possible to
> "git p4 publish" the commit to perforce. This is due to the fact that the git
> "T" status is not handled in git-p4.py. This can typically occur when
> replacing
> a
Junio C Hamano wrote:
> Forgot to sign-off (I could forge it, though, but anyway)?
Oops :x
Signed-off-by: Eric Wong
--
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-in
All looked sensible. Thanks.
--
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
Romain Picard writes:
> diff --git a/t/t9827-git-p4-change-filetype.sh
> b/t/t9827-git-p4-change-filetype.sh
> new file mode 100755
> index 000..b0a9f62
> --- /dev/null
> +++ b/t/t9827-git-p4-change-filetype.sh
> @@ -0,0 +1,69 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2016 Romain Picard
> +#
>
Eric Wong writes:
> mutt saves aliases with escaped quotes in the form of:
>
> alias dot \"Dot U. Sir\"
>
> When we pass through our sanitize_address routine,
> we end up with double-escaping:
>
>To: "\\\"Dot U. Sir\\\"
>
> Remove the escaping in mutt only for now, as I am not sur
This one is severely whitespace damaged.
It is _possible_ for me to fix these up manually, but because there
is no guarantee that I caught them all (i.e. the end result may
contain some leading whitespaces you did not intend them to be
there, if the whitespace corruption did not break the syntax o
mutt saves aliases with escaped quotes in the form of:
alias dot \"Dot U. Sir\"
When we pass through our sanitize_address routine,
we end up with double-escaping:
To: "\\\"Dot U. Sir\\\"
Remove the escaping in mutt only for now, as I am not sure
if other mailers can do this o
Andy Lutomirski writes:
> git bisect run is great, but it's not so great when the test process
> is "sudo make modules_install && sudo make install && reboot", then
> boot new kernel, then run emacs, then see if it worked... There
> doesn't appear to be a 'git bisect run' option to pause and wai
Ronnie Sahlberg writes:
> Not commenting on whether this is the right direction or not. A global
> variable holding a methods table might not be most aesthetic design,
> but there are practicalities.
>
> However, that kind of change would change the function signatures for
> all public refs funct
Johannes Schindelin writes:
>> diff --git a/builtin/update-index.c b/builtin/update-index.c
>> index 7431938..a7a9a7e 100644
>> --- a/builtin/update-index.c
>> +++ b/builtin/update-index.c
>> @@ -473,7 +473,9 @@ static void read_index_info(int line_termination)
>> struct strbuf buf = STRBUF_
Johannes Schindelin writes:
> Having said that, `grep` operates on lines of text,
Correct.
> and CR is established as a non-text byte,
Correct but only if you are a pedant.
With this patch, you can no longer find "A" on a "line" that is
"A", which is a regression on a system whose native line
Johannes Schindelin writes:
> So I guess I would suggest to change the name "strbuf_getline" to
> "strbuf_getdelim" first, and then re-introduce a different
> "strbuf_getline" which is actually your "strbuf_getline_crlf".
Makes sense. I really hated that name "getline_crlf".
--
To unsubscribe f
Johannes Schindelin writes:
> Hi Junio,
>
> On Wed, 16 Dec 2015, Junio C Hamano wrote:
>
>> Often we read "text" files that are supplied by the end user
>> (e.g. commit log message that was edited with $GIT_EDITOR upon
>> 'git commit -e'), and in some environments lines in a text file
>> are term
On Sat, Jan 2, 2016 at 4:06 PM, David Aguilar wrote:
> Apologies for the late review, and this review should probably
> go on patch 01 or 02 but I don't have it in my mbox atm...
>
> On Wed, Dec 02, 2015 at 07:35:08PM -0500, David Turner wrote:
>> From: Ronnie Sahlberg
>>
>> Signed-off-by: Ronnie
David Aguilar writes:
>> diff --git a/refs.c b/refs.c
>> index 9562325..b9b0244 100644
>> --- a/refs.c
>> +++ b/refs.c
>> @@ -1150,3 +1150,57 @@ int resolve_gitlink_ref(const char *path, const char
>> *refname,
>> {
>> return the_refs_backend->resolve_gitlink_ref(path, refname, sha1);
>>
Johannes Schindelin writes:
>> I do not know fcreate_or_truncate() is a good name, though.
>
> So what would be a good name?
Have been thinking about it, but I did not come up with anything. I
just know fcreate_or_truncate() is not a good name for multiple
reasons I already explained X-<. sane
On Wed, Dec 30, 2015 at 12:09 PM, Junio C Hamano wrote:
> Andy Lutomirski writes:
>
>> I'm currently bisecting a Linux bug on my laptop. The starting good
>> commit is v4.4-rc3 and the starting bad commit is v4.4-rc7.
>> Unfortunately, anything much older than v4.4-rc3 doesn't boot at all.
>>
>>
Eric Wong writes:
> --- a/git-send-email.perl
> +++ b/git-send-email.perl
> @@ -524,8 +524,14 @@ my %parse_alias = (
> if (/^\s*alias\s+(?:-group\s+\S+\s+)*(\S+)\s+(.*)$/) {
> my ($alias, $addr) = ($1, $2);
> $addr =~ s/#.*$//; # mutt allo
Christian Couder writes:
> What scenario do you have in mind where people would have to do things
> differently?
They eventually will see a system in which that they do not have do
anything after flipping the configuration, yet will still see stale
"you must run 'git status'" on their websearche
Jeff King writes:
> On Thu, Dec 31, 2015 at 12:10:33PM +0700, Duy Nguyen wrote:
>
>> On Tue, Dec 29, 2015 at 1:35 PM, Jeff King wrote:
>> > We sometimes use 32-bit unsigned integers as bit-fields.
>> > It's fine to access the MSB, because it's unsigned. However,
>> > doing so as "1 << 31" is wro
Mostyn Bramley-Moore writes:
> On 12/31/2015 01:23 AM, Junio C Hamano wrote:
> ...
>> Swapping the option key and value may not be a bad idea, but one
>> problem that the above does not solve, which I outlined in the
>> message you are responding to, is that "match-pattern-type" does not
>> give
I am attempting to teach cherry-pick to handle redundant commits
gracefully (via a new --skip-redundant-commits option) instead of
aborting. However, I'm struggling a bit with how to check if the
changes in a commit will become redundant when appied to the new HEAD.
I found diff_tree_sha1 which s
Sebastian Schuberth writes:
> On Sat, Jan 2, 2016 at 9:36 PM, David Greene wrote:
>
>> commit messages. git has other tools more suited to rewriting
>> commit messages and it's easy enough to use them after a subtree
>> split.
>
> For completeness, it probably would be a good idea to name examp
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> This is iffy; you may actually be trying to find a line with ^M in
> it on a system whose line ending is LF. You can of course work it
> around by having a line that has "^M^M^J", let the strbuf_getline_crlf() eat
> the last "^M^J", leaving
Hi Junio,
I read through the entire series. I hope you find my comments helpful.
Happy new year,
Dscho
--
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
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index a7a9a7e..3a6c5b2 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -1075,7 +1075,10 @@ int cmd_update_index(int argc, const char **argv,
> const cha
Hi Junio,
On Mon, 4 Jan 2016, Johannes Schindelin wrote:
> strbuf_init(&buf, 0);
> strbuf_init(&nbuf, 0);
> - while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
> - if (line_termination && buf.buf[0] == '"') {
> + while ((nul_term_line
> +
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> diff --git a/builtin/mktree.c b/builtin/mktree.c
> index a964d6b..c6cafb6 100644
> --- a/builtin/mktree.c
> +++ b/builtin/mktree.c
> @@ -157,7 +157,9 @@ int cmd_mktree(int ac, const char **av, const char
> *prefix)
>
> while (!got_eo
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 7431938..a7a9a7e 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -473,7 +473,9 @@ static void read_index_info(int line_termination)
> struct
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> These commands read list of paths from their standard input under
> the --stdin option (in order to avoid busting limit on the length of
> the command line).
>
> When they are using text input mode (i.e. line_termination is set to
> '\n'), w
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> Often we read "text" files that are supplied by the end user
> (e.g. commit log message that was edited with $GIT_EDITOR upon
> 'git commit -e'), and in some environments lines in a text file
> are terminated with CRLF. Existing strbuf_getli
Hi Junio,
On Wed, 16 Dec 2015, Junio C Hamano wrote:
> I inspected all the callsites of this function to see if it is safe
> to use such an updated logic at these callsites, and did not find
> anything problematic. I could update strbuf_getline() in place, but
> just to be extra careful, this se
After changing the type of a file in the git repository, it is not possible to
"git p4 publish" the commit to perforce. This is due to the fact that the git
"T" status is not handled in git-p4.py. This can typically occur when replacing
an existing file with a symbolic link.
The "T" modifier is no
On Mon, Jan 04, 2016 at 04:44:15AM -0500, Eric Sunshine wrote:
> On Tue, Dec 29, 2015 at 2:50 AM, Jeff King wrote:
> > This doesn't leave us many syntactic "outs" for adding new ident types
> > in the future (nor can you match a trailer called "Author"). I guess we
> > could call this "--ident=tr
On Mon, Jan 04, 2016 at 04:44:00AM -0500, Eric Sunshine wrote:
> > diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
> > @@ -47,6 +47,14 @@ OPTIONS
> > +--ident=::
>
> Should this be called --group-by?
Yeah, that may be a more sensible name. For committer/author, I thi
On Mon, Jan 04, 2016 at 04:43:23AM -0500, Eric Sunshine wrote:
> > + format_commit_message(commit, "%an <%ae>", &author, &ctx);
> > + if (author.len <= 3) {
>
> I suppose magic number 3 is the space, '<', and '>'...
Yeah. That's worthy of a comment, I think (see below).
I don't thin
On Tue, Dec 29, 2015 at 2:50 AM, Jeff King wrote:
> This doesn't leave us many syntactic "outs" for adding new ident types
> in the future (nor can you match a trailer called "Author"). I guess we
> could call this "--ident=trailer:reviewed-by" to be more precise, but
> it's more annoying to type.
On Tue, Dec 29, 2015 at 7:10 AM, Nguyễn Thái Ngọc Duy wrote:
> In git-fetch, --depth argument is always relative with the latest
> remote refs. This makes it a bit difficult to cover this use case,
> where the user wants to make the shallow history, say 3 levels
> deeper. It would work if remote r
On Tue, Dec 29, 2015 at 2:35 AM, Jeff King wrote:
> Shortlog always groups commits by the author field. It can
> be interesting to group by other fields, as well. The
> obvious other identity in each commit is the committer
> field. This might be interesting if your project follows a
> workflow wh
On Tue, Dec 29, 2015 at 2:29 AM, Jeff King wrote:
> When gathering the author and oneline subject for each
> commit, we hand-parse the commit headers to find the
> "author" line, and then continue past to the blank line at
> the end of the header.
>
> We can replace this tricky hand-parsing by sim
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
The Git CodingGuidelines prefer the $(...) construct for command
substitution instead of using the backquotes `...`.
The backquoted form is the traditional method for command
substitution, and is supported by POSIX. However, all but the
simplest uses become complicated quickly. In particular, em
This patch series continues the changes introduced with the merge
6753d8a85d543253d95184ec2faad6dc197f248:
Merge branch 'ep/shell-command-substitution'
Adjust shell scripts to use $(cmd) instead of `cmd`.
This is the fifth series, the other will be sent separately.
Elia Pinto (10):
t
69 matches
Mail list logo
