Skip to content

Require to keep a consistent linear history in the pre-receive hook #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Require to keep a consistent linear history in the pre-receive hook #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions bin/keep-first-parent.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
#!/usr/bin/env ruby
# See https://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git
# for the motivation of this script and what this script is doing.

CHECKED_REFNAMES = [
'refs/heads/master',
'refs/heads/trunk',
]

ARGV.each_slice(3) do |oldrev, newrev, refname|
next unless CHECKED_REFNAMES.include?(refname) # avoid checking branches pushed from git-svn just in case

out, _err, status = Open3.capture3("git", "rev-list", "--first-parent", "#{oldrev}^..#{newrev}")
next unless status.success? # skip if oldrev is the first commit, arguments are invalid, or git is broken
next if out.empty? # skip if it's an empty push

ancestor = out.lines.last.chomp
if ancestor != oldrev
STDERR.puts "The revision '#{newrev}' pushed to '#{refname}' does not have '#{oldrev}' as a first-parent ancestor, which was '#{ancestor}'."
STDERR.puts "Please make sure your '#{refname}' is rebased from '#{oldrev}', not '#{ancestor}'. Sometimes it's caused by `git pull` without `--rebase`."
exit 1
end
end