From 499b3c1a27a32cdabceb152691f286896960706d Mon Sep 17 00:00:00 2001 From: James Couball Date: Tue, 11 Feb 2020 21:20:34 -0800 Subject: [PATCH] Fix diffs of files that have quoted paths Signed-off-by: James Couball --- lib/git/diff.rb | 4 +- lib/git/lib.rb | 3 +- "tests/files/quoted_path/asdf\"asdf" | 0 .../files/quoted_path/dot_git/COMMIT_EDITMSG | 1 + tests/files/quoted_path/dot_git/HEAD | 1 + tests/files/quoted_path/dot_git/ORIG_HEAD | 1 + tests/files/quoted_path/dot_git/config | 7 + tests/files/quoted_path/dot_git/description | 1 + .../dot_git/hooks/applypatch-msg.sample | 15 ++ .../dot_git/hooks/commit-msg.sample | 24 +++ .../dot_git/hooks/fsmonitor-watchman.sample | 114 ++++++++++++ .../dot_git/hooks/post-update.sample | 8 + .../dot_git/hooks/pre-applypatch.sample | 14 ++ .../dot_git/hooks/pre-commit.sample | 49 +++++ .../quoted_path/dot_git/hooks/pre-push.sample | 53 ++++++ .../dot_git/hooks/pre-rebase.sample | 169 ++++++++++++++++++ .../dot_git/hooks/pre-receive.sample | 24 +++ .../dot_git/hooks/prepare-commit-msg.sample | 42 +++++ .../quoted_path/dot_git/hooks/update.sample | 128 +++++++++++++ tests/files/quoted_path/dot_git/index | Bin 0 -> 289 bytes tests/files/quoted_path/dot_git/info/exclude | 6 + tests/files/quoted_path/dot_git/logs/HEAD | 4 + .../dot_git/logs/refs/heads/master | 4 + .../13/2be5c8af1189f64e577a297275abc8ed31bc4c | Bin 0 -> 126 bytes .../91/cf3bc5af732378383d8568f20b1ec0e0c714ef | Bin 0 -> 54 bytes .../97/ebe3576bd16b6c29f26d3c8d545b3a1e827ce4 | Bin 0 -> 83 bytes .../b3/73b5d73e29f9a9636b008af65790ec1dc21a78 | Bin 0 -> 73 bytes .../ce/ae4bac3c99019b7e2980ecd52ff234be898a1f | Bin 0 -> 155 bytes .../e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 | Bin 0 -> 15 bytes .../fa/814aae045d23c455cc1a22efbe369a93894ca0 | 2 + .../quoted_path/dot_git/refs/heads/master | 1 + .../quoted_path/my_other_file_\342\230\240" | 0 tests/files/quoted_path/some_file | 0 tests/units/test_diff_with_quoted_path.rb | 36 ++++ tests/units/test_logger.rb | 28 ++- 35 files changed, 731 insertions(+), 8 deletions(-) create mode 100644 "tests/files/quoted_path/asdf\"asdf" create mode 100644 tests/files/quoted_path/dot_git/COMMIT_EDITMSG create mode 100644 tests/files/quoted_path/dot_git/HEAD create mode 100644 tests/files/quoted_path/dot_git/ORIG_HEAD create mode 100644 tests/files/quoted_path/dot_git/config create mode 100644 tests/files/quoted_path/dot_git/description create mode 100755 tests/files/quoted_path/dot_git/hooks/applypatch-msg.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/commit-msg.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/fsmonitor-watchman.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/post-update.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/pre-applypatch.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/pre-commit.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/pre-push.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/pre-rebase.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/pre-receive.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/prepare-commit-msg.sample create mode 100755 tests/files/quoted_path/dot_git/hooks/update.sample create mode 100644 tests/files/quoted_path/dot_git/index create mode 100644 tests/files/quoted_path/dot_git/info/exclude create mode 100644 tests/files/quoted_path/dot_git/logs/HEAD create mode 100644 tests/files/quoted_path/dot_git/logs/refs/heads/master create mode 100644 tests/files/quoted_path/dot_git/objects/13/2be5c8af1189f64e577a297275abc8ed31bc4c create mode 100644 tests/files/quoted_path/dot_git/objects/91/cf3bc5af732378383d8568f20b1ec0e0c714ef create mode 100644 tests/files/quoted_path/dot_git/objects/97/ebe3576bd16b6c29f26d3c8d545b3a1e827ce4 create mode 100644 tests/files/quoted_path/dot_git/objects/b3/73b5d73e29f9a9636b008af65790ec1dc21a78 create mode 100644 tests/files/quoted_path/dot_git/objects/ce/ae4bac3c99019b7e2980ecd52ff234be898a1f create mode 100644 tests/files/quoted_path/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 create mode 100644 tests/files/quoted_path/dot_git/objects/fa/814aae045d23c455cc1a22efbe369a93894ca0 create mode 100644 tests/files/quoted_path/dot_git/refs/heads/master create mode 100644 "tests/files/quoted_path/my_other_file_\342\230\240" create mode 100644 tests/files/quoted_path/some_file create mode 100644 tests/units/test_diff_with_quoted_path.rb diff --git a/lib/git/diff.rb b/lib/git/diff.rb index fac0495b..6454ae41 100644 --- a/lib/git/diff.rb +++ b/lib/git/diff.rb @@ -128,8 +128,8 @@ def process_full_diff final = {} current_file = nil @full_diff.split("\n").each do |line| - if m = /^diff --git a\/(.*?) b\/(.*?)/.match(line) - current_file = m[1] + if m = %r{\Adiff --git ("?)a/(.+?)\1 \1b/(.+?)\1\z}.match(line) + current_file = m[2] final[current_file] = defaults.merge({:patch => line, :path => current_file}) else if m = /^index (.......)\.\.(.......)( ......)*/.match(line) diff --git a/lib/git/lib.rb b/lib/git/lib.rb index 8aa7d27d..2b3eb1a3 100644 --- a/lib/git/lib.rb +++ b/lib/git/lib.rb @@ -945,7 +945,8 @@ def command(cmd, opts = [], chdir = true, redirect = '', &block) global_opts = [] global_opts << "--git-dir=#{@git_dir}" if !@git_dir.nil? global_opts << "--work-tree=#{@git_work_dir}" if !@git_work_dir.nil? - global_opts << ["-c", "color.ui=false"] + global_opts << %w[-c core.quotePath=false] + global_opts << %w[-c color.ui=false] opts = [opts].flatten.map {|s| escape(s) }.join(' ') diff --git "a/tests/files/quoted_path/asdf\"asdf" "b/tests/files/quoted_path/asdf\"asdf" new file mode 100644 index 00000000..e69de29b diff --git a/tests/files/quoted_path/dot_git/COMMIT_EDITMSG b/tests/files/quoted_path/dot_git/COMMIT_EDITMSG new file mode 100644 index 00000000..01f9a2aa --- /dev/null +++ b/tests/files/quoted_path/dot_git/COMMIT_EDITMSG @@ -0,0 +1 @@ +commit diff --git a/tests/files/quoted_path/dot_git/HEAD b/tests/files/quoted_path/dot_git/HEAD new file mode 100644 index 00000000..cb089cd8 --- /dev/null +++ b/tests/files/quoted_path/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/tests/files/quoted_path/dot_git/ORIG_HEAD b/tests/files/quoted_path/dot_git/ORIG_HEAD new file mode 100644 index 00000000..6d57c048 --- /dev/null +++ b/tests/files/quoted_path/dot_git/ORIG_HEAD @@ -0,0 +1 @@ +fa814aae045d23c455cc1a22efbe369a93894ca0 diff --git a/tests/files/quoted_path/dot_git/config b/tests/files/quoted_path/dot_git/config new file mode 100644 index 00000000..6c9406b7 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/description b/tests/files/quoted_path/dot_git/description new file mode 100644 index 00000000..498b267a --- /dev/null +++ b/tests/files/quoted_path/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/tests/files/quoted_path/dot_git/hooks/applypatch-msg.sample b/tests/files/quoted_path/dot_git/hooks/applypatch-msg.sample new file mode 100755 index 00000000..a5d7b84a --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/commit-msg.sample b/tests/files/quoted_path/dot_git/hooks/commit-msg.sample new file mode 100755 index 00000000..b58d1184 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/fsmonitor-watchman.sample b/tests/files/quoted_path/dot_git/hooks/fsmonitor-watchman.sample new file mode 100755 index 00000000..e673bb39 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/post-update.sample b/tests/files/quoted_path/dot_git/hooks/post-update.sample new file mode 100755 index 00000000..ec17ec19 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/pre-applypatch.sample b/tests/files/quoted_path/dot_git/hooks/pre-applypatch.sample new file mode 100755 index 00000000..4142082b --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/pre-commit.sample b/tests/files/quoted_path/dot_git/hooks/pre-commit.sample new file mode 100755 index 00000000..6a756416 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/pre-push.sample b/tests/files/quoted_path/dot_git/hooks/pre-push.sample new file mode 100755 index 00000000..6187dbf4 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/pre-rebase.sample b/tests/files/quoted_path/dot_git/hooks/pre-rebase.sample new file mode 100755 index 00000000..6cbef5c3 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/pre-receive.sample b/tests/files/quoted_path/dot_git/hooks/pre-receive.sample new file mode 100755 index 00000000..a1fd29ec --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/prepare-commit-msg.sample b/tests/files/quoted_path/dot_git/hooks/prepare-commit-msg.sample new file mode 100755 index 00000000..10fa14c5 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/hooks/update.sample b/tests/files/quoted_path/dot_git/hooks/update.sample new file mode 100755 index 00000000..80ba9413 --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/index b/tests/files/quoted_path/dot_git/index new file mode 100644 index 0000000000000000000000000000000000000000..4dea8455ad8b992aa650af073423b430a8a1937a GIT binary patch literal 289 zcmZ?q402{*U|<4b<~ZX9Ym1`VGccNwfq{du&UF$4L*o(#2F9;IH6lRF@NDj**_$q2 zbN24mTvr}-JiNz^tN+5zE&hVo<-wn7tO$UI$!jEb8u8fYFTW7-!VqRitg&d*H+o5c_k|GC*b7|f#2LQ+%X-fbA literal 0 HcmV?d00001 diff --git a/tests/files/quoted_path/dot_git/info/exclude b/tests/files/quoted_path/dot_git/info/exclude new file mode 100644 index 00000000..a5196d1b --- /dev/null +++ b/tests/files/quoted_path/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/quoted_path/dot_git/logs/HEAD b/tests/files/quoted_path/dot_git/logs/HEAD new file mode 100644 index 00000000..80a69b81 --- /dev/null +++ b/tests/files/quoted_path/dot_git/logs/HEAD @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 132be5c8af1189f64e577a297275abc8ed31bc4c James Couball 1580331320 -0800 commit (initial): init +132be5c8af1189f64e577a297275abc8ed31bc4c fa814aae045d23c455cc1a22efbe369a93894ca0 James Couball 1580331380 -0800 commit: Commit a file with non-ASCII unicode character in path +fa814aae045d23c455cc1a22efbe369a93894ca0 132be5c8af1189f64e577a297275abc8ed31bc4c James Couball 1580433408 -0800 reset: moving to HEAD~1 +132be5c8af1189f64e577a297275abc8ed31bc4c ceae4bac3c99019b7e2980ecd52ff234be898a1f James Couball 1580433489 -0800 commit: commit diff --git a/tests/files/quoted_path/dot_git/logs/refs/heads/master b/tests/files/quoted_path/dot_git/logs/refs/heads/master new file mode 100644 index 00000000..80a69b81 --- /dev/null +++ b/tests/files/quoted_path/dot_git/logs/refs/heads/master @@ -0,0 +1,4 @@ +0000000000000000000000000000000000000000 132be5c8af1189f64e577a297275abc8ed31bc4c James Couball 1580331320 -0800 commit (initial): init +132be5c8af1189f64e577a297275abc8ed31bc4c fa814aae045d23c455cc1a22efbe369a93894ca0 James Couball 1580331380 -0800 commit: Commit a file with non-ASCII unicode character in path +fa814aae045d23c455cc1a22efbe369a93894ca0 132be5c8af1189f64e577a297275abc8ed31bc4c James Couball 1580433408 -0800 reset: moving to HEAD~1 +132be5c8af1189f64e577a297275abc8ed31bc4c ceae4bac3c99019b7e2980ecd52ff234be898a1f James Couball 1580433489 -0800 commit: commit diff --git a/tests/files/quoted_path/dot_git/objects/13/2be5c8af1189f64e577a297275abc8ed31bc4c b/tests/files/quoted_path/dot_git/objects/13/2be5c8af1189f64e577a297275abc8ed31bc4c new file mode 100644 index 0000000000000000000000000000000000000000..4fdf342ec36888a1ba64a1df303aa82e629cad89 GIT binary patch literal 126 zcmV-^0D=E_0iBIO3c@fD06pgw`vGN>HD(17!JEHG)(x#RU8w27-&^np-iCo;#9A9W z_(Z$DsKVJxr6MucM1c|$)05+gYrx`FP*IXUYIS+-gDvpLP2X_0wd84n%S(QA`{cpw gAl9znBO{TgfUrkKber9tUH_}yIFH?Z0d?Is{sSmMAOHXW literal 0 HcmV?d00001 diff --git a/tests/files/quoted_path/dot_git/objects/91/cf3bc5af732378383d8568f20b1ec0e0c714ef b/tests/files/quoted_path/dot_git/objects/91/cf3bc5af732378383d8568f20b1ec0e0c714ef new file mode 100644 index 0000000000000000000000000000000000000000..4e59c62698ff92ab796392ef3298a88f026d0323 GIT binary patch literal 54 zcmb7v}71gS9CS!HJKNAV-Lv z3MZ*(3p-Y{_OUJcO0&H5rLBdgNgwb0rSqG{)(+g}leRt?hv-t)dy|Y&o82C}{8#^S J^#OgHM+=y$O-%p* literal 0 HcmV?d00001 diff --git a/tests/files/quoted_path/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/tests/files/quoted_path/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 new file mode 100644 index 0000000000000000000000000000000000000000..711223894375fe1186ac5bfffdc48fb1fa1e65cc GIT binary patch literal 15 Wcmb' c- >~(m}tA[6h8頵:ccj|^$"(=CmtWk6 pTSW& \ No newline at end of file diff --git a/tests/files/quoted_path/dot_git/refs/heads/master b/tests/files/quoted_path/dot_git/refs/heads/master new file mode 100644 index 00000000..118bec11 --- /dev/null +++ b/tests/files/quoted_path/dot_git/refs/heads/master @@ -0,0 +1 @@ +ceae4bac3c99019b7e2980ecd52ff234be898a1f diff --git "a/tests/files/quoted_path/my_other_file_\342\230\240" "b/tests/files/quoted_path/my_other_file_\342\230\240" new file mode 100644 index 00000000..e69de29b diff --git a/tests/files/quoted_path/some_file b/tests/files/quoted_path/some_file new file mode 100644 index 00000000..e69de29b diff --git a/tests/units/test_diff_with_quoted_path.rb b/tests/units/test_diff_with_quoted_path.rb new file mode 100644 index 00000000..b82b373e --- /dev/null +++ b/tests/units/test_diff_with_quoted_path.rb @@ -0,0 +1,36 @@ +#!/usr/bin/env ruby + +require File.dirname(__FILE__) + '/../test_helper' + +class TestDiffWithQuotedPath < Test::Unit::TestCase + def git_working_dir + test_dir = File.join(`git rev-parse --show-toplevel`.chomp, 'tests', 'files') + create_temp_repo(File.expand_path(File.join(test_dir, 'quoted_path'))) + 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_quoted_path + diff = @git.diff('@^') + diff_paths = [] + assert_nothing_raised do + diff.each { |diff_file| diff_paths << diff_file.path } + end + assert_include(diff_paths, 'asdf\"asdf') + assert_include(diff_paths, 'my_other_file_☠') + end +end diff --git a/tests/units/test_logger.rb b/tests/units/test_logger.rb index b57ed102..7c4eb04e 100644 --- a/tests/units/test_logger.rb +++ b/tests/units/test_logger.rb @@ -7,7 +7,15 @@ class TestLogger < Test::Unit::TestCase def setup set_file_paths end - + + def missing_log_entry + 'Did not find expected log entry.' + end + + def unexpected_log_entry + 'Unexpected log entry found' + end + def test_logger log = Tempfile.new('logfile') log.close @@ -19,9 +27,16 @@ def test_logger @git.branches.size logc = File.read(log.path) - assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' '-c' 'color.ui=false' branch '-a'/.match(logc)) assert(/DEBUG -- : diff_over_patches/.match(logc)) + expected_log_entry = /INFO -- : git (?.*?) branch '-a'/ + assert_match(expected_log_entry, logc, missing_log_entry) + + expected_log_entry = /DEBUG -- : diff_over_patches/ + assert_match(expected_log_entry, logc, missing_log_entry) + end + + def test_logging_at_info_level_should_not_show_debug_messages log = Tempfile.new('logfile') log.close logger = Logger.new(log.path) @@ -31,8 +46,11 @@ def test_logger @git.branches.size logc = File.read(log.path) - assert(/INFO -- : git '--git-dir=[^']+' '--work-tree=[^']+' '-c' 'color.ui=false' branch '-a'/.match(logc)) - assert(!/DEBUG -- : diff_over_patches/.match(logc)) + + expected_log_entry = /INFO -- : git (?.*?) branch '-a'/ + assert_match(expected_log_entry, logc, missing_log_entry) + + expected_log_entry = /DEBUG -- : diff_over_patches/ + assert_not_match(expected_log_entry, logc, unexpected_log_entry) end - end