pull: When --depth is specified, ensure we have all requested objects
We were previously optimizing by skipping object traversal if the refs were unchanged, but if the user specifies a deeper depth than they did before.
This commit is contained in:
parent
a310eb861b
commit
5bbdce2c06
|
|
@ -1602,7 +1602,11 @@ ostree_builtin_pull (int argc, char **argv, GFile *repo_path, GError **error)
|
||||||
if (!ostree_repo_resolve_rev (pull_data->repo, remote_ref, TRUE, &original_rev, error))
|
if (!ostree_repo_resolve_rev (pull_data->repo, remote_ref, TRUE, &original_rev, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (original_rev && strcmp (sha256, original_rev) == 0)
|
/* Only skip traversal if depth == 0; otherwise, we have to
|
||||||
|
* handle the case where the user specified a bigger depth than
|
||||||
|
* they originally did.
|
||||||
|
*/
|
||||||
|
if (original_rev && strcmp (sha256, original_rev) == 0 && opt_depth == 0)
|
||||||
{
|
{
|
||||||
g_print ("No changes in %s\n", remote_ref);
|
g_print ("No changes in %s\n", remote_ref);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue