diff options
| author | Shaoxuan Yuan <shaoxuan.yuan02@gmail.com> | 2022-08-09 12:09:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-10 20:57:50 (GMT) |
| commit | 5efd533ed8896592740afe22ac07271497d6db36 (patch) | |
| tree | ee4222f898a2ea1670d1c92e3cceffab646f043e /builtin/mv.c | |
| parent | b6f51e3db978ae2a72c290a10bd205f9e1d6818e (diff) | |
| download | git-5efd533ed8896592740afe22ac07271497d6db36.zip git-5efd533ed8896592740afe22ac07271497d6db36.tar.gz git-5efd533ed8896592740afe22ac07271497d6db36.tar.bz2 | |
advice.h: add advise_on_moving_dirty_path()
Add an advice.
When the user use `git mv --sparse <dirty-path> <destination>`, Git
will warn the user to use `git add --sparse <paths>` then use
`git sparse-checkout reapply` to apply the sparsity rules.
Add a few lines to previous "move dirty path" tests so we can test
this new advice is working.
Suggested-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Shaoxuan Yuan <shaoxuan.yuan02@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/mv.c')
| -rw-r--r-- | builtin/mv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/builtin/mv.c b/builtin/mv.c index f4961c0..d80adf8 100644 --- a/builtin/mv.c +++ b/builtin/mv.c @@ -532,6 +532,9 @@ remove_entry: strbuf_release(&a_src_dir); free(src_dir); + if (dirty_paths.nr) + advise_on_moving_dirty_path(&dirty_paths); + if (gitmodules_modified) stage_updated_gitmodules(&the_index); |