Skip to main content

The Foolproof Git Setup

A confused Git user.
There was a recent complaint on Git User mailing list. Quote:
Why do I have to be a source control engineer just to be a software developer?
Now, the main issue of this poor person is that his organization has failed to on-board him into his job. They told him to use Git, but didn't give him the means to do so productively (as far as we know, anyway).

What I started wondering was: Could his employer somehow have set up Git for him so that he could work with it just as easily as with Subversion?

Given a prepared .gitconfig with all the aliases and configurations that you wanted, could you really dumb down Git so much that it would be analogous to the simpleness of SVN?

Well, here's my take on it: To a certain degree: yes. If you could narrow down Git to do the most typical two SVN commands:
  • update (pull without merging), and
  • commit (with push)
.. that would help a lot.

Dumbing down pull

The first step would be to make git pull as stupid as an svn update - always rebase local commits on top of the ones being fetched:

git config --global pull.rebase true

The above setup has a weakness though. If pull-rebase runs into a conflict, even if there is only one local commit to rebase -  you get stuck in rebase mode and you have to start figuring out what Git wants you to do. This is what it looks like (and I can see why newcomers still find Git scary when I look at this):

  ~/temp/bar/[master]>git pull
remote: Counting objects: 5, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (3/3), done.
From /Users/tfnico/temp/foo
   24b3b7f..4705398  master     -> origin/master
First, rewinding head to replay your work on top of it...
Applying: A random commit message: makeshiftness
Using index info to reconstruct a base tree...
M readme.txt
Falling back to patching base and 3-way merge...
Auto-merging readme.txt
CONFLICT (content): Merge conflict in readme.txt
Failed to merge in the changes.
Patch failed at 0001 A random commit message: makeshiftness
The copy of the patch that failed is found in:
   /Users/tfnico/temp/bar/.git/rebase-apply/patch

 When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".

That's a lot of text for one little conflict.

While SVN will present all conflicts at once, Git will insist you handle them one commit at a time, which is nicer, but still enters you into rebase-mode where you have to go git rebase --continue when conflicts have been resolved.

So, until I can figure out a way around that, you'll have to teach your newcomer at least enough to be able to resolve conflicts, do git add <resolved file> and git rebase --continue.

OR, we go back to the drawing board.

There must be a better way

I realized this after trying to publish this blog-post, and by the time I realized it hadn't gone live, I had a better idea.

What if we just squash all local commits into being changes in the work tree?

We could make an alias: git update - which does the following

  1. git reset --soft origin/master
  2. git stash
  3. git pull
  4. git stash pop
This would essentially guarantee that any conflicts occur after we pop the stash. This is essentially the same behavior as SVN update. Here's the alias:

git config alias.update "!git reset --soft origin/master && git stash && git pull && git stash pop"

Of course this would mean that we lose the commit messages of any local commits, but that wouldn't be a problem if we also implemented the next step:

Some very pushy commits


Next up, I would imitate svn commit by automatically pushing after each commit by configuring up this post-commit hook (in .git/hooks/post-commit):

#!/bin/sh
git push

Voila. Every commit is immediately pushed away, and if there are remote changes, you have to update first. Just like in SVN.

(I know SVN will allow you to commit anyway if there are no conflicts, but I don't think that's a good idea. We could actually script our way into this too, by detecting the rejection, doing an update, and then commit again with the same commit message unless there are any conflicts.).

That's it

These two adaptions would actually go a long way, until the user wants to get into stuff like branching, and by that time he should be ready to learn to use Git properly anyway.

We could maybe alias git add to git resolve. We could also maybe wrap Git in a script and somehow capture the output messages to make them more readable and SVN-like. In the end, I guess there's also a limit to how much energy we should put into making training wheels for people..

Oh, on a final note, there's an old related project called EasyGit. They wrap Git itself and provide a smoother experience for people coming from SVN. They're not as hardline as my two adaptions above though.
Labels:

Comments

Post a Comment

Popular posts from this blog

Open source CMS evaluations

I have now seen three more or less serious open source CMS reviews. First guy to hit the field was Matt Raible ( 1 2 3 4 ), ending up with Drupal , Joomla , Magnolia , OpenCms and MeshCMS being runner-ups. Then there is OpenAdvantage that tries out a handful ( Drupal , Exponent CMS , Lenya , Mambo , and Silva ), including Plone which they use for their own site (funny/annoying that the entire site has no RSS-feeds, nor is it possible to comment on the articles), following Matt's approach by exluding many CMS that seem not to fit the criteria. It is somewhat strange that OpenAdvantage cuts away Magnolia because it "Requires J2EE server; difficult to install and configure; more of a framework than CMS", and proceed to include Apache Lenya in the full evaluation. Magnolia does not require a J2EE server. It runs on Tomcat just like Lenya does (maybe it's an idea to bundle Magnolia with Jetty to make it seem more lightweight). I'm still sure that OpenAdvant
6 comments
Read more

Considerations for JavaScript in Modern (2013) Java/Maven Projects

Disclaimer: I'm a Java developer, not a JavaScript developer. This is just what I've picked up the last years plus a little research the last days. It's just a snapshot of my current knowledge and opinions on the day of writing, apt to change over the next weeks/months. We've gone all modern in our web applications, doing MVC on the client side with AngularJS or Ember , building single-page webapps with REST backends. But how are we managing the growing amount of JavaScript in our application? Yeoman 's logo (not necessarily the conclusion of this blog post) You ain't in Kansas anymore So far we've just been doing half-random stuff. We download some version of a library and throw it into our src/main/webapp/js/lib , or we use it from a CDN , which may be down or unreachable when we want to use the application.. Some times the JS is minified, other times it's not. Some times we name the file with version number, other times without. Some
Post a Comment
Read more

Git Stash Blooper (Could not restore untracked files from stash)

The other day I accidentally did a git stash -a , which means it stashes *everything*, including ignored output files (target, build, classes, etc). Ooooops.. What I meant to do was git stash -u , meaning stash modifications plus untracked new files. Anyhows, I ended up with a big fat stash I couldn't get back out. Each time I tried, I got something like this: .../target/temp/dozer.jar already exists, no checkout .../target/temp/core.jar already exists, no checkout .../target/temp/joda-time.jar already exists, no checkout .../target/foo.war already exists, no checkout Could not restore untracked files from stash No matter how I tried checking out different revisions (like the one where I actually made the stash), or using --force, I got the same error. Now these were one of those "keep cool for a second, there's a git way to fix this"situation. I figured: A stash is basically a commit. If we look at my recent commits using   git log --graph --
12 comments
Read more

Managing dot-files with vcsh and myrepos

Say I want to get my dot-files out on a new computer. Here's what I do: # install vcsh & myrepos via apt/brew/etc vcsh clone https://github.com/tfnico/config-mr.git mr mr update Done! All dot-files are ready to use and in place. No deploy command, no linking up symlinks to the files . No checking/out in my entire home directory as a Git repository. Yet, all my dot-files are neatly kept in fine-grained repositories, and any changes I make are immediately ready to be committed: config-atom.git     -> ~/.atom/* config-mr.git     -> ~/.mrconfig     -> ~/.config/mr/* config-tmuxinator.git       -> ~/.tmuxinator/* config-vim.git     -> ~/.vimrc     -> ~/.vim/* config-bin.git        -> ~/bin/* config-git.git               -> ~/.gitconfig config-tmux.git       -> ~/.tmux.conf     config-zsh.git     -> ~/.zshrc How can this be? The key here is to use vcsh to keep track of your dot-files, and its partner myrepos/mr for o
Post a Comment
Read more

Leaving eyeo

Thirteen blog posts later, this one notes my departure from eyeo after 4 years and 3 months. I joined eyeo around the headcount of 80 employees, and now I think there's just over 250 people there. My role coming in was as operations manager, doing a mix of infrastructure engineering and technical project management. I later on took on organizational development to help the company deal with its growing pains . We introduced cross-functional teams, departments (kind of like guilds), new leadership structures, goal-setting frameworks, onboarding processes and career frameworks.  And all of this in a rapidly growing distributed company. I'm proud and happy that for a long time I knew every employee by name and got to meet every single new-hire through training them on company structure and processes.  At some point, we had enough experienced leaders and organizational developers that I could zoom back in on working in one team, consulting them on  Git and continuous integration
4 comments
Read more