Re: [PATCH/POLL] git-format-patch: the default suffix is now .patch, not .txt

From: Shawn O. Pearce <spearce@spearce.org>
Date: Jan 18, 2007, 15:42 UTC
Message-ID: <20070118154257.GC15428@spearce.org>
In-Reply-To: <81b0412b0701180540x15d20453s3dbc0c061fd06d50@mail.gmail.com>

Alex Riesen <raa.lkml@gmail.com> wrote:

> The _real_ majority of the programmers desperately need a better
> VCS than CVS, SVN, Perforce, SourceSafe, ClearCase, etc.

Yes.  But...

Yesterday I had a conversation with the software configuration management guy at my day-time-pays-the-bills organization. They are seriously looking at Perforce and ClearCase, as these are lightyears ahead of what we have already (PVCS Version Manager). They also have 1-800-my-vendor telephone numbers which you can call and scream at someone when the tool corrupts its internal database[*1*], or when you cannot figure out what the "Checkout" action in the context menu does[*2*].

However my fellow developers and I use Git. We export our changes out to PVCS Version Manager via an *ugly* Perl script that I would never actually wish on anyone (which is one reason why its not contributed as git-pvcsexport). Configuration management guy won't even look at Git's real strengths as it lacks the all-important 1-800-git-help[*3*] phone number.

Yesterday we spent 4 half-man-days (4 developers working together all morning) trying to get a configuration of random files from PVCS Version Manager which compiled. In Git this would have been as simple as merging the two topics that management wanted moved to the next level of testing. But since our organization doesn't actually use Git and multiple topics affected the same files, well, yea, it was a mess. Unfortunately calling 1-800-my-vendor yields a "don't do that" from our vendor and nothing more in support. I'm very glad we pay them for the privilege of having a 1-800-my-vendor phone number in our rolodex. Yesterday it cost us over $1600 in labor.

Show 8 quoted lines

> Yes. For me and you. One of my coworkers knows nothing about patches,
> but wants (and perfectly able to) review my code. He has usable brains
> and is able to figure out what "+" and "-" is (he has, by now). He hasn't
> even realized that it was an automatically generated information, as
> I sent a patch to him first time, thought it was just a funny way to
> document changes (and was surprised when I told him a patch can be
> applied automatically, even if the original file is not exactly the same).
> But he is a typical windows-trained programmer.

I work with a few people who would rather copy and paste their changed parts into an email, then color them with pretty colors like red, green, blue, black, orange in Outlook (and all in the same email too). These then get sent to me for code review.

Prior to us using Git it may make some sense, as we did not have a diff tool available. Now that everyone is using Git and working in isolated topic branches (and doing very well with that concept) I still get these emails. People seem to have an easy time grasping the idea that Git is tracking their changes and when combined with my git-pvcsexport (see above) it just Does The Right Thing(tm) later on. But they have a hard time grasping the idea that Git can export these as a diff, or that they could just push their topic branch to me so I can pop it open in gitk. *sigh*

[*1*] This has happened to me with Perforce more than once.  Not a
      happy thought.  Never with Git.

[*2*] Yes, really, some of our version control users have difficulty
      grasping a concept like "checkout".  They *definately* have
      an issue with Git's "checkout -b" concept.

[*3*] Already taken.  Oddly enough by a company that could almost
      be considered to be a competiter to my day-time-pays-the-bills
      organization.

-- 
Shawn.