To use git effectively (and as intended) I make small atomic commits, while I do have longer sessions where I do change not only one thing. Thus, I make heavy use of
git add -p. This doesn't work for completely new files, though, because I tend to forget them later on.
What I want to do is, tell
git that there is a new file, I want it to track, but not stage it:
git status produces:
# On branch my-current-branch # Your branch is ahead of 'origin/my-current-branch' by 2 commits. # # Changes to be committed: # <<STAGED SECTION>> // A # # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) # (use "git checkout -- <file>..." to discard changes in working directory) # <<UNSTAGED-YET-KNOWN SECTION>> // B # # Untracked files: # (use "git add <file>..." to include in what will be committed) # <<UNKNOWN SECTION>> // C
If I have a file
foo in the C section, and I say
git add foo it will go to the A section. If I say
git add -N foo it will go to both A and B. However, that would mean it would be included in the next commit, at least as the fact that there is a new file.
I want it to go in section B exclusively, such that I can later add it to A with
git add -p or
git add foo (or whatever).
add -N solution, this doesn't work because if I try to commit after having said
add -N and not having added it properly, git complains because it doesn't know how to handle empty files:
foo: not added yet error: Error building trees
With Git 2.5,
git add -N/--intent-to-add is actually the right solution.
The new file won't be part of the next commit.
diff-lib.c: adjust position of i-t-a entries in diff
Entries added by "
git add -N" are reminder for the user so that they don't forget to add them before committing. These entries appear in the index even though they are not real. Their presence in the index leads to a confusing "
git status" like this:
On branch master Changes to be committed: new file: foo Changes not staged for commit: modified: foo
If you do a "
git commit", "
foo" will not be included even though "
status" reports it as "
to be committed".
This patch changes the output to become
On branch master Changes not staged for commit: new file: foo no changes added to commit
Treat such paths as "yet to be added to the index but Git already know about them"; "
git diff HEAD" and "
git diff --cached HEAD" should not talk about them, and "
git diff" should show them as new. + files yet to be added to the index.