diff --git a/.github/stale.yml b/.github/stale.yml index 33f0b460..b56852af 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -1,8 +1,13 @@ +# Probot: Stale +# https://github.com/probot/stale + # Number of days of inactivity before an issue becomes stale daysUntilStale: 60 # Number of days of inactivity before a stale issue is closed -daysUntilClose: 7 +# Set to false to disable. If disabled, issues still need to be closed +# manually, but will remain marked as stale. +daysUntilClose: false # Issues with these labels will never be considered stale exemptLabels: @@ -10,13 +15,11 @@ exemptLabels: - security # Label to use when marking an issue as stale -staleLabel: wontfix +staleLabel: stale # Comment to post when marking an issue as stale. Set to `false` to disable markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. + A friendly reminder that this issue had no activity for 60 days. # Comment to post when closing a stale issue. Set to `false` to disable closeComment: false diff --git a/.jrubyrc b/.jrubyrc deleted file mode 100644 index 250bfe2d..00000000 --- a/.jrubyrc +++ /dev/null @@ -1 +0,0 @@ -cext.enabled=true diff --git a/.travis.yml b/.travis.yml index fc1c7b13..4dd67901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ rvm: - 2.3 - 2.4 - 2.5 + - 2.6 + - ruby-head - jruby + matrix: allow_failures: - rvm: jruby - fast_finish: true -before_install: - - gem install bundler - - bundle --version - - git --version + - rvm: ruby-head + fast_finish: true \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b24e5cfe..7a918e2e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log +## 1.6.0.pre1 + +See https://github.com/ruby-git/ruby-git/releases/tag/v1.6.0.pre1 + ## 1.5.0 See https://github.com/ruby-git/ruby-git/releases/tag/v1.5.0 diff --git a/README.md b/README.md index 286e355e..32aeca6d 100644 --- a/README.md +++ b/README.md @@ -66,9 +66,9 @@ Git env config # If you need to use a custom SSH script config.git_ssh = '/path/to/ssh/script' end - ``` +_NOTE: Another way to specify where is the `git` binary is through the environment variable `GIT_PATH`_ Here are the operations that need read permission only. @@ -216,6 +216,8 @@ And here are the operations that will need to write to your git repository. g.merge(g.branch('master')) g.merge([branch1, branch2]) + g.merge_base('branch1', 'branch2') + r = g.add_remote(name, uri) # Git::Remote r = g.add_remote(name, Git::Base) # Git::Remote diff --git a/git.gemspec b/git.gemspec index a3c5d5d3..1bb0bcdb 100644 --- a/git.gemspec +++ b/git.gemspec @@ -15,6 +15,8 @@ Gem::Specification.new do |s| s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to?(:required_rubygems_version=) s.requirements = ['git 1.6.0.0, or greater'] + s.add_runtime_dependency 'rchardet', '~> 1.8' + s.add_development_dependency 'rake' s.add_development_dependency 'rdoc' s.add_development_dependency 'test-unit', '>=2', '< 4' diff --git a/lib/git/base/factory.rb b/lib/git/base/factory.rb index b97bfab5..e0cada61 100644 --- a/lib/git/base/factory.rb +++ b/lib/git/base/factory.rb @@ -68,6 +68,14 @@ def tag(tag_name) Git::Object.new(self, tag_name, 'tag', true) end + # Find as good common ancestors as possible for a merge + # example: g.merge_base('master', 'some_branch', 'some_sha', octopus: true) + # returns Array + def merge_base(*args) + shas = self.lib.merge_base(*args) + shas.map { |sha| gcommit(sha) } + end + end end diff --git a/lib/git/config.rb b/lib/git/config.rb index a4a90e51..4fefe454 100644 --- a/lib/git/config.rb +++ b/lib/git/config.rb @@ -10,7 +10,7 @@ def initialize end def binary_path - @binary_path || 'git' + @binary_path || ENV['GIT_PATH'] && File.join(ENV['GIT_PATH'], 'git') || 'git' end def git_ssh diff --git a/lib/git/diff.rb b/lib/git/diff.rb index ff819be0..fac0495b 100644 --- a/lib/git/diff.rb +++ b/lib/git/diff.rb @@ -127,12 +127,7 @@ def process_full_diff } final = {} current_file = nil - if @full_diff.encoding.name != "UTF-8" - full_diff_utf8_encoded = @full_diff.encode("UTF-8", "binary", { :invalid => :replace, :undef => :replace }) - else - full_diff_utf8_encoded = @full_diff - end - full_diff_utf8_encoded.split("\n").each do |line| + @full_diff.split("\n").each do |line| if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line) current_file = m[1] final[current_file] = defaults.merge({:patch => line, :path => current_file}) diff --git a/lib/git/lib.rb b/lib/git/lib.rb index fc390af5..5ce7dcfd 100644 --- a/lib/git/lib.rb +++ b/lib/git/lib.rb @@ -1,3 +1,4 @@ +require 'rchardet' require 'tempfile' module Git @@ -666,6 +667,21 @@ def merge(branch, message = nil) command('merge', arr_opts) end + def merge_base(*args) + opts = args.last.is_a?(Hash) ? args.pop : {} + + arg_opts = [] + + arg_opts << '--octopus' if opts[:octopus] + arg_opts << '--independent' if opts[:independent] + arg_opts << '--fork-point' if opts[:fork_point] + arg_opts << '--all' if opts[:all] + + arg_opts += args + + command('merge-base', arg_opts).lines.map(&:strip) + end + def unmerged unmerged = [] command_lines('diff', ["--cached"]).each do |line| @@ -747,6 +763,7 @@ def fetch(remote, opts) arr_opts << opts[:ref] if opts[:ref] arr_opts << '--tags' if opts[:t] || opts[:tags] arr_opts << '--prune' if opts[:p] || opts[:prune] + arr_opts << '--unshallow' if opts[:unshallow] command('fetch', arr_opts) end @@ -884,16 +901,7 @@ def meets_required_version? ENV_VARIABLE_NAMES = ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE', 'GIT_SSH'] def command_lines(cmd, opts = [], chdir = true, redirect = '') - cmd_op = command(cmd, opts, chdir) - if cmd_op.encoding.name != "UTF-8" - op = cmd_op.encode("UTF-8", "binary", { - :invalid => :replace, - :undef => :replace - }) - else - op = cmd_op - end - op.split("\n") + command(cmd, opts, chdir).lines.map(&:chomp) end # Takes the current git's system ENV variables and store them. @@ -1023,10 +1031,35 @@ def log_path_options(opts) arr_opts end + def default_encoding + __ENCODING__.name + end + + def best_guess_encoding + # Encoding::ASCII_8BIT.name + Encoding::UTF_8.name + end + + def detected_encoding(str) + CharDet.detect(str)['encoding'] || best_guess_encoding + end + + def encoding_options + { invalid: :replace, undef: :replace } + end + + def normalize_encoding(str) + return str if str.valid_encoding? && str.encoding == default_encoding + + return str.encode(default_encoding, str.encoding, encoding_options) if str.valid_encoding? + + str.encode(default_encoding, detected_encoding(str), encoding_options) + end + def run_command(git_cmd, &block) return IO.popen(git_cmd, &block) if block_given? - `#{git_cmd}`.chomp + `#{git_cmd}`.chomp.lines.map { |l| normalize_encoding(l) }.join end def escape(s) diff --git a/lib/git/version.rb b/lib/git/version.rb index 62fd6033..b76d9e69 100644 --- a/lib/git/version.rb +++ b/lib/git/version.rb @@ -1,5 +1,5 @@ module Git # The current gem version # @return [String] the current gem version. - VERSION='1.5.0' + VERSION='1.6.0.pre1' end diff --git a/tests/files/encoding/dot_git/COMMIT_EDITMSG b/tests/files/encoding/dot_git/COMMIT_EDITMSG new file mode 100644 index 00000000..41dcd8fa --- /dev/null +++ b/tests/files/encoding/dot_git/COMMIT_EDITMSG @@ -0,0 +1 @@ +A file with Japanese text diff --git a/tests/files/encoding/dot_git/HEAD b/tests/files/encoding/dot_git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/tests/files/encoding/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/tests/files/encoding/dot_git/config b/tests/files/encoding/dot_git/config new file mode 100644 index 00000000..6c9406b7 --- /dev/null +++ b/tests/files/encoding/dot_git/config @@ -0,0 +1,7 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true + ignorecase = true + precomposeunicode = true diff --git a/tests/files/encoding/dot_git/description b/tests/files/encoding/dot_git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/tests/files/encoding/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/tests/files/encoding/dot_git/hooks/applypatch-msg.sample b/tests/files/encoding/dot_git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..a5d7b84a --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/tests/files/encoding/dot_git/hooks/commit-msg.sample b/tests/files/encoding/dot_git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/tests/files/encoding/dot_git/hooks/fsmonitor-watchman.sample b/tests/files/encoding/dot_git/hooks/fsmonitor-watchman.sample new file mode 100755 index 00000000..e673bb39 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/fsmonitor-watchman.sample @@ -0,0 +1,114 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 1) and a time in nanoseconds +# formatted as a string and outputs to stdout all files that have been +# modified since the given time. Paths must be relative to the root of +# the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $time) = @ARGV; + +# Check the hook interface version + +if ($version == 1) { + # convert nanoseconds to seconds + $time = int $time / 1000000000; +} else { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree; +if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $git_work_tree = Win32::GetCwd(); + $git_work_tree =~ tr/\\/\//; +} else { + require Cwd; + $git_work_tree = Cwd::cwd(); +} + +my $retry = 1; + +launch_watchman(); + +sub launch_watchman { + + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $time but were not transient (ie created after + # $time but no longer exist). + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + # + # The category of transient files that we want to ignore will have a + # creation clock (cclock) newer than $time_t value and will also not + # currently exist. + + my $query = <<" END"; + ["query", "$git_work_tree", { + "since": $time, + "fields": ["name"], + "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]] + }] + END + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + my $json_pkg; + eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; + } or do { + require JSON::PP; + $json_pkg = "JSON::PP"; + }; + + my $o = $json_pkg->new->utf8->decode($response); + + if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) { + print STDERR "Adding '$git_work_tree' to watchman's watch list.\n"; + $retry--; + qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + print "/\0"; + eval { launch_watchman() }; + exit 0; + } + + die "Watchman: $o->{error}.\n" . + "Falling back to scanning...\n" if $o->{error}; + + binmode STDOUT, ":utf8"; + local $, = "\0"; + print @{$o->{files}}; +} diff --git a/tests/files/encoding/dot_git/hooks/post-update.sample b/tests/files/encoding/dot_git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/tests/files/encoding/dot_git/hooks/pre-applypatch.sample b/tests/files/encoding/dot_git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..4142082b --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/tests/files/encoding/dot_git/hooks/pre-commit.sample b/tests/files/encoding/dot_git/hooks/pre-commit.sample new file mode 100755 index 00000000..6a756416 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/tests/files/encoding/dot_git/hooks/pre-push.sample b/tests/files/encoding/dot_git/hooks/pre-push.sample new file mode 100755 index 00000000..6187dbf4 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo >&2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/tests/files/encoding/dot_git/hooks/pre-rebase.sample b/tests/files/encoding/dot_git/hooks/pre-rebase.sample new file mode 100755 index 00000000..6cbef5c3 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/tests/files/encoding/dot_git/hooks/pre-receive.sample b/tests/files/encoding/dot_git/hooks/pre-receive.sample new file mode 100755 index 00000000..a1fd29ec --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/tests/files/encoding/dot_git/hooks/prepare-commit-msg.sample b/tests/files/encoding/dot_git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..10fa14c5 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/tests/files/encoding/dot_git/hooks/update.sample b/tests/files/encoding/dot_git/hooks/update.sample new file mode 100755 index 00000000..80ba9413 --- /dev/null +++ b/tests/files/encoding/dot_git/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/tests/files/encoding/dot_git/index b/tests/files/encoding/dot_git/index new file mode 100644 index 00000000..ce795b75 Binary files /dev/null and b/tests/files/encoding/dot_git/index differ diff --git a/tests/files/encoding/dot_git/info/exclude b/tests/files/encoding/dot_git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/tests/files/encoding/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/tests/files/encoding/dot_git/logs/HEAD b/tests/files/encoding/dot_git/logs/HEAD new file mode 100644 index 00000000..de89afc5 --- /dev/null +++ b/tests/files/encoding/dot_git/logs/HEAD @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 20aefc8947d5bf08710afabe7712a1d6040ed5bd James Couball 1551056495 -0800 commit (initial): A file in Greek text +20aefc8947d5bf08710afabe7712a1d6040ed5bd 5482c9609dd461acafcc859279490acfdea01f00 James Couball 1551056601 -0800 commit: A file with Japanese text diff --git a/tests/files/encoding/dot_git/logs/refs/heads/master b/tests/files/encoding/dot_git/logs/refs/heads/master new file mode 100644 index 00000000..de89afc5 --- /dev/null +++ b/tests/files/encoding/dot_git/logs/refs/heads/master @@ -0,0 +1,2 @@ +0000000000000000000000000000000000000000 20aefc8947d5bf08710afabe7712a1d6040ed5bd James Couball 1551056495 -0800 commit (initial): A file in Greek text +20aefc8947d5bf08710afabe7712a1d6040ed5bd 5482c9609dd461acafcc859279490acfdea01f00 James Couball 1551056601 -0800 commit: A file with Japanese text diff --git a/tests/files/encoding/dot_git/objects/20/aefc8947d5bf08710afabe7712a1d6040ed5bd b/tests/files/encoding/dot_git/objects/20/aefc8947d5bf08710afabe7712a1d6040ed5bd new file mode 100644 index 00000000..532d982b --- /dev/null +++ b/tests/files/encoding/dot_git/objects/20/aefc8947d5bf08710afabe7712a1d6040ed5bd @@ -0,0 +1,2 @@ +xK +1]}%Ņ-:M EPKu DhL`L(VjE)hk7.z[OB-G@"#J+7[gHs0??w_ =$ \ No newline at end of file diff --git a/tests/files/encoding/dot_git/objects/54/82c9609dd461acafcc859279490acfdea01f00 b/tests/files/encoding/dot_git/objects/54/82c9609dd461acafcc859279490acfdea01f00 new file mode 100644 index 00000000..ec6146bb --- /dev/null +++ b/tests/files/encoding/dot_git/objects/54/82c9609dd461acafcc859279490acfdea01f00 @@ -0,0 +1 @@ +x]0 y)|6?Hj߸jQ۠r{"qF3i&e*tCA=U^}.PVz؋EsM"p|Q1xV=uLҒlQDz_yDg8]Gx,r:{ ch :ϩmƫWN \ No newline at end of file diff --git a/tests/files/encoding/dot_git/objects/87/d9aa884f84c67ac2185530f0b84d5eebda3eca b/tests/files/encoding/dot_git/objects/87/d9aa884f84c67ac2185530f0b84d5eebda3eca new file mode 100644 index 00000000..a0205a8e Binary files /dev/null and b/tests/files/encoding/dot_git/objects/87/d9aa884f84c67ac2185530f0b84d5eebda3eca differ diff --git a/tests/files/encoding/dot_git/objects/91/59312af5dd77ca1fac174a3b965a806451b5c6 b/tests/files/encoding/dot_git/objects/91/59312af5dd77ca1fac174a3b965a806451b5c6 new file mode 100644 index 00000000..beea5dfd Binary files /dev/null and b/tests/files/encoding/dot_git/objects/91/59312af5dd77ca1fac174a3b965a806451b5c6 differ diff --git a/tests/files/encoding/dot_git/objects/cf/921422e5382afe0c90a772a2cb37867839ae64 b/tests/files/encoding/dot_git/objects/cf/921422e5382afe0c90a772a2cb37867839ae64 new file mode 100644 index 00000000..d3fa4476 Binary files /dev/null and b/tests/files/encoding/dot_git/objects/cf/921422e5382afe0c90a772a2cb37867839ae64 differ diff --git a/tests/files/encoding/dot_git/objects/d4/fc598fff13f7bd681ceb38afafcae631ab3e50 b/tests/files/encoding/dot_git/objects/d4/fc598fff13f7bd681ceb38afafcae631ab3e50 new file mode 100644 index 00000000..636f22d4 Binary files /dev/null and b/tests/files/encoding/dot_git/objects/d4/fc598fff13f7bd681ceb38afafcae631ab3e50 differ diff --git a/tests/files/encoding/dot_git/refs/heads/master b/tests/files/encoding/dot_git/refs/heads/master new file mode 100644 index 00000000..9298ffd7 --- /dev/null +++ b/tests/files/encoding/dot_git/refs/heads/master @@ -0,0 +1 @@ +5482c9609dd461acafcc859279490acfdea01f00 diff --git a/tests/files/encoding/test1.txt b/tests/files/encoding/test1.txt new file mode 100644 index 00000000..95a9ae99 --- /dev/null +++ b/tests/files/encoding/test1.txt @@ -0,0 +1,4 @@ + + v + + q diff --git a/tests/files/encoding/test2.txt b/tests/files/encoding/test2.txt new file mode 100644 index 00000000..210763e3 --- /dev/null +++ b/tests/files/encoding/test2.txt @@ -0,0 +1,3 @@ +̰ ̴ +̰ ° Դϴ +̰ Դϴ diff --git a/tests/test_helper.rb b/tests/test_helper.rb index ef739d32..3f5a4665 100644 --- a/tests/test_helper.rb +++ b/tests/test_helper.rb @@ -79,5 +79,19 @@ def append_file(name, contents) f.puts contents end end - + + # Runs a block inside an environment with customized ENV variables. + # It restores the ENV after execution. + # + # @param [Proc] block block to be executed within the customized environment + # + def with_custom_env_variables(&block) + saved_env = {} + begin + Git::Lib::ENV_VARIABLE_NAMES.each { |k| saved_env[k] = ENV[k] } + return block.call + ensure + Git::Lib::ENV_VARIABLE_NAMES.each { |k| ENV[k] = saved_env[k] } + end + end end diff --git a/tests/units/test_config.rb b/tests/units/test_config.rb index f30278df..a1753831 100644 --- a/tests/units/test_config.rb +++ b/tests/units/test_config.rb @@ -29,27 +29,35 @@ def test_set_config end def test_env_config - assert_equal(Git::Base.config.git_ssh, nil) - - ENV['GIT_SSH'] = '/env/git/ssh' + with_custom_env_variables do + begin + assert_equal(Git::Base.config.binary_path, 'git') + assert_equal(Git::Base.config.git_ssh, nil) - assert_equal(Git::Base.config.git_ssh, '/env/git/ssh') + ENV['GIT_PATH'] = '/env/bin' + ENV['GIT_SSH'] = '/env/git/ssh' - Git.configure do |config| - config.binary_path = '/usr/bin/git' - config.git_ssh = '/path/to/ssh/script' - end - - assert_equal(Git::Base.config.git_ssh, '/path/to/ssh/script') + assert_equal(Git::Base.config.binary_path, '/env/bin/git') + assert_equal(Git::Base.config.git_ssh, '/env/git/ssh') + + Git.configure do |config| + config.binary_path = '/usr/bin/git' + config.git_ssh = '/path/to/ssh/script' + end - @git.log - ensure - ENV['GIT_SSH'] = nil + assert_equal(Git::Base.config.binary_path, '/usr/bin/git') + assert_equal(Git::Base.config.git_ssh, '/path/to/ssh/script') - Git.configure do |config| - config.binary_path = nil - config.git_ssh = nil + @git.log + ensure + ENV['GIT_SSH'] = nil + ENV['GIT_PATH'] = nil + + Git.configure do |config| + config.binary_path = nil + config.git_ssh = nil + end + end end end - end diff --git a/tests/units/test_diff_non_default_encoding.rb b/tests/units/test_diff_non_default_encoding.rb new file mode 100644 index 00000000..44fdb711 --- /dev/null +++ b/tests/units/test_diff_non_default_encoding.rb @@ -0,0 +1,61 @@ +#!/usr/bin/env ruby + +require File.dirname(__FILE__) + '/../test_helper' + +class TestDiffWithNonDefaultEncoding < Test::Unit::TestCase + def git_working_dir + cwd = `pwd`.chomp + if File.directory?(File.join(cwd, 'files')) + test_dir = File.join(cwd, 'files') + elsif File.directory?(File.join(cwd, '..', 'files')) + test_dir = File.join(cwd, '..', 'files') + elsif File.directory?(File.join(cwd, 'tests', 'files')) + test_dir = File.join(cwd, 'tests', 'files') + end + + create_temp_repo(File.expand_path(File.join(test_dir, 'encoding'))) + end + + def create_temp_repo(clone_path) + filename = 'git_test' + Time.now.to_i.to_s + rand(300).to_s.rjust(3, '0') + @tmp_path = File.join("/tmp/", filename) + FileUtils.mkdir_p(@tmp_path) + FileUtils.cp_r(clone_path, @tmp_path) + tmp_path = File.join(@tmp_path, File.basename(clone_path)) + Dir.chdir(tmp_path) do + FileUtils.mv('dot_git', '.git') + end + tmp_path + end + + def setup + @git = Git.open(git_working_dir) + end + + def test_diff_with_greek_encoding + d = @git.diff + patch = d.patch + assert(patch.include?("-Φθγητ οπορτερε ιν ιδεριντ\n")) + assert(patch.include?("+Φεθγιατ θρβανιτασ ρεπριμιqθε\n")) + end + + def test_diff_with_japanese_and_korean_encoding + d = @git.diff.path('test2.txt') + patch = d.patch + expected_patch = <<~PATCH.chomp + diff --git a/test2.txt b/test2.txt + index 87d9aa8..210763e 100644 + --- a/test2.txt + +++ b/test2.txt + @@ -1,3 +1,3 @@ + -違いを生み出すサンプルテキスト + -これは1行目です + -これが最後の行です + +이것은 파일이다 + +이것은 두 번째 줄입니다 + +이것이 마지막 줄입니다 + PATCH + assert(patch.include?(expected_patch)) + end +end + diff --git a/tests/units/test_lib.rb b/tests/units/test_lib.rb index ff5446f1..8796dc88 100644 --- a/tests/units/test_lib.rb +++ b/tests/units/test_lib.rb @@ -13,7 +13,16 @@ def setup set_file_paths @lib = Git.open(@wdir).lib end - + + def test_fetch_unshallow + in_temp_dir do |dir| + git = Git.clone("file://#{@wdir}", "shallow", path: dir, depth: 1).lib + assert_equal(1, git.log_commits.length) + git.fetch("file://#{@wdir}", unshallow: true) + assert_equal(71, git.log_commits.length) + end + end + def test_commit_data data = @lib.commit_data('1cc8667014381') assert_equal('scott Chacon 1194561188 -0800', data['author']) @@ -66,40 +75,44 @@ def test_log_commits a = @lib.full_log_commits :count => 20 assert_equal(20, a.size) end - + def test_environment_reset - ENV['GIT_DIR'] = '/my/git/dir' - ENV['GIT_WORK_TREE'] = '/my/work/tree' - ENV['GIT_INDEX_FILE'] = 'my_index' + with_custom_env_variables do + ENV['GIT_DIR'] = '/my/git/dir' + ENV['GIT_WORK_TREE'] = '/my/work/tree' + ENV['GIT_INDEX_FILE'] = 'my_index' - @lib.log_commits :count => 10 + @lib.log_commits :count => 10 - assert_equal(ENV['GIT_DIR'], '/my/git/dir') - assert_equal(ENV['GIT_WORK_TREE'], '/my/work/tree') - assert_equal(ENV['GIT_INDEX_FILE'],'my_index') + assert_equal(ENV['GIT_DIR'], '/my/git/dir') + assert_equal(ENV['GIT_WORK_TREE'], '/my/work/tree') + assert_equal(ENV['GIT_INDEX_FILE'],'my_index') + end end def test_git_ssh_from_environment_is_passed_to_binary - ENV['GIT_SSH'] = 'my/git-ssh-wrapper' - - Dir.mktmpdir do |dir| - output_path = File.join(dir, 'git_ssh_value') - binary_path = File.join(dir, 'git') - Git::Base.config.binary_path = binary_path - File.open(binary_path, 'w') { |f| - f << "echo $GIT_SSH > #{output_path}" - } - FileUtils.chmod(0700, binary_path) - @lib.checkout('something') - assert_equal("my/git-ssh-wrapper\n", File.read(output_path)) - end - ensure - Git.configure do |config| - config.binary_path = nil - config.git_ssh = nil - end + with_custom_env_variables do + begin + ENV['GIT_SSH'] = 'my/git-ssh-wrapper' - ENV['GIT_SSH'] = nil + Dir.mktmpdir do |dir| + output_path = File.join(dir, 'git_ssh_value') + binary_path = File.join(dir, 'git') + Git::Base.config.binary_path = binary_path + File.open(binary_path, 'w') { |f| + f << "echo $GIT_SSH > #{output_path}" + } + FileUtils.chmod(0700, binary_path) + @lib.checkout('something') + assert_equal("my/git-ssh-wrapper\n", File.read(output_path)) + end + ensure + Git.configure do |config| + config.binary_path = nil + config.git_ssh = nil + end + end + end end def test_revparse diff --git a/tests/units/test_merge_base.rb b/tests/units/test_merge_base.rb new file mode 100755 index 00000000..8d6b09d5 --- /dev/null +++ b/tests/units/test_merge_base.rb @@ -0,0 +1,144 @@ +#!/usr/bin/env ruby + +require File.dirname(__FILE__) + '/../test_helper' + +class TestMergeBase < Test::Unit::TestCase + def setup + set_file_paths + end + + def test_branch_and_master_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + true_ancestor_sha = repo.gcommit('master').sha + + add_commit(repo, 'new_branch') + add_commit(repo, 'master') + + ancestors = repo.merge_base('master', 'new_branch') + assert_equal(ancestors.size, 1) # there is only one true ancestor + assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor + end + end + end + + def test_branch_and_master_independent_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + true_ancestor_sha = repo.gcommit('master').sha + + add_commit(repo, 'new_branch') + add_commit(repo, 'master') + + independent_commits = repo.merge_base(true_ancestor_sha, 'master', 'new_branch', independent: true) + assert_equal(independent_commits.size, 2) # both new master and a branch are unreachable from each other + true_independent_commits_shas = [repo.gcommit('master').sha, repo.gcommit('new_branch').sha] + assert_equal(independent_commits.map(&:sha).sort, true_independent_commits_shas.sort) + end + end + end + + def test_branch_and_master_fork_point_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + add_commit(repo, 'master') + + true_ancestor_sha = repo.gcommit('master').sha + + add_commit(repo, 'new_branch') + + repo.reset_hard(repo.gcommit('HEAD^')) + + add_commit(repo, 'master') + + ancestors = repo.merge_base('master', 'new_branch', fork_point: true) + assert_equal(ancestors.size, 1) # there is only one true ancestor + assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor + end + end + end + + def test_branch_and_master_all_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + add_commit(repo, 'new_branch_1') + + first_commit_sha = repo.gcommit('new_branch_1').sha + + add_commit(repo, 'new_branch_2') + + second_commit_sha = repo.gcommit('new_branch_2').sha + + repo.branch('new_branch_1').merge('new_branch_2') + repo.branch('new_branch_2').merge('new_branch_1^') + + add_commit(repo, 'new_branch_1') + add_commit(repo, 'new_branch_2') + + true_ancestors_shas = [first_commit_sha, second_commit_sha] + + ancestors = repo.merge_base('new_branch_1', 'new_branch_2') + assert_equal(ancestors.size, 1) # default behavior returns only one ancestor + assert(true_ancestors_shas.include?(ancestors.first.sha)) + + all_ancestors = repo.merge_base('new_branch_1', 'new_branch_2', all: true) + assert_equal(all_ancestors.size, 2) # there are two best ancestors in such case + assert_equal(all_ancestors.map(&:sha).sort, true_ancestors_shas.sort) + end + end + end + + def test_branches_and_master_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + add_commit(repo, 'new_branch_1') + add_commit(repo, 'master') + + non_octopus_ancestor_sha = repo.gcommit('master').sha + + add_commit(repo, 'new_branch_2') + add_commit(repo, 'master') + + ancestors = repo.merge_base('master', 'new_branch_1', 'new_branch_2') + assert_equal(ancestors.size, 1) # there is only one true ancestor + assert_equal(ancestors.first.sha, non_octopus_ancestor_sha) # proper common ancestor + end + end + end + + def test_branches_and_master_octopus_merge_base + in_temp_dir do |_path| + repo = Git.clone(@wbare, 'branch_merge_test') + Dir.chdir('branch_merge_test') do + true_ancestor_sha = repo.gcommit('master').sha + + add_commit(repo, 'new_branch_1') + add_commit(repo, 'master') + add_commit(repo, 'new_branch_2') + add_commit(repo, 'master') + + ancestors = repo.merge_base('master', 'new_branch_1', 'new_branch_2', octopus: true) + assert_equal(ancestors.size, 1) # there is only one true ancestor + assert_equal(ancestors.first.sha, true_ancestor_sha) # proper common ancestor + end + end + end + + private + + def add_commit(repo, branch_name) + @commit_number ||= 0 + @commit_number += 1 + + repo.branch(branch_name).in_branch("test commit #{@commit_number}") do + new_file("new_file_#{@commit_number}", 'hello') + repo.add + true + end + end +end diff --git a/tests/units/test_thread_safty.rb b/tests/units/test_thread_safety.rb similarity index 100% rename from tests/units/test_thread_safty.rb rename to tests/units/test_thread_safety.rb