rebase error, appears to be skipping a necessary commit step about git-cc HOT 3 CLOSED

Hi Kiates,

This is one of worse error handling in my gitcc code. The problem is that the rebase error is masking the real error. Go in to rebase.py and comment out the try/finally lines (but leave the logic) in doCommit and let it fail so we can see what's really going on.

Charles

from git-cc.

Charles,

Thanks for the help. I commented out the exception blocks, but didn't get any more information. I was able to sprinkle some print statements around to trace where the error was occurring, and it was during the call to add the .gitcc file. In this repository the .gitignore file was set to ignore the .gitcc file and I think there must be an error coming back from git during that call.

Running the command by hand also confirms that git would reject it:

$ git add .gitcc
The following paths are ignored by one of your .gitignore files:
.gitcc
Use -f if you really want to add them.
fatal: no files added

I've wondered if the .gitcc file really needed to be checked in. Do you have an explanation of when and how it is used. What are the ramifications of it not being accurate, say I changed the config spec on the clearcase view or something.

Thanks again, and thank your for a very useful tool.

Chad

from git-cc.

Hi Chad,

The .gitcc file was originally intended to help with working out if a given commit should be added to this changeset based on previous merges. There are some very tricky corner cases that I couldn't deal with any other way. It isn't mandatory, and you can disable it by adding the following to .git/gitcc:

[core]
cache = False

I hope that helps.

Charles

from git-cc.