Teach the pre-rebase sample hook to refuse rewriting commits on a branch
that are present in that branch's @{upstream}. This is to prevent users
from rewriting commits that have already been published.
If the branch has no @{upstream}, or the commits-to-be-rebased are not
reachable from the upstream (hence assumed to be unpublished), the rebase
is not refused.
This patch is not an ideal solution to the problem, for at least the
following reasons:
- There is no way for the user to override this check, except skipping
the pre-rebase hook entirely with --no-verify.
- The check only works for branches with a configured upstream. If the
user's workflow does not rely on upstream branches, or uses some other
method of publishing commits, the check will produce false negatives
(i.e. allow rebases that should have been refused).
- The check only applies to rebase. I wanted to add the same check
on 'commit --amend', but there's no obvious way to detect --amend
from within the pre-commit hook.
- There may be other rewrite scenarios where we want to do this check,
such as 'git reset'. Maybe a pre-rewrite hook should be added?
- Some (including myself) want this check to be performed by default,
since it's mostly targeted at newbies that are less likely to enable
the pre-rebase (pre-rewrite) hook, so maybe the check should be added
to core git instead.
Discussed-with: Jakub Narebski <jnareb@xxxxxxxxx>
Signed-off-by: Johan Herland <johan@xxxxxxxxxxx>
---
templates/hooks--pre-rebase.sample | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample
index 053f111..4c28b27 100755
--- a/templates/hooks--pre-rebase.sample
+++ b/templates/hooks--pre-rebase.sample
@@ -25,6 +25,20 @@ else
exit 0 ;# we do not interrupt rebasing detached HEAD
fi
+# Are we rewriting upstreamed commits?
+upstream=`git rev-parse --verify "${topic#refs/heads/}@{u}" 2>/dev/null`
+if test -n "$upstream"
+then
+ # See if any of the commits to be rebased are reachable from upstream.
+ basecommit=`git rev-parse --verify "$basebranch"`
+ mergebase=`git merge-base "$basecommit" "$upstream"`
+ if test "$basecommit" != "$upstream" -a "$basecommit" = "$mergebase"
+ then
+ echo >&2 "Cannot rebase commits that are in $topic's upstream"
+ exit 1
+ fi
+fi
+
case "$topic" in
refs/heads/??/*)
;;
--
1.7.9.1.314.ga9004
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html