зеркало из https://github.com/microsoft/git.git
*: fix typos which duplicate a word
Fix typos in code comments which repeat various words. Most of the cases are simple in that they repeat a word that usually cannot be repeated in a grammatically correct sentence. Just remove the incorrectly duplicated word in these cases and rewrap text, if needed. A tricky case is usage of "that that", which is sometimes grammatically correct. However, an instance of this in "t7527-builtin-fsmonitor.sh" doesn't need two words "that", because there is only one daemon being discussed, so replace the second "that" with "the". Reword code comment "entries exist on on-disk index" in function update_one in file cache-tree.c, by replacing incorrect preposition "on" with "in". Signed-off-by: Andrei Rybak <rybak.a.v@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
4dbebc36b0
Коммит
b39a84185e
|
@ -665,7 +665,7 @@ headers and their prerequisite relationships, or something else.
|
|||
+
|
||||
Server operators should feel confident in turning on "bundle-uri" and
|
||||
not worry if e.g. their CDN goes down that clones or fetches will run
|
||||
into hard failures. Even if the server bundle bundle(s) are
|
||||
into hard failures. Even if the server bundle(s) are
|
||||
incomplete, or bad in some way the client should still end up with a
|
||||
functioning repository, just as if it had chosen not to use this
|
||||
protocol extension.
|
||||
|
|
|
@ -1270,7 +1270,7 @@ static int parse_branchname_arg(int argc, const char **argv,
|
|||
* between A and B, A...B names that merge base.
|
||||
*
|
||||
* (b) If <something> is _not_ a commit, either "--" is present
|
||||
* or <something> is not a path, no -t or -b was given, and
|
||||
* or <something> is not a path, no -t or -b was given,
|
||||
* and there is a tracking branch whose name is <something>
|
||||
* in one and only one remote (or if the branch exists on the
|
||||
* remote named in checkout.defaultRemote), then this is a
|
||||
|
|
|
@ -3219,9 +3219,8 @@ static void die_on_index_match(const char *path, int force)
|
|||
ensure_full_index(&the_index);
|
||||
|
||||
/*
|
||||
* Since there is only one pathspec, we just need
|
||||
* need to check ps_matched[0] to know if a cache
|
||||
* entry matched.
|
||||
* Since there is only one pathspec, we just need to
|
||||
* check ps_matched[0] to know if a cache entry matched.
|
||||
*/
|
||||
for (i = 0; i < the_index.cache_nr; i++) {
|
||||
ce_path_match(&the_index, the_index.cache[i], &ps,
|
||||
|
|
|
@ -405,7 +405,7 @@ static int update_one(struct cache_tree *it,
|
|||
}
|
||||
|
||||
/*
|
||||
* CE_INTENT_TO_ADD entries exist on on-disk index but
|
||||
* CE_INTENT_TO_ADD entries exist in on-disk index but
|
||||
* they are not part of generated trees. Invalidate up
|
||||
* to root to force cache-tree users to read elsewhere.
|
||||
*/
|
||||
|
|
2
config.c
2
config.c
|
@ -3154,7 +3154,7 @@ int git_config_set_gently(const char *key, const char *value)
|
|||
int repo_config_set_worktree_gently(struct repository *r,
|
||||
const char *key, const char *value)
|
||||
{
|
||||
/* Only use worktree-specific config if it is is already enabled. */
|
||||
/* Only use worktree-specific config if it is already enabled. */
|
||||
if (repository_format_worktree_config) {
|
||||
char *file = repo_git_path(r, "config.worktree");
|
||||
int ret = git_config_set_multivar_in_file_gently(
|
||||
|
|
|
@ -1853,7 +1853,7 @@ enum start_bg_result start_bg_command(struct child_process *cmd,
|
|||
*
|
||||
* We also assume that `start_command()` does not add
|
||||
* us to the cleanup list. And that it calls
|
||||
* calls `child_process_clear()`.
|
||||
* `child_process_clear()`.
|
||||
*/
|
||||
sbgr = SBGR_ERROR;
|
||||
goto done;
|
||||
|
|
|
@ -141,7 +141,7 @@ test_expect_success 'test conflict notices and such' '
|
|||
# Commit O: foo, olddir/{a,b,c}
|
||||
# Commit A: modify foo, newdir/{a,b,c}
|
||||
# Commit B: modify foo differently & rename foo -> olddir/bar
|
||||
# Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)
|
||||
# Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)
|
||||
|
||||
test_expect_success 'directory rename + content conflict' '
|
||||
# Setup
|
||||
|
@ -653,7 +653,7 @@ test_expect_success 'mod6: chains of rename/rename(1to2) and add/add via collidi
|
|||
# Commit O: foo, olddir/{a,b,c}
|
||||
# Commit A: delete foo, rename olddir/ -> newdir/, add newdir/bar/file
|
||||
# Commit B: modify foo & rename foo -> olddir/bar
|
||||
# Expected: CONFLICT(content) for for newdir/bar (not olddir/bar or foo)
|
||||
# Expected: CONFLICT(content) for newdir/bar (not olddir/bar or foo)
|
||||
|
||||
test_expect_success 'directory rename + rename/delete + modify/delete + directory/file conflict' '
|
||||
# Setup
|
||||
|
|
|
@ -155,7 +155,7 @@ test_setup_repo () {
|
|||
# Commit A:
|
||||
# (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
|
||||
# -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
|
||||
# both both Makefiles and jumps)
|
||||
# both Makefiles and jumps)
|
||||
# general/{jump1_A, jump2_A}
|
||||
# basename/subdir/{numbers_A, sequence_A, values_A}
|
||||
# folder/subdir/{a,b,c,d,Makefile_TOP_A}
|
||||
|
@ -343,7 +343,7 @@ test_expect_merge_algorithm failure success 'Objects downloaded when a directory
|
|||
# Commit A:
|
||||
# (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
|
||||
# -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
|
||||
# both both Makefiles and jumps)
|
||||
# both Makefiles and jumps)
|
||||
# general/{jump1_A, jump2_A}
|
||||
# basename/subdir/{numbers_A, sequence_A, values_A}
|
||||
# folder/subdir/{a,b,c,d,Makefile_TOP_A}
|
||||
|
|
|
@ -904,7 +904,7 @@ test_expect_success "submodule absorbgitdirs implicitly starts daemon" '
|
|||
|
||||
# On a case-insensitive file system, confirm that the daemon
|
||||
# notices when the .git directory is moved/renamed/deleted
|
||||
# regardless of how it is spelled in the the FS event.
|
||||
# regardless of how it is spelled in the FS event.
|
||||
# That is, does the FS event receive the spelling of the
|
||||
# operation or does it receive the spelling preserved with
|
||||
# the file/directory.
|
||||
|
@ -922,8 +922,8 @@ test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' '
|
|||
test_path_is_dir test_insensitive/.git &&
|
||||
test_path_is_dir test_insensitive/.GIT &&
|
||||
|
||||
# Rename .git using an alternate spelling to verify that that
|
||||
# daemon detects it and automatically shuts down.
|
||||
# Rename .git using an alternate spelling to verify that
|
||||
# the daemon detects it and automatically shuts down.
|
||||
mv test_insensitive/.GIT test_insensitive/.FOO &&
|
||||
|
||||
# See [1] above.
|
||||
|
|
Загрузка…
Ссылка в новой задаче