From: Darren Cook <darren@dcook.org>
To: git@vger.kernel.org
Subject: Bug Report: git add
Date: Wed, 06 Apr 2011 08:18:54 +0900 [thread overview]
Message-ID: <4D9BA35E.6040204@dcook.org> (raw)
(Apologies if there is a proper place to report bugs; but I could not
find one.)
PROBLEM: "git add" adds sub-directories without checking to see if there
is already a git repository already there.
WHY BAD: This causes files to be in two repositories (leading to a mess
if you don't notice for a while...)
ONE SOLUTION: When adding files from a directory (except root of the
repository, of course) look for a .git subdirectory, and complain if
found. Allow --force to override this.
MORE SOPHISTICATED:
1. Offer to merge in all that history, followed by removing that old
.git subdirectory.
2. Look inside the .git subdirectory to see if the file being added is
actually under control there. If not, no need to complain.
EXAMPLE OF PROBLEM
The problem can arise when people are just dipping their toe into git,
and decide to try it on just one directory, then later expand its use to
the whole project.
mkdir test
cd test
mkdir settings
cd settings
git init
touch x
git add x
git commit -m "xx"
(time passes)
cd ..
git init
git add settings/
(should complain)
Thanks for taking the time to read this,
Darren
--
Darren Cook, Software Researcher/Developer
http://dcook.org/work/ (About me and my work)
http://dcook.org/blogs.html (My blogs and articles)
next reply other threads:[~2011-04-05 23:19 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-05 23:18 Darren Cook [this message]
2011-04-06 5:52 ` Bug Report: git add Ramkumar Ramachandra
2011-04-10 7:48 ` Jakub Narebski
2011-04-10 8:29 ` Ramkumar Ramachandra
2011-04-11 17:55 ` Junio C Hamano
2011-04-11 18:20 ` Jeff King
2011-04-07 0:57 ` Jeff King
2011-04-07 1:09 ` Junio C Hamano
2011-04-07 1:12 ` Jeff King
2011-04-07 1:48 ` Jeff King
2011-04-07 7:28 ` Junio C Hamano
2011-04-08 19:15 ` Jeff King
2011-04-08 19:46 ` Jeff King
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=4D9BA35E.6040204@dcook.org \
--to=darren@dcook.org \
--cc=git@vger.kernel.org \
/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).