Fix fatal in Git hook when a --force push completely rewrites a ref
ClosedPublic
Actions

Authored by epriestley on Dec 11 2013, 8:31 PM.

Tags

None

Referenced Files

	F18854778: D7756.id.diff
	Sat, Nov 1, 12:38 AM

	F18853650: D7756.id17546.diff
	Fri, Oct 31, 6:32 PM

	F18836015: D7756.id17543.diff
	Sun, Oct 26, 8:48 PM

	F18831767: D7756.id.diff
	Sat, Oct 25, 3:13 PM

	F18829543: D7756.diff
	Fri, Oct 24, 10:43 PM

	F18782605: D7756.diff
	Mon, Oct 13, 2:07 AM

	F18734527: D7756.diff
	Sep 30 2025, 10:56 PM

	F18220475: D7756.id.diff
	Aug 19 2025, 2:51 PM

View All Files

Subscribers

aran

Details

Reviewers

btrahan

Maniphest Tasks

T4224: Failure when trying to force push

Commits

Restricted Diffusion Commit
rP61c934449d17: Fix fatal in Git hook when a --force push completely rewrites a ref

Summary

Fixes T4224. If you git merge-base A B, and they have no ancestor, the command exits with an error. Assume errors mean "no ancestry" and continue.

Test Plan

Completely rewrite a repository with a --force push.

Diff Detail

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

btrahan accepted this revision.Dec 11 2013, 10:33 PM

Closed by commit rP61c934449d17 (authored by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

applications/

diffusion/

engine/

DiffusionCommitHookEngine.php

15 lines

Diff 17546

View Options

src/applications/diffusion/engine/DiffusionCommitHookEngine.php

Fix fatal in Git hook when a --force push completely rewrites a refClosedPublicActions