mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sm/difftool'

Browse Source 
Use of some uninitialized variables in "git difftool" has been
corrected.

* sm/difftool:
  builtin/difftool: intialize some hashmap variables
This commit is contained in:
Junio C Hamano
2024-11-22 14:34:18 +09:00
parent aa1d4b42e5 98e4015593
commit 76bb16db5c
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
builtin/difftool.c
View File

@ -376,7 +376,8 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
struct checkout lstate, rstate; struct checkout lstate, rstate;
int err = 0; int err = 0;
struct child_process cmd = CHILD_PROCESS_INIT; struct child_process cmd = CHILD_PROCESS_INIT;
struct hashmap wt_modified, tmp_modified; struct hashmap wt_modified = HASHMAP_INIT(path_entry_cmp, NULL);
struct hashmap tmp_modified = HASHMAP_INIT(path_entry_cmp, NULL);
int indices_loaded = 0; int indices_loaded = 0;
workdir = repo_get_work_tree(the_repository); workdir = repo_get_work_tree(the_repository);
@ -601,9 +602,6 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
* in the common case of --symlinks and the difftool updating * in the common case of --symlinks and the difftool updating
* files through the symlink. * files through the symlink.
*/ */
hashmap_init(&wt_modified, path_entry_cmp, NULL, wtindex.cache_nr);
hashmap_init(&tmp_modified, path_entry_cmp, NULL, wtindex.cache_nr);
for (i = 0; i < wtindex.cache_nr; i++) { for (i = 0; i < wtindex.cache_nr; i++) {
struct hashmap_entry dummy; struct hashmap_entry dummy;
const char *name = wtindex.cache[i]->name; const char *name = wtindex.cache[i]->name;

4
t/t7800-difftool.sh
View File

@ -666,6 +666,10 @@ run_dir_diff_test 'difftool --dir-diff syncs worktree without unstaged change' '
test_cmp expect file test_cmp expect file
' '
run_dir_diff_test 'difftool --dir-diff with no diff' '
git difftool -d main main
'
write_script modify-file <<\EOF write_script modify-file <<\EOF
echo "new content" >file echo "new content" >file
EOF EOF