mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
contrib: typofixes
Signed-off-by: Masanari Iida <standby24x7@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
7e7cf80d74
commit
68840cb5af
|
@ -1205,7 +1205,7 @@ class GitView(object):
|
||||||
|
|
||||||
#The first parent always continue on the same line
|
#The first parent always continue on the same line
|
||||||
try:
|
try:
|
||||||
# check we alreay have the value
|
# check we already have the value
|
||||||
tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
|
tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
|
||||||
except KeyError:
|
except KeyError:
|
||||||
self.colours[commit.parent_sha1[0]] = colour
|
self.colours[commit.parent_sha1[0]] = colour
|
||||||
|
|
|
@ -1315,7 +1315,7 @@ sub get_mw_namespace_id {
|
||||||
# Store "notANameSpace" as special value for inexisting namespaces
|
# Store "notANameSpace" as special value for inexisting namespaces
|
||||||
my $store_id = ($id || 'notANameSpace');
|
my $store_id = ($id || 'notANameSpace');
|
||||||
|
|
||||||
# Store explicitely requested namespaces on disk
|
# Store explicitly requested namespaces on disk
|
||||||
if (!exists $cached_mw_namespace_id{$name}) {
|
if (!exists $cached_mw_namespace_id{$name}) {
|
||||||
run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
|
run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
|
||||||
$cached_mw_namespace_id{$name} = 1;
|
$cached_mw_namespace_id{$name} = 1;
|
||||||
|
|
|
@ -91,7 +91,7 @@ test_diff_directories () {
|
||||||
# Check that <dir> contains exactly <N> files
|
# Check that <dir> contains exactly <N> files
|
||||||
test_contains_N_files () {
|
test_contains_N_files () {
|
||||||
if test `ls -- "$1" | wc -l` -ne "$2"; then
|
if test `ls -- "$1" | wc -l` -ne "$2"; then
|
||||||
echo "directory $1 sould contain $2 files"
|
echo "directory $1 should contain $2 files"
|
||||||
echo "it contains these files:"
|
echo "it contains these files:"
|
||||||
ls "$1"
|
ls "$1"
|
||||||
false
|
false
|
||||||
|
|
|
@ -12,7 +12,7 @@ SERVER_ADDR=localhost
|
||||||
TMP=/tmp
|
TMP=/tmp
|
||||||
DB_FILE=wikidb.sqlite
|
DB_FILE=wikidb.sqlite
|
||||||
|
|
||||||
# If LIGHTTPD is not set to true, the script will use the defaut
|
# If LIGHTTPD is not set to true, the script will use the default
|
||||||
# web server running in WIKI_DIR_INST.
|
# web server running in WIKI_DIR_INST.
|
||||||
WIKI_DIR_INST=/var/www
|
WIKI_DIR_INST=/var/www
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue