Many gits are offline this week

Dscho and I will be (at least mostly) offline for the next four days as we travel to San Jose for the 2007 Google Summer of Code Mentor Summit.

We also just received word from Junio that he is also likely to be offline this next week. Junio has some business that needs his immediate attention, so he won't be his usual attentive self on the mailing list.

With three gits offline for at least the next few days perhaps someone would be willing to step up and collect patches so that Junio has a reasonable place to pick up from when he can get back online?

Shawn> Dscho and I will be (at least mostly) offline for the next four Shawn> days as we travel to San Jose for the 2007 Google Summer of Code Shawn> Mentor Summit.

Oddly enough, I'm giving my "Intro to Git" talk at Google HQ on 12 october. Too bad you're just going to miss that. :)

Hi,

On Thu, 4 Oct 2007, Randal L. Schwartz wrote:

We will not.  I'll watch the YouTube video a hundred times.

Ciao, Dscho

"Randal L. Schwartz" <merlyn@stonehenge.com> wrote:

Yea, seeing as how I've never had the chance to see you give a talk I am quite disappointed by the poor timing. I'll just have to catch the talk on Google Video. And shout questions at my wall to see if you can answer them.

On Thu, 4 Oct 2007, Randal L. Schwartz wrote:

Are you going to have the same heckler as the Advanced Topics meeting? ]:>

On 10/5/07, Randal L. Schwartz <merlyn@stonehenge.com> wrote:

Hi Randal, is there any material (slides, docs) you can share before the talks?

Thanks!

Regards,

Paolo> is there any material (slides, docs) you can share before the talks?

I've had the slides reviewed by Smarter People Than Me on #git already, so hopefully most of it is accurate. :) They're temporarily at

  http://www.stonehenge.com/pic/Git-2.0.3-to-be.pdf

I still hope to have a few hours to go in and add a few sadly missing graphics, particularly on the rebase vs merge section.

Hi Randal,

I believe I have found one mistake in your slides. Slide 18 reads: "git-commit -a" is like "git-add .; git-commit"

But it is incorrect, because "git-commit -a" does not add new files, so it works like "git-add -u .; git-commit".

Dmitry

On Fri, Oct 05, 2007 at 06:41:43PM +0400, Dmitry Potapov wrote:

"git-commit -a" also detects files that have been deleted, whereas "git-add" does not. In fact, I haven't found an easy way to detect this other than "git-commit -a", and it is the only reason I ever run "git-commit -a"

Dave

I just tried "git-add -u ." and it *does* detect deleted files.

$ git-status
# On branch master
nothing to commit (working directory clean)
$ rm oldfile
$ git-status
# On branch master
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#
#       deleted:    oldfile
#
no changes added to commit (use "git add" and/or "git commit -a")
$ git-add -u .
$ git-status
# On branch master
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       deleted:    oldfile
#
$ git-commit
Created commit 17e2bba: delete
 1 files changed, 0 insertions(+), 1 deletions(-)
 delete mode 100644 oldfile

So, it works exactly as "git-commit -a" in this case.

Dmitry

On Fri, Oct 05, 2007 at 09:19:02PM +0400, Dmitry Potapov wrote:

IIRC, this was a fix by Junio recently, but I can't seem to find the commit.

-Peff

"Randal L. Schwartz" <merlyn@stonehenge.com> wrote:

What, no mention of git-gui as a porcelain? It has more users than qgit according to the survey. Maybe rephrase the porcelains on slide 15 as:

  Other porcelain exists:
    - StGit ("stacked git"), guilt
    - tig (curses-based viewer)
    - qgit, git-gui

On slide 26 you say "gitk mytopic origin" shows the changes back to the common ancestor. That's what "gitk mytopic...origin" would do. Note the three dots instead of the space. The space will cause gitk to show all history back to the beginning of time.

On slide 27 you say that you can rebase your changes on upstream using "git-rebase origin/master master". That's a lot more typing than is required, most people will want to rebase their current branch onto the upstream and thus will use "git-rebase origin/master". Personally I think combining git-checkout's branch switch feature into git-rebase is stupid. It really makes things confusing. But its supported. :-(

On Sun, 7 Oct 2007, Shawn O. Pearce wrote:

For that matter, gitweb is essentially a limited porcelain. And this points out that all VCSes have alternative porcelains, but git is unusual in having convenient plumbing to support and encourage this.

	-Daniel
*This .sig left intentionally blank*

Hi,

On Sun, 7 Oct 2007, Daniel Barkalow wrote:

I do not consider viewers "porcelain". And gitweb is essentially just a viewer.

Ciao, Dscho

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

So you don't consider gitk to be porcelain? I do. The plumbing output of git-rev-list is uh, ugly. gitk may still not be the best looking application on the internet but it sure beats looking at rev-list output by eye.

Porcelain is really anything that calls plumbing to make the task of invoking or processing the output of plumbing easier on the human using it. That's it. Obviously you can work Git by just the plumbing. Just like you can compute SHA-1 by hand. You just choose not to as the time it would take is more than you want to invest. Or have left in this mortal existance...

I almost always forget about the web interfaces. There's a number of them and I don't use them often enough to really think about it. I don't know why I always forget about them. I never forget about StGit or qgit, and yet I never use those either...

Shawn> What, no mention of git-gui as a porcelain? It has more users Shawn> than qgit according to the survey. Maybe rephrase the porcelains Shawn> on slide 15 as:

Shawn> Other porcelain exists: Shawn> - StGit ("stacked git"), guilt Shawn> - tig (curses-based viewer) Shawn> - qgit, git-gui

git-gui should have been mentioned with "the git distro".  Fixed.

Shawn> On slide 26 you say "gitk mytopic origin" shows the changes back to Shawn> the common ancestor. That's what "gitk mytopic...origin" would do. Shawn> Note the three dots instead of the space. The space will cause Shawn> gitk to show all history back to the beginning of time.

Darned inconsistency! Sometimes, it's a space. Sometimes it's two dots. Sometimes, it's three dots. I know, there's reasons for that, but it's still hard for the newbie.

On Thu, Oct 04, 2007 at 06:27:05PM -0700, Randal L. Schwartz wrote:

Not that it's hard to find, but just for the record, Randal's talk can be viewed on http://video.google.com/videoplay?docid=1251251453592758541

Mike

Hi,

On Thu, 4 Oct 2007, Shawn O. Pearce wrote:

While at it, we thought that we'd have a little git-together on Sunday, a few hours before we're (or at least I'm) sober again from Saturday night. So everybody who is in the area of San Jose: Sunday is Talk Like A Git Day.

Sadly, Junio is not able to attend, but I will hoist a drink or three to him.

Ciao, Dscho

Johannes Schindelin wrote:

Here are the details for anyone who can show up:

Time: 12 noon
Place: Gordon Biersch Brewery, 640 Emerson St., Palo Alto
Web: 
http://www.gordonbiersch.com/restaurants/index.php?pg=location&sub=loc&location_id=15
Facebook event page: http://www.facebook.com/event.php?eid=5037248613 
(obviously not required, but it might give other people some idea who to 
expect)

Hope to see some folks there!

-Steve

On Thu, Oct 04, 2007 at 09:04:48PM -0400, Shawn O. Pearce wrote:

While I have neither the time nor the abilities to do this I will at least accumulate the various cvsserver patches floating around the last few days so that I can submit them to Junio in one batch.

Gruesse,

On Fri, Oct 05, 2007 at 03:13:55PM +0000, Frank Lichtenheld wrote:

  I won't have the time either, though even if I keep posting patches on
the list, I'll resubmit a digest of mines when Junio will be back
online. (or share a public git repository so that he can directly fetch
from there).

On 10/5/07, Shawn O. Pearce <spearce@spearce.org> wrote:

I'll collect patches from the list for a few days and put them into topic-branches on git://hjemli.net/pub/git/git.

-- larsh