undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: add the dry_run flag to unpack_trees_options

Browse Source 
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>
This commit is contained in:
Jens Lehmann 2011-05-25 22:07:51 +02:00 committed by Junio C Hamano
parent 5df3e2b3ca
commit 2c9078d05b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
unpack-trees.c
View File

@ -203,7 +203,7 @@ static int check_updates(struct unpack_trees_options *o)
if (ce->ce_flags & CE_WT_REMOVE) { if (ce->ce_flags & CE_WT_REMOVE) {
display_progress(progress, ++cnt); display_progress(progress, ++cnt);
if (o->update) if (o->update && !o->dry_run)
unlink_entry(ce); unlink_entry(ce);
continue; continue;
} }
@ -217,7 +217,7 @@ static int check_updates(struct unpack_trees_options *o)
if (ce->ce_flags & CE_UPDATE) { if (ce->ce_flags & CE_UPDATE) {
display_progress(progress, ++cnt); display_progress(progress, ++cnt);
ce->ce_flags &= ~CE_UPDATE; ce->ce_flags &= ~CE_UPDATE;
if (o->update) { if (o->update && !o->dry_run) {
errs |= checkout_entry(ce, &state, NULL); errs |= checkout_entry(ce, &state, NULL);
} }
} }

3
unpack-trees.h
View File

@ -46,7 +46,8 @@ struct unpack_trees_options {
debug_unpack, debug_unpack,
skip_sparse_checkout, skip_sparse_checkout,
gently, gently,
show_all_errors; show_all_errors,
dry_run;
const char *prefix; const char *prefix;
int cache_bottom; int cache_bottom;
struct dir_struct *dir; struct dir_struct *dir;