Home GnuPG

Improve arc's handling of dirty submodules in Git
9c056c5cc887Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Improve arc's handling of dirty submodules in Git

Summary:
Fixes T9455. Depends on D14136. When you have a dirty submodule:

$ nano submodule/file.c # save changes

...we currently ask you to make a commit when you run arc diff, which is meaningless and misleading.

Instead, prompt the user separately.

This behavior isn't perfect but I think it's about the best we can do within reason.

Test Plan:

  • Ran arc diff in a working copy with uncommitted submodule changes only, got new prompt.
  • Ran arc diff in a working copy with submodule base commit changes only, got old (correct) prompt.
  • Ran arc diff in a working copy with both, got only old prompt (which is incomplete, but reasonable/meaningful).

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T9455

Differential Revision: https://secure.phabricator.com/D14137

Details

Provenance
epriestley <git@epriestley.com>Authored on Sep 21 2015, 9:40 PM
Parents
rARC083127c4cc5a: Fix an issue with "arc nrabch"
Branches
Unknown
Tags
Unknown

Event Timeline

epriestley <git@epriestley.com> committed rARC9c056c5cc887: Improve arc's handling of dirty submodules in Git (authored by epriestley <git@epriestley.com>).Sep 21 2015, 9:40 PM