Follow Commit-msg hook rules: allow it to edit the commit message, before committing.

Author: Seth Raphael

PBGitIndex.m

@@ -175,13 +175,6 @@ - (void)commitWithMessage:(NSString *)commitMessage
 
 	[self postCommitUpdate:@"Creating commit"];
 	int ret = 1;
-	NSString *commit = [repository outputForArguments:arguments
-										  inputString:commitMessage
-							   byExtendingEnvironment:amendEnvironment
-											 retValue: &ret];
-	
-	if (ret || [commit length] != 40)
-		return [self postCommitFailure:@"Could not create a commit object"];
 
 	[self postCommitUpdate:@"Running hooks"];
 	if (![repository executeHook:@"pre-commit" output:nil])
@@ -190,6 +183,16 @@ - (void)commitWithMessage:(NSString *)commitMessage
 	if (![repository executeHook:@"commit-msg" withArgs:[NSArray arrayWithObject:commitMessageFile] output:nil])
 		return [self postCommitFailure:@"Commit-msg hook failed"];
 
+	commitMessage = [NSString stringWithContentsOfFile:commitMessageFile encoding:NSUTF8StringEncoding error:nil];
+	
+	NSString *commit = [repository outputForArguments:arguments
+										  inputString:commitMessage
+							   byExtendingEnvironment:amendEnvironment
+											 retValue: &ret];
+	
+	if (ret || [commit length] != 40)
+		return [self postCommitFailure:@"Could not create a commit object"];
+	
 	[self postCommitUpdate:@"Updating HEAD"];
 	[repository outputForArguments:[NSArray arrayWithObjects:@"update-ref", @"-m", commitSubject, @"HEAD", commit, nil]
 						  retValue: &ret];