> From: Paul Smith <p...@mad-scientist.net>
> Sorry, I was unclear. No, I didn't use --index as I wanted to see the
> applied content before it was committed.
> I ran "git diff -M -C master" to generate the patch of changes between
> my working directory and the master branch, then ran "git apply" (no
> arguments) in another workspace to apply it.
> When apply is done and I run "git status -s", the files that were
> specified as deleted in the diff are marked as " D" but the files that
> were specified as added in the diff are marked as "??" (untracked), not
> " A" as I'd expected. Running "git commit" then will commit the deletes
> but the added files continue to be untracked, not added (of course).
OK, I'm not familiar with "git status -s". I suggest that you do "git
status" instead and read the output carefully. According to my
understanding, "git status" should report that some files have been
changed, some deleted, and some added, but it should report that
*none* of these changes have been staged.
And if you do "git commit", it will object that nothing has changed.
I notice you write "Running "git commit" then will commit the
deletes...", but that way of writing it is ambiguous -- did you
actually run "git commit" and witness it committing the deletes?
In regard to "the files that were specified as added in the diff are
marked as "??" (untracked)", that is completely correct -- the files
haven't beed added to the index and are not present in the head
commit, so they aren't tracked. ("A file is tracked if it is in the
base commit of the repository or if it is in the index." -- from my
writeup of the basics of Git.)
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
For more options, visit https://groups.google.com/groups/opt_out.