Skip to content

Commit

Permalink
contrib: typofixes
Browse files Browse the repository at this point in the history
Signed-off-by: Masanari Iida <standby24x7@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Masanari Iida authored and Junio C Hamano committed Nov 12, 2013
1 parent 7e7cf80 commit 68840cb
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion contrib/gitview/gitview
Original file line number Diff line number Diff line change
Expand Up @@ -1205,7 +1205,7 @@ class GitView(object):

#The first parent always continue on the same line
try:
# check we alreay have the value
# check we already have the value
tmp_node_pos = self.nodepos[commit.parent_sha1[0]]
except KeyError:
self.colours[commit.parent_sha1[0]] = colour
Expand Down
2 changes: 1 addition & 1 deletion contrib/mw-to-git/git-remote-mediawiki.perl
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ sub get_mw_namespace_id {
# Store "notANameSpace" as special value for inexisting namespaces
my $store_id = ($id || 'notANameSpace');

# Store explicitely requested namespaces on disk
# Store explicitly requested namespaces on disk
if (!exists $cached_mw_namespace_id{$name}) {
run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
$cached_mw_namespace_id{$name} = 1;
Expand Down
2 changes: 1 addition & 1 deletion contrib/mw-to-git/t/test-gitmw-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ test_diff_directories () {
# Check that <dir> contains exactly <N> files
test_contains_N_files () {
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:"
ls "$1"
false
Expand Down
2 changes: 1 addition & 1 deletion contrib/mw-to-git/t/test.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SERVER_ADDR=localhost
TMP=/tmp
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.
WIKI_DIR_INST=/var/www

Expand Down

0 comments on commit 68840cb

Please sign in to comment.