Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #60 from dkowis/fixing-spaces

Fix for files with leading or trailing spaces
  • Loading branch information...
commit 1b2fe779964fda9aaa9f417e371923db4a396b22 2 parents 084d5cf + f805ff0
@rtomayko rtomayko authored
Showing with 533 additions and 2 deletions.
  1. +1 −1  lib/grit/git.rb
  2. +1 −1  lib/grit/tree.rb
  3. +1 −0  test/dot_git_spaces/HEAD
  4. +4 −0 test/dot_git_spaces/config
  5. +1 −0  test/dot_git_spaces/description
  6. +15 −0 test/dot_git_spaces/hooks/applypatch-msg.sample
  7. +24 −0 test/dot_git_spaces/hooks/commit-msg.sample
  8. +8 −0 test/dot_git_spaces/hooks/post-commit.sample
  9. +15 −0 test/dot_git_spaces/hooks/post-receive.sample
  10. +8 −0 test/dot_git_spaces/hooks/post-update.sample
  11. +14 −0 test/dot_git_spaces/hooks/pre-applypatch.sample
  12. +46 −0 test/dot_git_spaces/hooks/pre-commit.sample
  13. +169 −0 test/dot_git_spaces/hooks/pre-rebase.sample
  14. +36 −0 test/dot_git_spaces/hooks/prepare-commit-msg.sample
  15. +128 −0 test/dot_git_spaces/hooks/update.sample
  16. +6 −0 test/dot_git_spaces/info/exclude
  17. +1 −0  test/dot_git_spaces/objects/2e/db031f77340b65a897e8536ad75f7b7596a607
  18. BIN  test/dot_git_spaces/objects/36/a4f6bc8c5e4e67534b98c996f4e91ffff73ea5
  19. +1 −0  test/dot_git_spaces/objects/52/46707931d82a8c641c373b014ae100a866db15
  20. BIN  test/dot_git_spaces/objects/62/6ab676ba591027877fdef1fcdf17512755dfed
  21. BIN  test/dot_git_spaces/objects/67/77956c8cc2218a48e7a0409905e8cb725edf94
  22. BIN  test/dot_git_spaces/objects/72/74e17447ac939b5cd1df121741161660c546a3
  23. BIN  test/dot_git_spaces/objects/7f/09709727b53fdf3c6c6a6ae653515c4e1a3ef2
  24. BIN  test/dot_git_spaces/objects/7f/e714b67362b4f3b1ab7c8b6fcb4304b316167d
  25. BIN  test/dot_git_spaces/objects/8f/4094b31327dd0223979adc288e2b12ca86b0a1
  26. BIN  test/dot_git_spaces/objects/9d/b171ee179cb6083997b7db97214000c384f281
  27. BIN  test/dot_git_spaces/objects/fa/263b8bb9291aaa5059dad78bb38b63f4318c62
  28. BIN  test/dot_git_spaces/objects/fd/ae65b120511ff55e2aa4cee26a30f9ce5ee0fa
  29. BIN  test/dot_git_spaces/objects/fe/11aab0382df5779796cd8f1153620b2ca78890
  30. +1 −0  test/dot_git_spaces/refs/heads/branch_one
  31. +1 −0  test/dot_git_spaces/refs/heads/master
  32. +52 −0 test/test_rgit_spaces.rb
View
2  lib/grit/git.rb
@@ -283,7 +283,7 @@ def apply_patch(head_sha, patch)
# detail about the error.
def native(cmd, options = {}, *args, &block)
args = args.first if args.size == 1 && args[0].is_a?(Array)
- args.map! { |a| a.to_s.strip }
+ args.map! { |a| a.to_s }
args.reject! { |a| a.empty? }
# special option arguments
View
2  lib/grit/tree.rb
@@ -65,7 +65,7 @@ def create_initialize(repo, atts)
#
# Returns Grit::Blob or Grit::Tree
def content_from_string(repo, text)
- mode, type, id, name = text.split(" ", 4)
+ mode, type, id, name = text.split(/ |\t/, 4)
case type
when "tree"
Tree.create(repo, :id => id, :mode => mode, :name => name)
View
1  test/dot_git_spaces/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
View
4 test/dot_git_spaces/config
@@ -0,0 +1,4 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = true
View
1  test/dot_git_spaces/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
View
15 test/dot_git_spaces/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
+test -x "$GIT_DIR/hooks/commit-msg" &&
+ exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:
View
24 test/dot_git_spaces/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
+}
View
8 test/dot_git_spaces/hooks/post-commit.sample
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script that is called after a successful
+# commit is made.
+#
+# To enable this hook, rename this file to "post-commit".
+
+: Nothing
View
15 test/dot_git_spaces/hooks/post-receive.sample
@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script for the "post-receive" event.
+#
+# The "post-receive" script is run after receive-pack has accepted a pack
+# and the repository has been updated. It is passed arguments in through
+# stdin in the form
+# <oldrev> <newrev> <refname>
+# For example:
+# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
+#
+# see contrib/hooks/ for a sample, or uncomment the next line and
+# rename the file to "post-receive".
+
+#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
View
8 test/dot_git_spaces/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
View
14 test/dot_git_spaces/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
+test -x "$GIT_DIR/hooks/pre-commit" &&
+ exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:
View
46 test/dot_git_spaces/hooks/pre-commit.sample
@@ -0,0 +1,46 @@
+#!/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=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ascii filenames set this variable to true.
+allownonascii=$(git config hooks.allownonascii)
+
+# 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')"
+then
+ echo "Error: Attempt to add a non-ascii file name."
+ echo
+ echo "This can cause problems if you want to work"
+ echo "with people on other platforms."
+ echo
+ echo "To be portable it is advisable to rename the file ..."
+ echo
+ echo "If you know what you are doing you can disable this"
+ echo "check using:"
+ echo
+ echo " git config hooks.allownonascii true"
+ echo
+ exit 1
+fi
+
+exec git diff-index --check --cached $against --
View
169 test/dot_git_spaces/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"`
+ 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
+
+exit 0
+
+################################################################
+
+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".
View
36 test/dot_git_spaces/hooks/prepare-commit-msg.sample
@@ -0,0 +1,36 @@
+#!/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 comments out the
+# "Conflicts:" part of a merge commit.
+#
+# 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.
+
+case "$2,$3" in
+ merge,)
+ perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+# perl -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$1" ;;
+
+ *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
View
128 test/dot_git_spaces/hooks/update.sample
@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks 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 <ref> <oldrev> <newrev>)" >&2
+ exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+ echo "Usage: $0 <ref> <oldrev> <newrev>" >&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
View
6 test/dot_git_spaces/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]
+# *~
View
1  test/dot_git_spaces/objects/2e/db031f77340b65a897e8536ad75f7b7596a607
@@ -0,0 +1 @@
+x��An1 E��)|�";��A�*$���) �fRz}��������y�Z���/f�>��y� ^M�4�0"E1B�!�2��,v�+��6�G�ԠI�$�ā�5I������<Z����V�(/�]^pXD/�]�v:O�@=F"�;2���-��?���h�o�g{�+�v��=2P<
View
BIN  test/dot_git_spaces/objects/36/a4f6bc8c5e4e67534b98c996f4e91ffff73ea5
Binary file not shown
View
1  test/dot_git_spaces/objects/52/46707931d82a8c641c373b014ae100a866db15
@@ -0,0 +1 @@
+x+)JMU04�d040031QPH�SH-��QH��IU(�,�PHT�IML��KW(.HLNe(*yX�f�옋������-��Nkc�fݽSSjU@��ݛ����$�T`1��(13n��܍����l㰜���tE��-�D�>_
View
BIN  test/dot_git_spaces/objects/62/6ab676ba591027877fdef1fcdf17512755dfed
Binary file not shown
View
BIN  test/dot_git_spaces/objects/67/77956c8cc2218a48e7a0409905e8cb725edf94
Binary file not shown
View
BIN  test/dot_git_spaces/objects/72/74e17447ac939b5cd1df121741161660c546a3
Binary file not shown
View
BIN  test/dot_git_spaces/objects/7f/09709727b53fdf3c6c6a6ae653515c4e1a3ef2
Binary file not shown
View
BIN  test/dot_git_spaces/objects/7f/e714b67362b4f3b1ab7c8b6fcb4304b316167d
Binary file not shown
View
BIN  test/dot_git_spaces/objects/8f/4094b31327dd0223979adc288e2b12ca86b0a1
Binary file not shown
View
BIN  test/dot_git_spaces/objects/9d/b171ee179cb6083997b7db97214000c384f281
Binary file not shown
View
BIN  test/dot_git_spaces/objects/fa/263b8bb9291aaa5059dad78bb38b63f4318c62
Binary file not shown
View
BIN  test/dot_git_spaces/objects/fd/ae65b120511ff55e2aa4cee26a30f9ce5ee0fa
Binary file not shown
View
BIN  test/dot_git_spaces/objects/fe/11aab0382df5779796cd8f1153620b2ca78890
Binary file not shown
View
1  test/dot_git_spaces/refs/heads/branch_one
@@ -0,0 +1 @@
+8f4094b31327dd0223979adc288e2b12ca86b0a1
View
1  test/dot_git_spaces/refs/heads/master
@@ -0,0 +1 @@
+2edb031f77340b65a897e8536ad75f7b7596a607
View
52 test/test_rgit_spaces.rb
@@ -0,0 +1,52 @@
+require File.dirname(__FILE__) + '/helper'
+require 'tempfile'
+
+class TestGritSpaces < Test::Unit::TestCase
+
+ def setup
+ @repo = Repo.new(File.join(File.dirname(__FILE__), *%w[dot_git_spaces]), :is_bare => true)
+ end
+
+ def test_log_with_path_no_leading_space
+ log = @repo.log('master', 'a file')
+ assert_equal 1, log.size
+ assert_equal "7f09709727b53fdf3c6c6a6ae653515c4e1a3ef2", log.first.to_s
+ end
+
+ def test_log_with_path_leading_space
+ log = @repo.log('master', ' an evil file with a leading space')
+ assert_equal 1, log.size
+ assert_equal "2edb031f77340b65a897e8536ad75f7b7596a607", log.first.to_s
+ end
+
+ def test_log_with_path_trailing_space
+ log = @repo.log('master', 'an evil file with a trailing space ')
+ assert_equal 1, log.size
+ assert_equal "2edb031f77340b65a897e8536ad75f7b7596a607", log.first.to_s
+ end
+
+
+ def test_log_with_path_no_leading_space_in_a_branch
+ log = @repo.log('branch_one', 'simple_file')
+ assert_equal 1, log.size
+ assert_equal "8f4094b31327dd0223979adc288e2b12ca86b0a1", log.first.to_s
+ end
+
+ def test_log_with_path_leading_space_in_a_branch
+ log = @repo.log('branch_one', ' a leading space file in a branch')
+ assert_equal 1, log.size
+ assert_equal "36a4f6bc8c5e4e67534b98c996f4e91ffff73ea5", log.first.to_s
+ end
+
+ def test_tree_with_leading_space
+ tree = @repo.tree()
+ names = tree.blobs.collect { |b| b.name }
+ assert names.include?(" an evil file with a leading space"), "does not contain the leading space named file"
+ end
+
+ def test_tree_with_trailing_space
+ tree = @repo.tree()
+ names = tree.blobs.collect { |b| b.name }
+ assert names.include?("an evil file with a trailing space "), "does not contain the trailing space named file"
+ end
+end
Please sign in to comment.
Something went wrong with that request. Please try again.