Not so happy with Git

Posted: January 21st, 2010 | Author: Mars | Filed under: Uncategorized | 3 Comments »

The ability to host a repository via HTTP is nice, but I’m left swimming any time something unusual happens. I’m sure one of git’s hundreds of sub-commands can tell me why it won’t do what I want, but in absence of a comprehensive knowledge of the system, I’m stuck. Here’s the latest example of its helpfulness:

Morgan:git marssaxman$ git apply 0001-implementation-of-an-intrinsic-function-system-in-th.patch 
error: patch failed: source/flowgraph/pool.cpp:355
error: source/flowgraph/pool.cpp: patch does not apply
Morgan:git marssaxman$

There are no changes in the local repository, and the patch comes from a fresh clone of the same master. Why won’t this work? Beats me. I guess it’s time to trash the local repository and clone a new one.

3 Comments on “Not so happy with Git”

  1. 1 Aaron Ballman said at 13:54 on January 24th, 2010:

    The latest update to git totally broke shell integration on Windows. I’ve been less than happy with git thus far. It’s a bit too bleeding edge for my tastes.

  2. 2 Geremy Condra said at 12:57 on February 4th, 2010:

    I didn’t read this post before I sent you the patch last night- if you want I can put my local repo up on gitorious so that you can just merge from there instead of applying the patch.

    Also, did you try the -3 option?

  3. 3 mars said at 14:34 on February 4th, 2010:

    No worries – I’ve gotten my local repo sorted out, with the help of the “–verbose” option, and expect to merge your changes later tonight.

    I’m not familiar with the -3 option. Which subcommand accepts it? I don’t see it in the help for ‘merge’ or ‘apply’.