diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-09-23 21:26:17 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-23 21:26:17 +0300 |
| commit | 77bd616367905437fe6181611e0c65fe23160ea1 (patch) | |
| tree | b9d43ef6f513b3c1aaaf0028678717241f1aaba2 /builtin/difftool.c | |
| parent | 93a8ed28ea29fe1b5691e3e3d93a1870df717ac0 (diff) | |
| parent | 5bafb3576ac8eb8464ddd5cc14a1211aaa46364b (diff) | |
Merge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool
* da/difftool-dir-diff-symlink-fix:
difftool: fix symlink-file writing in dir-diff mode
Diffstat (limited to 'builtin/difftool.c')
| -rw-r--r-- | builtin/difftool.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/builtin/difftool.c b/builtin/difftool.c index bb9fe7245a..21e055d13a 100644 --- a/builtin/difftool.c +++ b/builtin/difftool.c @@ -557,11 +557,13 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix, if (*entry->left) { add_path(&ldir, ldir_len, entry->path); ensure_leading_directories(ldir.buf); + unlink(ldir.buf); write_file(ldir.buf, "%s", entry->left); } if (*entry->right) { add_path(&rdir, rdir_len, entry->path); ensure_leading_directories(rdir.buf); + unlink(rdir.buf); write_file(rdir.buf, "%s", entry->right); } } |