Closed Bug 1542625 Opened 5 years ago Closed 5 years ago

`moz-phab patch` treats untracked files in a git repo as "uncommitted changes"

Categories

(Conduit :: moz-phab, defect, P3)

defect

Tracking

(Not tracked)

RESOLVED FIXED

People

(Reporter: kats, Assigned: glob)

References

Details

(Keywords: conduit-triaged)

Attachments

(1 file, 1 obsolete file)

This seems to be the git version of bug 1527646

kats@kgupta-mbp gecko-mac$ moz-phab patch --nobranch D26383
Uncommited changes present. Please stash them or commit before patching.
kats@kgupta-mbp gecko-mac$ git diff
kats@kgupta-mbp gecko-mac$ git status
On branch android_tests
Your branch is ahead of 'master' by 4 commits.
  (use "git push" to publish your local commits)

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	log

nothing added to commit but untracked files present (use "git add" to track)
Assignee: nobody → pzalewa
Priority: -- → P2
Priority: P2 → P3
Keywords: conduit-triaged
Assignee: pzalewa → glob

Exclude untracked files when determing current state, and use --index
to add new files while applying the patch.

Attachment #9056878 - Attachment is obsolete: true
Attachment #9064967 - Attachment description: Bug 1542625 - worktree is clean if untracked files are present when applying a patch; r=zalun! → Bug 1542625 - worktree should be clean if untracked files are present when applying a patch; r=zalun!
Status: NEW → RESOLVED
Closed: 5 years ago
Resolution: --- → FIXED
You need to log in before you can comment on or make changes to this bug.

Attachment

General

Created:
Updated:
Size: