[Insight-developers] Local pre-commit hook updated (was: Data submodule was reverted again)

[Brad King]

On 01/26/2011 11:39 AM, Brad King wrote:
> On 01/26/2011 09:30 AM, Brad King wrote:
>> On 01/26/2011 09:10 AM, Bradley Lowekamp wrote:
>>> Are you going to add this as a local commit hook and/or the staging area?
>>
>> I'm trying to do both.
> 
> I got the server-side one working.

I've finished the client-side one.  Please update your local hooks.


A direct rewind will be rejected with

===================================================================
pre-commit hook failure
-----------------------

This commit would rewind a submodule link:

  "Testing/Data"  47e9898 => 55dfde4

from the newer version in HEAD (dc9a8b9).  Run

  git reset HEAD -- "Testing/Data"
  git submodule update -- "Testing/Data"

to checkout the newer version of the submodule in your work tree.
Then try the commit again.
===================================================================


A merge that rewinds with respect to the merged parent will get:

===================================================================
pre-commit hook failure
-----------------------

This commit would rewind a submodule link:

  "Testing/Data"  bb5bb20 => 47e9898

from the newer version in MERGE_HEAD (4358e33).  Run

  git reset MERGE_HEAD -- "Testing/Data"
  git submodule update -- "Testing/Data"

to checkout the newer version of the submodule in your work tree.
Then try the commit again.
===================================================================

-Brad K