Hi,
On Thu, Sep 26, 2013 at 10:21 PM, John Keeping wrote:
> On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote:
>> I'm trying to use "git log --cherry ..." in order to display new, kept
>> and removed commits between two branches A and B.
>>
>> So commits which are only in B are consi
On Thu, 26 Sep 2013, Duy Nguyen wrote:
> On Thu, Sep 26, 2013 at 11:51 AM, Nicolas Pitre wrote:
> >> Multi-base tree support is not part of "packv4" capability. Let's see
> >> if such support comes before the series is merged to master. If so we
> >> can drop that line from protocol-capabilities.
On Fri, Sep 27, 2013 at 12:20 AM, Manish Gill wrote:
> Hello,
>
> I have a git repository with lots of submodules. In one particular
> submodule, I'm having the following problem:
>
> If I try to switch branches at the top-level of that submodule, I succeed.
>
> But, if I try to switch branches in
Eric S. Raymond wrote:
> Stefan Beller :
>> According to
>> http://thread.gmane.org/gmane.comp.version-control.git/212649
>> Eric, the original author of ciabot, doesn't want the ciabot
>> no longer be included in git.git, hence the removal of the
>> whole directory.
>
> Note: I was *not* the orig
On 25 September 2013 22:01, Matthieu Moy wrote:
> Jona Christopher Sahnwaldt writes:
>
>> Yes, I think the rules for the "short form" (the guessing when there's
>> no --) should be made simpler, or maybe the guessing should be dropped
>> altogether. I don't know. I don't know git well enough to b
Stefan Beller :
> According to
> http://thread.gmane.org/gmane.comp.version-control.git/212649
> Eric, the original author of ciabot, doesn't want the ciabot
> no longer be included in git.git, hence the removal of the
> whole directory.
Note: I was *not* the original author of the ciabot scripts.
On Thu, Sep 26, 2013 at 01:47:20PM -0700, Jonathan Nieder wrote:
> John Keeping wrote:
>
> > The "diff-algorithm" option to the recursive merge strategy takes the
> > name of the algorithm as an option, but it uses strcmp on the option
> > string to check if it starts with "diff-algorithm=", meani
Stefan Beller writes:
> According to
> http://thread.gmane.org/gmane.comp.version-control.git/212649
> Eric, the original author of ciabot, doesn't want the ciabot
> no longer be included in git.git, hence the removal of the
> whole directory.
I take it you mean that he doesn't want the ciabot *
John Keeping wrote:
> The "diff-algorithm" option to the recursive merge strategy takes the
> name of the algorithm as an option, but it uses strcmp on the option
> string to check if it starts with "diff-algorithm=", meaning that this
> options cannot actually be used.
>
> Fix this by switching t
Jakub Narebski writes:
> Matthieu Moy imag.fr> writes:
>> * "git status" now omits the prefix to make its output a comment in a
>> commit log editor, which is not necessary for human consumption.
>> + Scripts that parse the output of "git status" are advised to use
>> + "git status --po
According to
http://thread.gmane.org/gmane.comp.version-control.git/212649
Eric, the original author of ciabot, doesn't want the ciabot
no longer be included in git.git, hence the removal of the
whole directory.
Signed-off-by: Stefan Beller
---
I found out about this task by browsing
http://git
On Thu, Sep 26, 2013 at 06:35:57PM +0200, Francis Moreau wrote:
> I'm trying to use "git log --cherry ..." in order to display new, kept
> and removed commits between two branches A and B.
>
> So commits which are only in B are considered new and should be marked
> with '+'. Commits which are in b
‘eval "$@"’ created an extra layer of shell interpretation, which was
probably not expected by a user who passed multiple arguments to git
submodule foreach:
$ git grep "'"
[searches for single quotes]
$ git submodule foreach git grep "'"
Entering '[submodule]'
/usr/lib/git-core/git-submodule: 1:
The "diff-algorithm" option to the recursive merge strategy takes the
name of the algorithm as an option, but it uses strcmp on the option
string to check if it starts with "diff-algorithm=", meaning that this
options cannot actually be used.
Fix this by switching to prefixcmp. At the same time,
On 09/27/2013 12:18 AM, Jonathan Nieder wrote:
> Manish Gill wrote:
>> Jonathan Nieder wrote:
>
>>> What is the exact command you use to get the above output?
>>
>> git checkout
>
> Is a normal branch, a remote-tracking branch, or a
> branch that doesn't exist yet?
Local branch that was suppos
APPLIED COMPUTING CONFERENCE 2013 (ACC '13)
Nanjing, China, November 17-19, 2013
http://tinyurl.com/phhg562
The registration fee is: 250 EUR for participants from
Zhejiang University of Technology, Hangzhou, China,
250 EUR for participants from Tianjin University, Tianjin, China
and 550 EUR fo
Manish Gill wrote:
> Jonathan Nieder wrote:
>> What is the exact command you use to get the above output?
>
> git checkout
Is a normal branch, a remote-tracking branch, or a
branch that doesn't exist yet?
[...]
> I should mention what *exactly* happened that led to this. I was trying
> to publ
On 09/26/2013 11:38 PM, Jonathan Nieder wrote:
> (cc-ing Duy, who knows the setup code well)
> Manish Gill wrote:
>
>> I have a git repository with lots of submodules. In one particular
>> submodule, I'm having the following problem:
>>
>> If I try to switch branches at the top-level of that submo
Matthieu Moy imag.fr> writes:
> * "git status" now omits the prefix to make its output a comment in a
> commit log editor, which is not necessary for human consumption.
> + Scripts that parse the output of "git status" are advised to use
> + "git status --porcelain", which is both easi
(cc-ing Duy, who knows the setup code well)
Manish Gill wrote:
> I have a git repository with lots of submodules. In one particular
> submodule, I'm having the following problem:
>
> If I try to switch branches at the top-level of that submodule, I succeed.
>
> But, if I try to switch branches in
Hello,
I have a git repository with lots of submodules. In one particular
submodule, I'm having the following problem:
If I try to switch branches at the top-level of that submodule, I succeed.
But, if I try to switch branches in any subsequen levels, I get the
following error:
fatal: inter
Hello,
I'm trying to use "git log --cherry ..." in order to display new, kept
and removed commits between two branches A and B.
So commits which are only in B are considered new and should be marked
with '+'. Commits which are in both branches are marked with '=' but
only commit in branch B are s
Am 24.09.2013 13:16, schrieb Tay Ray Chuan:
> Hi Karsten,
>
> On Tue, Sep 24, 2013 at 5:50 PM, Karsten Blees
> wrote:
>>
>> | add| get 100% hits |get 10% hits
>> | hash | hashmap | hash | hashmap | hash | hashmap
>> ++-+---+--
Am 26.09.2013 12:16, schrieb Fredrik Gustafsson:
> On Tue, Sep 24, 2013 at 11:50:16AM +0200, Karsten Blees wrote:
>> Tests can be reproduced with 'time echo "perfhash[map] 1000" |
>> ./test-hashmap', see test-hashmap.c for definition of method flags.
>
> So I'm still curious about the actual per
Signed-off-by: Matthieu Moy
---
Not terribly important, but the old item alone may sound like "we
broke your script purposely, good luck with the new version" to a
script writer.
Documentation/RelNotes/1.8.5.txt | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation/RelNotes/1.8.5
On Thu, Sep 26, 2013 at 3:32 PM, Stefan Beller
wrote:
> This is just a direct translation of
> http://article.gmane.org/gmane.comp.version-control.git/235396
> So I don't consider this is ready for inclusion.
>
> Some notes:
> We need to have more error checking, repack shall be 0, 2 or 4 but noth
On Thu, Sep 26, 2013 at 6:08 PM, Fredrik Gustafsson wrote:
> On Thu, Sep 26, 2013 at 05:26:27PM +0700, Duy Nguyen wrote:
>> On Thu, Sep 26, 2013 at 5:16 PM, Fredrik Gustafsson wrote:
>> > On Tue, Sep 24, 2013 at 11:50:16AM +0200, Karsten Blees wrote:
>> >> Tests can be reproduced with 'time echo
On Thu, Sep 26, 2013 at 05:26:27PM +0700, Duy Nguyen wrote:
> On Thu, Sep 26, 2013 at 5:16 PM, Fredrik Gustafsson wrote:
> > On Tue, Sep 24, 2013 at 11:50:16AM +0200, Karsten Blees wrote:
> >> Tests can be reproduced with 'time echo "perfhash[map] 1000" |
> >> ./test-hashmap', see test-hashmap.c
On Thu, Sep 26, 2013 at 5:16 PM, Fredrik Gustafsson wrote:
> On Tue, Sep 24, 2013 at 11:50:16AM +0200, Karsten Blees wrote:
>> Tests can be reproduced with 'time echo "perfhash[map] 1000" |
>> ./test-hashmap', see test-hashmap.c for definition of method flags.
>
> So I'm still curious about the
On Thu, Sep 26, 2013 at 3:32 AM, Stefan Beller
wrote:
> This is just a direct translation of
> http://article.gmane.org/gmane.comp.version-control.git/235396
> So I don't consider this is ready for inclusion.
>
> Some notes:
> We need to have more error checking, repack shall be 0, 2 or 4 but noth
On Tue, Sep 24, 2013 at 11:50:16AM +0200, Karsten Blees wrote:
> Tests can be reproduced with 'time echo "perfhash[map] 1000" |
> ./test-hashmap', see test-hashmap.c for definition of method flags.
So I'm still curious about the actual performance improvements for git.
I runned git describe on t
Jonathan Nieder writes:
> I'll probably be releasing 1.8.4.1 tomorrow. If you have time to
> experiment with "maint" or "master" to find any remaining problems
> until then, that will be very welcome.
It seems mm/rebase-continue-freebsd-WB (99855dd) hasn't been merged to
maint. Right now, the *
This file isn't really harmful, but isn't useful either, and can create
minor annoyance for the user:
* It's confusing, as the presence of a *.pid file often implies that a
process is currently running. A user running "ls .git/" and finding
this file may incorrectly guess that a "git gc" is cu
The previous code was detecting the presence of "--" by looking only at
argument 1. As a result, "git checkout foo bar --" was interpreted as an
ambiguous file/revision list, and errored out with:
error: pathspec 'foo' did not match any file(s) known to git.
error: pathspec 'bar' did not match any
The "--" notation disambiguates files and branches, but as a side-effect
of the previous implementation, also disabled the branch auto-creation
when $branch does not exist.
A possible scenario is then:
git checkout $branch
=> fails if $branch is both a ref and a file, and suggests --
git checkou
Jonathan Nieder writes:
> case 3: git checkout [--]
>
> If is a commit, [...]
>
> If is _not_ a commit, either "--" is present or
> is not a path, no -t nor -b was given, and [...]
>
> Otherwise, if "--" is present, treat it like case (1).
>
> Oth
2013/9/26 Torsten Bögershausen :
>> * jx/relative-path-regression-fix (2013-09-20) 3 commits
>> - Use simpler relative_path when set_git_dir
>> - relative_path should honor dos-driver-prefix
>> - test: use unambigous leading path (/foo) for mingw
>>
>> Waiting for the review to settle.
> Is thi
Jonathan Nieder writes:
> (a) rename has_dash_dash here to dash_dash_pos, or
> (b) put the check in the loop, like so:
I agree with (a), but not with (b). I think separating the computation
of the position and the diagnosis makes it clearer.
I reworked the code a bit, the diagnosis part now l
This is just a direct translation of
http://article.gmane.org/gmane.comp.version-control.git/235396
So I don't consider this is ready for inclusion.
Some notes:
We need to have more error checking, repack shall be 0, 2 or 4 but nothing
else. If 0 is given, no argument is passed to pack-objects, in
Jonathan Nieder writes:
> Hi,
>
> Matthieu Moy wrote:
>
>> The "--" notation disambiguates files and branches, but as a side-effect
>> of the previous implementation, also disabled the branch auto-creation
>> when $branch does not exist.
>
> Hm. I am not sure that was just an implementation side
Hello,
When using --cherry option (which implies --cherry-mark) the mark
boundaries are "+", "-", "=" when revs are displayed.
But if I'm displaying them with --format=format:"%m %H", it's still
using "<", ">", "=" instead.
Is that expected ?
Thanks
--
Francis
--
To unsubscribe from this list:
41 matches
Mail list logo
