Re: [PATCH] travis-ci: no longer use containers

[Sebastian Staudt]

Junio C Hamano  writes:
>
> Sebastian Staudt  writes:
>
> > Travis CI will soon deprecate the container-based infrastructure
> > enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.
> >
> > More info:
> > https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures
>
> Thanks for posting a patch that would serve as a good discussion
> starter.  This is not a criticism on your patch, but more is a RFD
> to those who helped our use of Travis by contributing to .travis.yml
> and ci/.

In fact this was the intention while creating this patch. Although I see
I could have made this a bit clearer in the initial message.

Having a patch that may cause a broken build or other CI problems
seems more appropriate than waiting for Travis CI to flip the switch
and searching for the problem afterwards.

> Don't we need to do some other things so that we can run in vm
> environment, rather than in container environment, before doing this
> change?  IOW, aren't we doing in .travis.yml something we can do
> only in container but not in vm (if there is any), and if so,
> shouldn't we be rewriting that something so that we can run in vm?
>
> I know ce59dffb ("travis-ci: explicity use container-based
> infrastructure", 2016-01-26) only added "sudo: false" without doing
> anything else (e.g. adding things that are only available to those
> who run in container), but if we added stuff that are not usable in
> vm environment after that commit since then, we need to adjust them
> so that we can migrate to the container-based environment, no?
>
> To me, removing that "sudo: false" line seems like the least thing
> we need to worry about.  After all, they say that whether we have
> "sudo: false" or not, the CI jobs will start running in vm
> environment and not in container.  So if the rest of .travis.yml is
> ready to run in vm environment, we do not have to do anything ;-).
>
> In short, my question to Lars and SZEDER is, are we already prepared
> to be thrown into a vm environment?
>
> If the answer is "yes", then I think removing "sudo: false" is
> probably still a good thing to do for documentation purposes
> (i.e. showing that we knew we are ready to go through their
> migration).
>
> Thanks.
>
> > Signed-off-by: Sebastian Staudt 
> > ---
> >  .travis.yml | 2 --
> >  1 file changed, 2 deletions(-)
> >
> > diff --git a/.travis.yml b/.travis.yml
> > index 4d4e26c9df..8d2499739e 100644
> > --- a/.travis.yml
> > +++ b/.travis.yml
> > @@ -1,7 +1,5 @@
> >  language: c
> >
> > -sudo: false
> > -
> >  cache:
> >directories:
> >  - $HOME/travis-cache
> > --
> > 2.19.1

[PATCH] travis-ci: no longer use containers

[Sebastian Staudt]

Travis CI will soon deprecate the container-based infrastructure
enabled by `sudo: false` in ce59dffb34190e780be2fa9f449f842cadee9753.

More info:
https://blog.travis-ci.com/2018-10-04-combining-linux-infrastructures

Signed-off-by: Sebastian Staudt 
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d4e26c9df..8d2499739e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,5 @@
 language: c

-sudo: false
-
 cache:
   directories:
 - $HOME/travis-cache
--
2.19.1

Re: [feature request] find git commit log before rebase

[Sebastian Staudt]

Hi.

I think what you want is `git reflog` (http://git-scm.com/man/reflog).

git reflog b

Will tell you the commits b pointed to in the past.

Best regards,
Sebastian

2016-05-26 18:55 GMT+02:00 ryenus :
> Assuming I have branches master (m), and a side branch (b), with a
> history tree like below:
>
> m0 --- m1 -- m2 -- m3 -- m4 --- master (m)
> \  /  \
> b1 -- b2   b3 -- b4 -- branch (b) (HEAD)
>   |
>   (tag:POINT_BEFORE_REBASE)
>
> The history of branch b is can be described as:
>
> 1. branch b is forked at point of m1
> 2. branch b is merged to master into m3,
> 3. branch b then is rebased (fast-forward) from b2 to m4
> 4. then branch b started its new life as b3 b4 after rebase
>
> With the following command: I can find b3 and b4 since last fork-point
>
> git log --oneline $(git merge-base --fork-point master)..b
>
> But how to find out commits b1 b2, given the fact that b2 is the point
> before rebase?
>
> I understand it can be achieved via:
>
> git log --oneline m2..b2
>
> That's because I know b2 is the point before rebase,
> and m2 is another child of the subsequent merge commit m3
>
> I wonder how to do this with an simple (enough) command without me
> looking through the history and find b2 and m2 manually?
>
> 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
--
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

Re: [RFC] checkout --rebase

[Sebastian Staudt]

Isn't this what you want?

 $ git rebase master um-build


2013/7/19 Ramkumar Ramachandra artag...@gmail.com:
 Hi,

 I'm often work on small topic branches, and find myself doing this quite 
 often:

   # on branch master
   $ git checkout um-build
   $ git rebase master

 This is horribly inefficient; the first operation takes a _really_
 long time to complete, since master updates itself very often and I
 have to check out an old worktree.  So, I work around this issue by
 doing:

   # on branch master
   $ git checkout -b um-build-2
   $ git cherry-pick ..um-build
   $ git branch -M um-build

 ... and I scripted it.  Perhaps we should get this functionality in
 core, as `git checkout --rebase` (or something)?

 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
--
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

[ANN] Mestral – Hook management for Git

[Sebastian Staudt]

Hi,

today I'd like to introduce a new tool to manage Git hooks. It's called Mestral
and is available at GitHub: https://github.com/mestral/mestral

It is written in Ruby and inspired by Homebrew (http://brew.sh). It uses Git
itself to load and update hooks and aims to be easy to use for both users and
hook authors.

Currently, it's an early proof of concept and I'm looking for some early
adopters who want to try it, give valuable feedback and maybe contribute to the
development. That means any feedback is appreciated, may it be a short tweet to
@k0raktor, a reply to this mail, an issue on GitHub or a pull request.

Best regards,
Sebastian
--
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

Re: Anybody know a website with up-to-date git documentation?

[Sebastian Staudt]

Hello Max,

git-scm.com is the best source and it's not outdated. It gets an
update after every single release of Git.
See e.g. http://git-scm.com/docs/git-config which was updated in the
current stable version.
It seems that git-remote-helper's documentation was just not updated
since version 1.7.12.3.

Best regards,
Sebastian

2013/1/30 John Keeping j...@keeping.me.uk:
 On Wed, Jan 30, 2013 at 12:46:47PM +0100, Max Horn wrote:
 does anybody know a website where one can view that latest git
 documentation? Here, latest means latest release (though being
 also able to access it for next would of course be a nice bonus,
 likewise for older versions). While I do have those docs on my local
 machine, I would like to access them online, too (e.g. easier to
 pointer people at this, I can access it from other machines, etc.).

 How about http://git-htmldocs.googlecode.com/git/ ?

 It's just a directory listing of the git-htmldocs repository that Junio
 maintains - the latest update was yesterday: Autogenerated HTML docs for
 v1.8.1.2-422-g08c0e.

 [I didn't know Google Code let you view the repository like that, but I
 got there by clicking the raw link against one of the files so I
 assume it's not likely to go away.]


 John
 --
 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
--
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

Re: Anybody know a website with up-to-date git documentation?

[Sebastian Staudt]

Hi Max,

it seems that this is some sort of caching problem on git-scm.com.

I saw you've already opened an issue at
https://github.com/github/gitscm-next/issues/232.
So there's probably not much you can do right now.

And I don't know any better source for documentation right now, apart
from the locally installed HTML version.

Best regards,
Sebastian

2013/1/30 Max Horn m...@quendi.de:
 Hi Sebastian,

 On 30.01.2013, at 12:56, Sebastian Staudt wrote:

 Hello Max,

 git-scm.com is the best source and it's not outdated.

 Then it seems you are using the word outdated in a different way than me 
 which I don't understand :-). Sure, it strives to be up-to-date, but fact is 
 that it fails to do that, due to a bug (I guess). The end result (failure to 
 update at all, vs. failure in an attempted update) sadly amount to the same.

 It gets an
 update after every single release of Git.
 See e.g. http://git-scm.com/docs/git-config which was updated in the
 current stable version.
 It seems that git-remote-helper's documentation was just not updated
 since version 1.7.12.3.

 Yes, and it is not alone in that, which makes the site somewhat unreliable, 
 sadly. Some more examples of pages tuck at version 1.7.12.3 and showing 
 outdated content:

 http://git-scm.com/docs/git-log
 http://git-scm.com/docs/git-merge
 http://git-scm.com/docs/git-merge-base
 http://git-scm.com/docs/git-mergetool
 http://git-scm.com/docs/git-reset
 http://git-scm.com/docs/git-rm
 http://git-scm.com/docs/git-status
 http://git-scm.com/docs/git-symbolic-ref

 I did not bother to check every single page, though, and I am pretty sure 
 there are plenty more. Because there definitely is a plethora of other pages 
 that are stuck at 1.7.12.3. Several of them still show the latest version due 
 to not having had updates since the 1.7.12.3, but that is not always easy to 
 tell due to included files (e.g. git-log.txt was not changed v1.7.12.2, but 
 it includes rev-list-options.txt which was last changed in 1.8.1).


 So, yeah, I do think git-scm.com is outdated -- in the sense that for many 
 pages, it does not show the latest officially released version of the page.


 Best regards,
 Max
--
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] config.txt: Document help.htmlpath config parameter

[Sebastian Staudt]

Signed-off-by: Sebastian Staudt korak...@gmail.com
---
 Documentation/config.txt | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index bf8f911..e452ff8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1351,6 +1351,12 @@ help.autocorrect::
value is 0 - the command will be just shown but not executed.
This is the default.
 
+help.htmlpath::
+   Specify the path where the HTML documentation resides. File system paths
+   and URLs are supported. HTML pages will be prefixed with this path when
+   help is displayed in the 'web' format. This defaults to the 
documentation
+   path of your Git installation.
+
 http.proxy::
Override the HTTP proxy, normally configured using the 'http_proxy',
'https_proxy', and 'all_proxy' environment variables (see
-- 
1.8.1.1

--
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