From: Junio C Hamano <junkio@cox.net>
To: git@vger.kernel.org
Subject: Heads up, git.git approaches 1.2.0
Date: Tue, 07 Feb 2006 00:40:10 -0800 [thread overview]
Message-ID: <7vek2fzhn9.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <7vbqxkapr2.fsf@assigned-by-dhcp.cox.net> (Junio C. Hamano's message of "Sun, 05 Feb 2006 23:52:01 -0800")
I've done a bit more work to round the corners diff-tree -c/--cc
had. Most notably, earlier the algorithm punted if the merge
removed or added files. These should raise red flag, because
diff-tree -c/--cc deal with case where the result is different
from all parents, so removal of a file means all parents had it
in some shape but the file does not appear in the result, and
addition of a file means no parents had it but merge made it
magically appear. These cases are now shown as interesting.
BTW, I was pleasantly surprised that "git show 2950411" showed
exactly what the commit log message said. Now I agree with
Linus that --cc is a wonderful thing ;-).
Tonight I have pushed out all I said I would want to have in the
next feature release 1.2.0 in the master branch, so that people
can beat it more easily and help us shaking out potential bugs.
Most of the things are something I've been using myself on git
itself and also during my day-job, so there hopefully won't be
any major data eating problems. Admittedly I almost never do
"git commit paths...", but for the last couple of days I tried
to use it whenever possible to make sure it works as intended.
It defaults to --include behaviour which is the traditional one.
"git commit --only paths..." and running "git commit" from a
subdirectory are also implemented and I've tried them with toy
commits. If you are one of the people who missed them, please
try it out and see if they satisfy your expectations.
I might receive some more HTTP fixes from Mark, documentation
updates from J. Bruce etc. and I'd merge them before 1.2.0. But
otherwise I am pretty happy with what's there in the "master"
branch right now. The tip of the "master" is this commit:
commit 5a798fb57f788692467b1a11416dd5ebff0d31ae
Author: Junio C Hamano <junkio@cox.net>
git-commit: finishing touches.
Please consider it a 1.2.0-rc1, and treat it the same way you
would treat -rc1 from the kernel project. If you are going to
test only one -rc version, this is THE one to test, and all the
rest are bugfixes.
prev parent reply other threads:[~2006-02-07 8:40 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-02-06 7:52 What's new in git.git Junio C Hamano
2006-02-06 16:03 ` Linus Torvalds
2006-02-06 16:58 ` Junio C Hamano
2006-02-06 17:10 ` Johannes Schindelin
2006-02-07 8:40 ` Junio C Hamano [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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vek2fzhn9.fsf@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--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.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox