From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org
Subject: Re: [BUG] 'add -u' doesn't work from untracked subdir
Date: Fri, 4 Sep 2009 10:32:42 +0200 [thread overview]
Message-ID: <20090904083242.GT6144@neumann> (raw)
In-Reply-To: <20090902081917.GA5447@coredump.intra.peff.net>
[Oops, I 've just noticed that my reply to Jeff didn't made it to the
git list, because I hit 'reply' instead of 'reply to all'...]
Hi Jeff,
thanks for your quick reply.
On Wed, Sep 02, 2009 at 04:19:17AM -0400, Jeff King wrote:
> On Wed, Sep 02, 2009 at 10:03:05AM +0200, SZEDER Gábor wrote:
>
> > As the subject says, 'git add -u' does not work from an untracked
> > subdir, because it doesn't add modified files to the index. The
> > following script reproduces the issue:
> >
> > mkdir repo
> > cd repo
> > git init
> > echo 1 >foo
> > git add foo
> > git commit -m first
> > echo 2 >foo
> > mkdir untracked_subdir
> > cd untracked_subdir
> > git add -u
> > git diff
> >
> > It worked in the initial 'git add -u' implementation (dfdac5d,
> > git-add
> > -u: match the index with working tree, 2007-04-20), but 2ed2c222
> > (git-add -u paths... now works from subdirectory, 2007-08-16)
> > broke it
> > later, and is broken ever since.
>
> It is not just untracked subdirs. Try:
>
> mkdir repo && cd repo && git init
> echo 1 >foo
> mkdir subdir
> echo 1 >subdir/bar
> git add . && git commit -m first
> echo 2 >foo
> echo 2 >subdir/bar
> cd subdir
> git add -u
> git diff ;# still shows foo/1 in index
> git diff --cached ;# shows subdir/bar was updated
>
> While I have sometimes found the behavior a bit annoying[1], I
> always
> assumed that was the intended behavior.
>
> And indeed, in modern builtin-add.c, we find this:
>
> if ((addremove || take_worktree_changes) && !argc) {
> static const char *here[2] = { ".", NULL };
> argc = 1;
> argv = here;
> }
>
> which seems pretty explicit.
Since then I looked at the man page (I should have done that right
away ;), and it says under the description of -u that "If no paths are
specified, all tracked files in the current directory and its
subdirectories are updated." So this is indeed the intended
behaviour, but I was just not aware of it. Oh well, sorry for the
noise.
> [1] I would prefer "git add -u ." to add only the current directory,
> and
> "git add -u" to touch everything. But then, I am one of the people
> who
> turn off status.relativepaths, so I think I may be in the minority
> in
> always wanting to think of the project as a whole.
I don't really know which would I prefer.
I was updating some Javadoc documentation in Eclipse, and checking the
generated docs in terminal, deep down in an untracked subdir, and
performed some 'add -u ; commit --amend' from there (and was rather
surprised after the fifth amend to see all the changes still in the
worktree). Doing perform the desired add -u from there I should have
run 'git add -u ../../../../../..', what doesn't seem very convenient.
But since this was the first time I've done that since 2007-08-16, I
guess it's not a very common use case.
Gábor
prev parent reply other threads:[~2009-09-04 8:33 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-09-02 8:03 [BUG] 'add -u' doesn't work from untracked subdir SZEDER Gábor
2009-09-02 8:19 ` Jeff King
2009-09-04 7:02 ` Clemens Buchacher
2009-09-05 6:18 ` Jeff King
2009-09-05 7:02 ` Junio C Hamano
2009-09-05 7:20 ` Jeff King
2009-09-05 7:58 ` Junio C Hamano
2009-09-05 8:02 ` Jeff King
2009-09-05 8:23 ` Junio C Hamano
2009-09-06 18:28 ` Clemens Buchacher
2009-09-09 23:46 ` Nanako Shiraishi
2009-09-10 19:53 ` Junio C Hamano
2009-09-10 20:32 ` Clemens Buchacher
2009-09-05 12:31 ` [PATCH 1/2] grep: accept relative paths outside current working directory Clemens Buchacher
2009-09-05 12:33 ` [PATCH 2/2] add 'scope' config option Clemens Buchacher
2009-09-05 13:10 ` [PATCH 2/2 v2] " Clemens Buchacher
2009-09-06 22:58 ` [PATCH 1/2] grep: accept relative paths outside current working directory Junio C Hamano
2009-09-07 8:48 ` [PATCH] grep: fix exit status if external_grep() returns error Clemens Buchacher
2009-09-07 18:13 ` Junio C Hamano
2009-09-05 8:19 ` [BUG] 'add -u' doesn't work from untracked subdir Jeff King
2009-09-05 7:25 ` Junio C Hamano
2009-09-05 8:46 ` Clemens Buchacher
2009-09-05 17:28 ` Junio C Hamano
2009-09-05 17:58 ` Jakub Narebski
2009-09-05 18:45 ` Clemens Buchacher
2009-09-05 21:46 ` 'add -u' without path is relative to cwd Junio C Hamano
2009-09-06 12:32 ` [BUG] 'add -u' doesn't work from untracked subdir Matthieu Moy
2009-09-06 18:16 ` Clemens Buchacher
2009-09-07 6:23 ` Matthieu Moy
2009-09-07 7:33 ` SZEDER Gábor
2009-09-07 8:06 ` Matthieu Moy
2009-09-07 0:07 ` Nanako Shiraishi
2009-09-07 5:07 ` Junio C Hamano
2009-09-07 7:50 ` Clemens Buchacher
2009-09-04 8:32 ` SZEDER Gábor [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090904083242.GT6144@neumann \
--to=szeder@ira.uka.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).