Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GVFS serialize status updates #6

Merged
merged 3 commits into from
Jul 26, 2018
Merged

GVFS serialize status updates #6

merged 3 commits into from
Jul 26, 2018

Commits on Jul 25, 2018

  1. status: fix rename reporting when using serialization cache 

    Fix "git status --deserialize" to correctly report both pathnames
for renames.  Add a test case to verify.

A change was made upstream that added an additional "rename_status"
field to the "struct wt_status_change_data" structure.  It is used
during the various print routines to decide if 2 pathnames need to
be printed.

    5134ccd
    wt-status.c: rename rename-related fields in wt_status_change_data

The fix here is to add that field to the status cache data.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
    @jeffhostetler
    jeffhostetler committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    b9ecfe5 View commit details
    Browse the repository at this point in the history

  2. status: add comments for ahead_behind_flags in serialization 

    The "ahead_behind_flags" field of "struct wt_status" does not
need to be stored in the serialization cache file, since it is
a display property.  Update the code comments in both serialize
and deserialize to reflect that.

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
    @jeffhostetler
    jeffhostetler committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    4bbb17a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'gvfs-2.18.0' into gvfs-serialize-status-rename

    @jamill
    jamill authored Jul 25, 2018
    Configuration menu
    Copy the full SHA
    f51faf3 View commit details
    Browse the repository at this point in the history