diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-05-26 00:07:51 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-26 01:32:02 +0400 |
| commit | 2c9078d05bf2200c9671e0b292638d42e7e4fd71 (patch) | |
| tree | c873748e61b11a5fe79c97af317f0ae39f3d9559 | |
| parent | 5df3e2b3ca5ebe8123927a81d682993ad597a584 (diff) | |
unpack-trees: add the dry_run flag to unpack_trees_options
Until now there was no way to test if unpack_trees() with update=1 would
succeed without really updating the work tree. The reason for that is that
setting update to 0 does skip the tests for new files and deactivates the
sparse handling, thereby making that unsuitable as a dry run.
Add the new dry_run flag to struct unpack_trees_options unpack_trees().
Setting that together with the update flag will check if the work tree
update would be successful without doing it for real.
The only class of problems that is not detected at the moment are file
system conditions like ENOSPC or missing permissions. Also the index
entries of updated files are not as they would be after a real checkout
because lstat() isn't run as the files aren't updated for real.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | unpack-trees.c | 4 | ||||
| -rw-r--r-- | unpack-trees.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 0bc4b2ddca..07f8364244 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -203,7 +203,7 @@ static int check_updates(struct unpack_trees_options *o) if (ce->ce_flags & CE_WT_REMOVE) { display_progress(progress, ++cnt); - if (o->update) + if (o->update && !o->dry_run) unlink_entry(ce); continue; } @@ -217,7 +217,7 @@ static int check_updates(struct unpack_trees_options *o) if (ce->ce_flags & CE_UPDATE) { display_progress(progress, ++cnt); ce->ce_flags &= ~CE_UPDATE; - if (o->update) { + if (o->update && !o->dry_run) { errs |= checkout_entry(ce, &state, NULL); } } diff --git a/unpack-trees.h b/unpack-trees.h index cd11a08365..64f02cb03a 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -46,7 +46,8 @@ struct unpack_trees_options { debug_unpack, skip_sparse_checkout, gently, - show_all_errors; + show_all_errors, + dry_run; const char *prefix; int cache_bottom; struct dir_struct *dir; |