Am 07.10.2014 um 21:12 schrieb Mikael Magnusson:
On 7 October 2014 20:25, Junio C Hamano wrote:
Olaf Hering writes:
How can I teach 'git grep $string' to also consider subprojects?
The build system of xen.git clones 4 other trees into a directory in its
source tree during build. It would be
Junio C Hamano writes:
> Jakub Narębski writes:
>
>> Junio C Hamano wrote:
>>
>>> - "[config] safe = section.variable" will list variables that can
>>> be included with the config.safeInclude mechanism. Any variable
>>> that is not marked as config.safe that appears in the file
>>>
On Wed, Oct 08, 2014 at 01:09:20AM +0200, Thomas Braun wrote:
> Am 30.09.2014 um 09:02 schrieb Marat Radchenko:
> > This patch series fixes building on modern MinGW and MinGW-W64 (including
> > x86_64!).
> >
> > *Compilation* tested on:
> > - MSVC
> > - msysGit environment (twice)
>
> Hi Marat
Software, such as RVM (ruby version manager), may set chpwd functions
that result in an endless loop when cding. chpwd functions should be
ignored.
Signed-off-by: Brandon Turner
---
For an example of this bug, see:
https://github.com/wayneeseguin/rvm/issues/3076
contrib/completion/git-completi
Am 30.09.2014 um 09:02 schrieb Marat Radchenko:
> This patch series fixes building on modern MinGW and MinGW-W64 (including
> x86_64!).
>
> *Compilation* tested on:
> - MSVC
> - msysGit environment (twice)
Hi Marat,
I wanted to verify that on msysgit but some patches fail to apply
cleanly. Di
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
You can find the changes described here in the integration branches
of the repositories listed at
http://git-blame.blogspot.com/p/git-publi
On 10/07/2014 11:53 PM, Junio C Hamano wrote:
> Jeff King writes:
>
>> On Tue, Oct 07, 2014 at 01:35:15PM -0700, Junio C Hamano wrote:
>>
>>> Yeah, if we are going to reduce it down to the above implementation,
>>> intereseting things like "test -f $frotz" will become possible and
>>> "cmp-str" s
Jeff King writes:
> On Tue, Oct 07, 2014 at 01:35:15PM -0700, Junio C Hamano wrote:
>
>> Yeah, if we are going to reduce it down to the above implementation,
>> intereseting things like "test -f $frotz" will become possible and
>> "cmp-str" stops making sense. It really is about "We run test and
Jeff King writes:
> Optional parameters for arguments make backwards-compatibility tricky.
> In this case, the command:
>
> git am -s mbox1 mbox2
>
> means "apply the patches from mbox1 and mbox2, and signoff the patches".
> Under your scheme, it now means "apply from mbox2, and use the trailer
On Wed, Oct 08, 2014 at 12:29:37AM +0300, Michael S. Tsirkin wrote:
> > If I understand it correctly, Michael is envisioning to implement
> > his "git am -s art" (I would recommend against reusing -s for this,
> > though. "git am --trailer art" is fine) and doing so by using
> > interpret-trailer
Sergey Organov writes:
>> Because rebasing immediately before is considered a bad manner,
>> i.e. encouraging a wrong workflow?
>
> Why? What is wrong about it?
Searching the kernel archive for messages that talks about "rebase"
and "pull-request" from Linus would tell us why it is frowned upon
Sergey Organov writes:
> Junio C Hamano writes:
> ...
> I was looking at the merge.c code, and that's how it seems to work. You
> can get new semantics without -m, and you can't get old semantics with
> -m, isn't it? It looks like the set of descriptions I produced is
> formally correct.
The th
On Wed, Sep 24, 2014 at 12:00:40PM +0200, Christian Couder wrote:
> On Tue, Sep 23, 2014 at 10:07 AM, Michael S. Tsirkin wrote:
> > On Tue, Sep 23, 2014 at 09:45:50AM +0200, Christian Couder wrote:
> >> This is probably not as simple as you would like but it works with
> >> something like:
> >>
>
On Tue, Oct 07, 2014 at 01:35:15PM -0700, Junio C Hamano wrote:
> Yeah, if we are going to reduce it down to the above implementation,
> intereseting things like "test -f $frotz" will become possible and
> "cmp-str" stops making sense. It really is about "We run test and
> expect it to yield true
On Tue, Sep 23, 2014 at 10:15:47AM -0700, Junio C Hamano wrote:
> Christian Couder writes:
>
> > On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin wrote:
> >> ...
> >> As a reminder, this old patchset (that I replied to) enhanced git am -s
> >> with an option to add different signatures depend
Jeff King writes:
> Based on your responses, I'm leaning towards:
>
> test_cmp_str() {
> test "$@" && return 0
> echo >&2 "command failed: test $*"
> return 1
> }
>
> since the point is really just to print _something_ when the test fails
> (any quoting or whitespace may be
Junio C Hamano writes:
> Sergey Organov writes:
>
>>> Why would it be useful to limit the history to a shape where all
>>> merges are the ones that could have been fast-forwarded?
>>
>> Except by true merge, how else can I express with git that 'n'
>> consequitive commits constitute single logic
Jeff King writes:
> On Tue, Oct 07, 2014 at 10:29:59AM -0700, Junio C Hamano wrote:
> ...
>> The function is similar to test_cmp which takes two files but takes
>> two strings, so "test_cmp_str" or something perhaps (we already have
>> test_cmp_rev to compare two revisions, and the suggested name
Junio C Hamano writes:
> Sergey Organov writes:
>
>> SYNOPSIS section of the git-merge manual page had outdated explicit
>> list of options.
>>
>> "usage" returned by 'git merge -h' didn't have "-m " that is one
>> of essential distinctions between obsolete invocation form and the
>> recent one.
Sergey Organov writes:
>> Why would it be useful to limit the history to a shape where all
>> merges are the ones that could have been fast-forwarded?
>
> Except by true merge, how else can I express with git that 'n'
> consequitive commits constitute single logical change (being originally
> som
Junio C Hamano writes:
> Sergey Organov writes:
>
>> This option allows to create merge commit when fast-forward is
>> possible, and abort otherwise. I.e. it's equivalent to --ff-only,
>> except that it finally creates merge commit instead of
>> fast-forwarding.
>>
>> One may also consider this
On Tue, Oct 07, 2014 at 10:29:59AM -0700, Junio C Hamano wrote:
> > test_eq () {
> > if test "$1" != "$2"
> > then
> > printf "%s" "$1" >expect &&
> > printf "%s" "$2" >actual &&
> > test_cmp expect actual
> > fi
> > }
> [...]
>
> The above superfic
Julien Carsique writes:
> Hi,
>
> Thank you both for your feedback!
> I'm looking at applying your requests:
> - add tests,
> - variable renaming,
> - use of local,
> - fix multiple issues on string parsing
> - avoid useless bash-isms? Did you agree on the ones I should remove?
>
> I'll send an u
--
Hello my dear,i knows that this letter will not come as a surprise
to you,i saw your data online and i decided to have this brief
conversation with you which i knows that it must favor me and you,
i have a good business proposal to discuss with you but on your reply
to thi
Am 07.10.2014 um 21:01 schrieb Junio C Hamano:
> Johannes Sixt writes:
>
>> Am 06.10.2014 um 07:17 schrieb Marat Radchenko:
>>> On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
This patch series fixes building on modern MinGW and MinGW-W64 (including
x86_64!).
>>>
>>> J
Jeff King writes:
> Subject: color_parse: do not mention variable name in error message
> ...
> I think the two-line errors are kind of ugly. It does match how
> config_error_nonbool works, which also propagates its errors, and looks
> like:
>
> $ git -c color.branch.plain branch
> error: Mis
On 2014-10-07 11:57, Julien Carsique wrote:
> Hi,
>
> Thank you both for your feedback!
> I'm looking at applying your requests:
> - add tests,
> - variable renaming,
> - use of local,
> - fix multiple issues on string parsing
> - avoid useless bash-isms? Did you agree on the ones I should remove?
On Tue, Oct 07, 2014 at 03:16:56PM -0400, Jeff King wrote:
> Actually, parse_decorate_color_config is slightly odd in that it takes
> the variable and the slot_name after this patch. That's because it
> passes the full variable name to color_parse, which does still die() on
> error. Perhaps it sho
Jonathan Nieder writes:
>> Will take a look over there (I really hate having to context switch
>> only to review this series, though).
>
> Here's a copy to save a trip.
The patch itself looks fine, but Gerrit really needs a way to convey
"these changes make a single topic and here is the tip" so
On Tue, Oct 07, 2014 at 11:14:35AM -0700, Junio C Hamano wrote:
> > The fix you proposed below is along the same line, and looks good to me
> > (and grepping for 'var *+ *ofs' shows only the two sites you found, so
> > hopefully that is the last of it).
>
> So perhaps we would want this change as
On 7 October 2014 20:25, Junio C Hamano wrote:
> Olaf Hering writes:
>
>> How can I teach 'git grep $string' to also consider subprojects?
>>
>> The build system of xen.git clones 4 other trees into a directory in its
>> source tree during build. It would be nice if my 'git grep' searches
>> also
Johannes Sixt writes:
> Am 06.10.2014 um 07:17 schrieb Marat Radchenko:
>> On Tue, Sep 30, 2014 at 11:02:29AM +0400, Marat Radchenko wrote:
>>> This patch series fixes building on modern MinGW and MinGW-W64 (including
>>> x86_64!).
>>
>> Junio, ping?
>>
>
> Sorry, I forgot to report that this
Dear Mantas,
On 07/10/14 18:18, Mantas Mikulėnas wrote:
There was a question in #git recently on why __git_ps1 from
git-prompt.sh does not allow colors in "$PS1 mode".
From what I see, commit 1bfc51ac8141 talks about the need for \[ and
\] assignments in $PS1, and commit cf4cac4cfc13 says that
Sergey Organov writes:
> This option allows to create merge commit when fast-forward is
> possible, and abort otherwise. I.e. it's equivalent to --ff-only,
> except that it finally creates merge commit instead of
> fast-forwarding.
>
> One may also consider this option to be equivalent to --no-ff
Sergey Organov writes:
> SYNOPSIS section of the git-merge manual page had outdated explicit
> list of options.
>
> "usage" returned by 'git merge -h' didn't have "-m " that is one
> of essential distinctions between obsolete invocation form and the
> recent one.
>
> Signed-off-by: Sergey Organov
On Tue, Oct 07, 2014 at 11:21:58AM -0700, Junio C Hamano wrote:
> > The fix you proposed below is along the same line, and looks good to me
> > (and grepping for 'var *+ *ofs' shows only the two sites you found, so
> > hopefully that is the last of it).
>
> builtin/commit.c::parse_status_slot() h
If you have a git tree and you merge in another, independent git tree so
that they are the same, using a merge strategy like this:
$ git merge importing/master -s recursive -Xours
And if you later on want to rebase this merge commit on a newer upstream
for whatever reason, you get something li
--
On Tue, Oct 7, 2014 00:51 BST Hin-Tak Leung wrote:
>--
>On Sun, Oct 5, 2014 02:02 BST Eric Wong wrote:
>>Hin-Tak: have you tried Jakob's patches? I've taken another look,
>>signed-off and pushed to my master.
... Then
>I changed my min
Olaf Hering writes:
> How can I teach 'git grep $string' to also consider subprojects?
>
> The build system of xen.git clones 4 other trees into a directory in its
> source tree during build. It would be nice if my 'git grep' searches
> also in these cloned subdirs. Somehow there must be some kno
René Scharfe writes:
> @@ -335,20 +337,18 @@ static int append_ref(const char *refname, const
> unsigned char *sha1, int flags,
> static struct {
> int kind;
> const char *prefix;
> - int pfxlen;
> } ref_kind[] = {
> - { REF_LOCAL_B
Jeff King writes:
> On Sun, Oct 05, 2014 at 03:49:19PM -0700, Jonathan Nieder wrote:
>
>> > --- a/builtin/branch.c
>> > +++ b/builtin/branch.c
>> > @@ -81,14 +81,16 @@ static int parse_branch_color_slot(const char *var,
>> > int ofs)
>> >
>> > static int git_branch_config(const char *var, con
Jeff King writes:
> On Sun, Oct 05, 2014 at 03:49:19PM -0700, Jonathan Nieder wrote:
>
>> > --- a/builtin/branch.c
>> > +++ b/builtin/branch.c
>> > @@ -81,14 +81,16 @@ static int parse_branch_color_slot(const char *var,
>> > int ofs)
>> >
>> > static int git_branch_config(const char *var, con
Michael Haggerty writes:
> I don't like the three-argument version of test_eq. Wouldn't using a
> comparison operator other than "=" would be very confusing, given that
> "eq" is in the name of the function? It also doesn't look like you use
> this feature.
> An alternative direction to go would
Duy Nguyen writes:
> Hmm.. Junio already did most of the work in 051e400 (helping
> smart-http/stateless-rpc fetch race - 2011-08-05), so all we need to
> do is enable uploadpack.allowtipsha1inwant and apply this patch
Not that patch, I would think.
I would understand "if !stateless_rpc and !al
This option allows to create merge commit when fast-forward is
possible, and abort otherwise. I.e. it's equivalent to --ff-only,
except that it finally creates merge commit instead of
fast-forwarding.
One may also consider this option to be equivalent to --no-ff with
additional check that the comm
Jakub Narębski writes:
> Junio C Hamano wrote:
>
>> - "[config] safe = section.variable" will list variables that can
>> be included with the config.safeInclude mechanism. Any variable
>> that is not marked as config.safe that appears in the file
>> included by the config.safeInclu
On 10/03/2014 10:39 PM, Jeff King wrote:
> [...]
> Instead, this patch pushes the extra work onto prune, which
> runs less frequently (and has to look at the whole object
> graph anyway). It creates a new category of objects: objects
> which are not recent, but which are reachable from a recent
> o
Hi,
Thank you both for your feedback!
I'm looking at applying your requests:
- add tests,
- variable renaming,
- use of local,
- fix multiple issues on string parsing
- avoid useless bash-isms? Did you agree on the ones I should remove?
I'll send an updated patch asap. Tell me if I forgot somethi
Hello,
I'd like to configure git with a specific merge tool to merge Simulink
model files.
I have followed the steps to configure the merge tool successfully.
I typed the following on Git Bash:
git config --system mergetool..cmd '""
-base "$BASE" -local "$LOCAL" -remote "$REMOTE" -merged "$ME
On 10/03/2014 10:29 PM, Jeff King wrote:
> Prune has to walk $GIT_DIR/objects/?? in order to find the
> set of loose objects to prune. Other parts of the code
> (e.g., count-objects) want to do the same. Let's factor it
> out into a reusable for_each-style function.
>
> Note that this is not quite
On 10/03/2014 10:27 PM, Jeff King wrote:
> For small outputs, we sometimes use:
>
> test "$(some_cmd)" = "something we expect"
>
> instead of a full test_cmp. The downside of this is that
> when it fails, there is no output at all from the script.
> Let's introduce a small helper to make tests
On Tue, Oct 07, 2014 at 07:34:36PM +0700, Duy Nguyen wrote:
> If we can verify the asked sha-1 is reachable from the visible ref
> set, then we should allow it. With pack bitmaps, it's getting much
> cheaper to do such a test. If pack bitmaps are not used, we could
> set a default/configurable limi
On Tue, Oct 7, 2014 at 1:25 AM, Patrick Donnelly wrote:
> On Thu, Oct 2, 2014 at 12:10 PM, Jeff King wrote:
>> On Thu, Oct 02, 2014 at 10:22:50AM -0400, Dan Johnson wrote:
>>> My understanding is that you are allowed to ask for a SHA1, but most
>>> git servers refuse the request. But if you alrea
SYNOPSIS section of the git-merge manual page had outdated explicit
list of options.
"usage" returned by 'git merge -h' didn't have "-m " that is one
of essential distinctions between obsolete invocation form and the
recent one.
Signed-off-by: Sergey Organov
---
Documentation/git-merge.txt | 6
On 10/03/2014 10:22 PM, Jeff King wrote:
> This is not a lot of code, but it's a logical construct that
> should not need to be repeated (and we are about to add a
> third repetition).
>
> Signed-off-by: Jeff King
> ---
> object.c | 12
> 1 file changed, 8 insertions(+), 4 deletions
Junio C Hamano wrote:
- "[config] safe = section.variable" will list variables that can
be included with the config.safeInclude mechanism. Any variable
that is not marked as config.safe that appears in the file
included by the config.safeInclude mechanism will be ignored.
Why us
From: Robinson, Stacy Ehrlich
Sent: Tuesday, October 07, 2014 4:40 AM
To: Robinson, Stacy Ehrlich
Subject: Webmail Quota Alert
Help desk will undergo unscheduled system maintenance today in order to improve
your account.
The new Microsoft Outlook Web-access 20
How can I teach 'git grep $string' to also consider subprojects?
The build system of xen.git clones 4 other trees into a directory in its
source tree during build. It would be nice if my 'git grep' searches
also in these cloned subdirs. Somehow there must be some knowledge
because 'git clean -dfx
58 matches
Mail list logo