undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t1402: work around shell quoting issue on NetBSD
  remote-hg: Fix biridectionality -> bidirectionality typos
This commit is contained in:
Junio C Hamano 2013-01-08 13:23:46 -08:00
commit 414c78ccff
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/remote-helpers/git-remote-hg
View File

@ -31,7 +31,7 @@ import urllib
# hg: # hg:
# Emulate hg-git. # Emulate hg-git.
# Only hg bookmarks are exported as git branches. # Only hg bookmarks are exported as git branches.
# Commits are modified to preserve hg information and allow biridectionality. # Commits are modified to preserve hg information and allow bidirectionality.
# #
NAME_RE = re.compile('^([^<>]+)') NAME_RE = re.compile('^([^<>]+)')

2
contrib/remote-helpers/test-hg-bidi.sh
View File

@ -6,7 +6,7 @@
# https://bitbucket.org/durin42/hg-git/src # https://bitbucket.org/durin42/hg-git/src
# #
test_description='Test biridectionality of remote-hg' test_description='Test bidirectionality of remote-hg'
. ./test-lib.sh . ./test-lib.sh

6
t/t1402-check-ref-format.sh
View File

@ -11,7 +11,8 @@ valid_ref() {
prereq=$1 prereq=$1
shift shift
esac esac
test_expect_success $prereq "ref name '$1' is valid${2:+ with options $2}" " desc="ref name '$1' is valid${2:+ with options $2}"
test_expect_success $prereq "$desc" "
git check-ref-format $2 '$1' git check-ref-format $2 '$1'
" "
} }
@ -22,7 +23,8 @@ invalid_ref() {
prereq=$1 prereq=$1
shift shift
esac esac
test_expect_success $prereq "ref name '$1' is invalid${2:+ with options $2}" " desc="ref name '$1' is invalid${2:+ with options $2}"
test_expect_success $prereq "$desc" "
test_must_fail git check-ref-format $2 '$1' test_must_fail git check-ref-format $2 '$1'
" "
} }