Bad revision range passed to git when pushing about git-commit-notifier

[holzman]

Hi Thomas,

Sorry that you encountered a bug.
What git version are you using?
Is the repository you're using publicly available (so I can reproduce your exact merge?)

Thanks

[akzhan]

Looks like problem here, but I'm not at workplace today:

https://github.com/bitboxer/git-commit-notifier/blob/master/lib/git_commit_notifier/diff_to_html.rb#L437
https://github.com/bitboxer/git-commit-notifier/blob/master/lib/git_commit_notifier/diff_to_html.rb#L332

@holzman, please review.

[holzman]

Thomas -- alternatively, if you can just paste the git log from the merge, that would be helpful. I have not been able to reproduce this yet.

[thomasdeniau]

The repo is not public. I'll try to provide the log ASAP, but I'm leaving for a long holiday and I'm not sure I'll have access to my VPN anytime soon.
This merge was the result of a 'git pull'.
Hope this helps, I'll try to get the exact info soon.

[holzman]

Ok. Any chance that the merge was an octopus merge rather than recursive? I don't think I'm handling octopus merges correctly (yet).

[thomasdeniau]

No, it was recursive. (a result of git pull with the default strategy)

[holzman]

Ok, thanks. I still haven't been able to reproduce it, so any more information you can send from your git log would help, along with the output from git --version and your config file.

[holzman]

I haven't touched this in nearly 2 weeks, but I hate to leave this bug sitting around. Thomas, if you can get me any log information when you have time, I'd appreciate it.

[thomasdeniau]

Sorry it took so long (I'm on vacation with almost no Internet access).

The error was produced when pushing this commit:

commit ccd83914882dabf10765ea796270682faaf64bcc
Merge: bd375ae 1579c6a
Date:   Thu Sep 29 11:57:37 2011 +0200

    Merge branch 'master' of <the repo origin URL>

The graph is like:

*   ccd8391 Merge branch 'master' of ....
|\  
| * 1579c6a ...
* | bd375ae ...
* | 5dcdd5d ...
|/  
* 4e4572d ...

(Sorry for the ..., this is a private repo).
The user had last got commits from the server as of 4e45. He committed 5dcdd5d and bd375ae locally, then pulled, which merged the work with 1579c6a, and pushed. This produced the error message above.

[holzman]

Thanks for the feedback, Thomas. We can obviously follow up when you're on vacation.
Unfortunately, I still was not able to reproduce this with the workflow you provided -- I simulated it with

*   2190b52 (HEAD, origin/master, origin/HEAD, master) Merge branch 'master' of /root/src
|\  
| * 9def93a 15
* | a1a2fa2 bd
* | 66f51fb 5d
|/  
* 3c79b6a a

but that works ok and generates the merge mail ok.

When you return from vacation, please let me know the git version on your server; it's possible that some of the plumbing or porcelain changed and I'm not catching it.

[thomasdeniau]

I think the version of git on my server is indeed the problem: it's still running git 1.6.1.3.

[holzman]

All right, that nailed it down. The git log behavior changed between 1.6.1 and 1.6.2: gitster/git@7fcda92

I'll fix this and open another ticket on another potential problem with older git versions that I just noticed.