Skip to content

add --resolved should report the option conflict with -u and -A #494

Description

@genedna

Title: add --resolved should report the option conflict with -u and -A

Summary

TC-0032 maps to pinned Git t/t2207-add-resolved.sh#7, git add --resolved incompatibility with -u and -A. Git accepts the --resolved option and rejects its combination with -u and -A, reporting that the options cannot be used together.

With Git control 2.55.0.782.g1630431f32 and Libra 0.22.19:

Git:   TC-0032 PASS
Libra: TC-0032 FAIL

Libra rejects the option during argument parsing instead of reaching the incompatibility check:

error: unexpected argument '--resolved' found
Error-Code: LBR-CLI-002
exit=129

The test fails because the error does not contain cannot be used together. Both commands are expected to fail, but they expose different option contracts: Git recognizes --resolved and diagnoses the invalid combination, while Libra does not recognize --resolved at all.

Impact

Callers cannot use the Git-compatible add --resolved interface or reliably distinguish an invalid option combination from an unsupported option. This TC does not exercise conflict-resolution behavior; the target is specifically option compatibility and diagnostic semantics.

Acceptance criteria

  1. Decide and document whether Libra will support the add --resolved option.
  2. If supported, accept add --resolved and reject combinations with -u and -A using a clear conflict diagnostic.
  3. If the option is intentionally unsupported, expose that as an explicit compatibility classification and update the compatibility documentation/test policy rather than silently treating this as the Git option-conflict case.
  4. Re-run t/t2207-add-resolved.sh#7 after the decision and keep the two invalid combinations' exit status and diagnostics consistent with the documented contract.

This is a new issue candidate. No existing open Issue was found for add --resolved; the related #479 plumbing issue is not applicable.

Activity

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

bugSomething isn't workingtestvcs

Type

Projects

No projects

    Milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions