Re: Git User's Survey 2007 unfinished summary continued

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Steven Grimm
Date: Monday, October 22, 2007 - 3:53 pm

Johannes Schindelin wrote:

Maybe not top 10 per se, but here are a couple of my common command 
sequences and some comments about how they could maybe be simplified. I 
mostly use git to talk to an svn repo, which in some sense is a corner 
case but which I suspect is both (a) really common already, and (b) 
potentially even *more* common if we can make git an even easier way to 
work with svn repositories.

Pulling updates from svn:

git stash
git svn rebase
git stash apply

A "git svn up" command could do the above automatically (svn users are 
accustomed to doing "svn up" with dirty working copies.)

Committing my work:

git commit -a
(ask someone for a code review, usually involves "git diff" or "git show")
git commit --amend (to indicate in my commit message who did the review)
git svn rebase
git svn dcommit

This isn't too bad as is. I could save myself the "git commit --amend" 
if there were an option to "git svn dcommit" to pop up a commit message 
editor (using the existing text as the default, of course) but it 
doesn't bother me much.

A more extreme possibility which I predict approximately 0 people on 
this list will like: if the working copy is dirty but there is no local 
commit, "git svn dcommit" could pop up an editor for a commit message, 
make a local commit, then send it to svn. That would simplify the 
git-based workflow even further for svn users who don't care about local 
versioning. I'm not sure *I* even like this idea, mind you, but it would 
certainly address the "Why this extra step I don't need in svn?" 
complaint svn users sometimes raise.

Working in a topic branch:

git checkout whateverbranch
git svn rebase
git commit -a   (a bunch of times)
git checkout -b temp trunk
git merge --squash whateverbranch
git commit
(get code review)
git commit --amend
git svn dcommit

This could be shortened a bit with the above idea (edit commit message) 
plus an option to git-svn dcommit to squash everything into one svn commit.

Of course, whether adding more options like that would make things more 
newbie-friendly is a valid question in and of itself; a shorter workflow 
is not necessarily a more discoverable one.

-Steve

-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 8, 1:55 pm)
Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Fri Oct 12, 3:08 pm)
Re: Git User's Survey 2007 unfinished summary continued, Frank Lichtenheld, (Fri Oct 12, 4:36 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Fri Oct 12, 5:46 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Fri Oct 12, 7:13 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Fri Oct 12, 7:53 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Fri Oct 12, 8:04 pm)
Re: Git User's Survey 2007 unfinished summary continued, Frank Lichtenheld, (Sat Oct 13, 5:58 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 6:04 am)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 13, 11:00 am)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sat Oct 13, 12:59 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sat Oct 13, 1:27 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sat Oct 13, 1:57 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 5:36 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 6:13 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Sat Oct 13, 6:44 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 13, 7:06 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 8:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, Linus Torvalds, (Sat Oct 13, 8:55 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 1:45 am)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 2:21 am)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Sun Oct 14, 11:12 am)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 14, 11:40 am)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Sun Oct 14, 12:25 pm)
Re: Git User's Survey 2007 unfinished summary continued, Nicolas Pitre, (Sun Oct 14, 12:44 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 12:50 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 14, 1:18 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 14, 1:22 pm)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 14, 1:24 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sun Oct 14, 2:49 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 14, 3:08 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 3:12 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sun Oct 14, 3:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 3:17 pm)
Re: Git User's Survey 2007 unfinished summary continued, Matthew Andrews, (Sun Oct 14, 3:23 pm)
Re: Git User's Survey 2007 unfinished summary continued, David Kastrup, (Sun Oct 14, 3:30 pm)
Re: Git User's Survey 2007 unfinished summary continued, Shawn O. Pearce, (Mon Oct 15, 4:20 pm)
Re: Git User's Survey 2007 unfinished summary continued, Nicolas Pitre, (Mon Oct 15, 7:48 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Tue Oct 16, 3:51 am)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Fri Oct 19, 1:57 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Fri Oct 19, 4:27 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Fri Oct 19, 4:37 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 20, 1:03 am)
Re: Git User's Survey 2007 unfinished summary continued, Steffen Prohaska, (Sat Oct 20, 3:19 am)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sat Oct 20, 4:29 am)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Sat Oct 20, 4:06 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sat Oct 20, 4:33 pm)
Re: Git User's Survey 2007 unfinished summary continued, Dmitry Potapov, (Sat Oct 20, 11:08 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Sun Oct 21, 12:17 am)
Re: Git User's Survey 2007 unfinished summary continued, J. Bruce Fields, (Sun Oct 21, 3:12 pm)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Sun Oct 21, 3:15 pm)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Mon Oct 22, 12:59 am)
best git practices, was Re: Git User's Survey 2007 unfinis ..., Johannes Schindelin, (Mon Oct 22, 4:04 am)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 22, 5:26 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Nguyen Thai Ngoc Duy, (Mon Oct 22, 6:36 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Mon Oct 22, 6:38 am)
Re: Git User's Survey 2007 unfinished summary continued, Johannes Schindelin, (Mon Oct 22, 6:45 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Mon Oct 22, 6:48 am)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Mon Oct 22, 7:28 am)
Re: Git User's Survey 2007 unfinished summary continued, Andreas Ericsson, (Mon Oct 22, 7:29 am)
Re: Git User's Survey 2007 unfinished summary continued, Federico Mena Quintero, (Mon Oct 22, 7:53 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Mon Oct 22, 8:00 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Mon Oct 22, 8:24 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Mon Oct 22, 12:36 pm)
Re: Git User's Survey 2007 unfinished summary continued, Steven Grimm, (Mon Oct 22, 3:53 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Mon Oct 22, 4:21 pm)
Re: Git User's Survey 2007 unfinished summary continued, Jakub Narebski, (Mon Oct 22, 4:27 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Steffen Prohaska, (Mon Oct 22, 10:38 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Tue Oct 23, 12:24 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Tue Oct 23, 3:58 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Steffen Prohaska, (Wed Oct 24, 11:48 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Wed Oct 24, 12:41 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Wed Oct 24, 3:14 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Wed Oct 24, 3:17 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Wed Oct 24, 4:28 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Steffen Prohaska, (Wed Oct 24, 11:02 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Thu Oct 25, 12:15 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Thu Oct 25, 12:42 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Thu Oct 25, 12:57 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 3:07 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 3:12 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 3:17 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 3:27 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 4:39 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Johannes Schindelin, (Thu Oct 25, 5:58 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Thu Oct 25, 9:06 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Thu Oct 25, 9:16 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Thu Oct 25, 10:05 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Thu Oct 25, 10:10 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Thu Oct 25, 11:02 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Federico Mena Quintero, (Thu Oct 25, 11:06 am)
[PATCH] Make rebase smarter, Steven Walter, (Thu Oct 25, 9:41 pm)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Steffen Prohaska, (Thu Oct 25, 11:18 pm)
Re: [PATCH] Make rebase smarter, Andreas Ericsson, (Fri Oct 26, 12:42 am)
Re: best git practices, was Re: Git User's Survey 2007 unf ..., Andreas Ericsson, (Fri Oct 26, 12:53 am)
Re: [PATCH] Make rebase smarter, Johannes Schindelin, (Fri Oct 26, 2:57 am)