On Thu, Aug 02, 2012 at 11:38:51AM +0100, Chris Webb wrote:
Scripts such as git rebase -i cannot currently cherry-pick commits which
have an empty commit message, as git cherry-pick calls git commit
without the --allow-empty-message option.
Add an --allow-empty-message option to git
Neil Horman nhor...@tuxdriver.com writes:
Having read over this thread, I think this is definately the way to go. As
discussed having cherry-pick stop and give the user a chance to fix empty
history messages by default, and providing a switch to override that behavior
makes sense to me.
On Mon, Aug 06, 2012 at 12:00:16PM +0100, Chris Webb wrote:
Neil Horman nhor...@tuxdriver.com writes:
Having read over this thread, I think this is definately the way to go. As
discussed having cherry-pick stop and give the user a chance to fix empty
history messages by default, and
These assignments comes from the very first commit e83c516 (Initial
revision of git, the information manager from hell - 2005-04-07).
Back then we did not die() when errors happened so correct errno was
required.
Since 5d1a5c0 ([PATCH] Better error reporting for git status -
2005-10-01),
Junio C Hamano venit, vidit, dixit 05.08.2012 00:04:
Torsten Bögershausen tbo...@web.de writes:
Am 2012-07-30 11:57, schrieb Michael J Gruber:
(Sorry being late)
That line:
skip_all=filesystem does not convert utf-8 nfd to nfc
shouldn't it be the other way around?
skip_all=filesystem
These mails are about cosmetics only. But I think it helps maintenance
in long term. I notice in your series we have many functions with _v2
and _v5 mixed together. Worse, some functions that are _v2 only are
not suffixed with _v2. I still think separating v2/v5 changes is a
good idea. So I played
---
Makefile|2 +
cache.h | 92 -
read-cache-v2.c | 570 +
read-cache.c| 591 +++
read-cache.h| 54 +
5 files changed, 734 insertions(+), 575
---
Makefile|1 +
read-cache-v5.c | 1170 +++
read-cache.c| 27 ++
3 files changed, 1198 insertions(+), 0 deletions(-)
create mode 100644 read-cache-v5.c
diff --git a/Makefile b/Makefile
index b4a7c73..77be175 100644
---
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
These mails are about cosmetics only. But I think it helps maintenance
in long term. I notice in your series we have many functions with _v2
and _v5 mixed together. Worse, some functions that are _v2 only are
not suffixed with _v2. I still think
On 08/06, Junio C Hamano wrote:
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
These mails are about cosmetics only. But I think it helps maintenance
in long term. I notice in your series we have many functions with _v2
and _v5 mixed together. Worse, some functions that are _v2 only are
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
While at it, move die_errno() next to xmmap() call because it's the
mmap's error code that we care about. Otherwise if close(fd); fails,
it could overwrite mmap's errno.
Makes sense and is a sensible fix.
Thanks.
--
To unsubscribe from this
Hi Janusz,
It seems you're mixing up a few completely unrelated concepts here.
Core.quotepath enables quoting and escaping of special characters in file
names. This has nothing to do with character set encoding of file names
(i.e. Cp1250/ISO-8859-2/UTF-8). AFAIK, apart from git-svn, git
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes:
These mails are about cosmetics only. But I think it helps maintenance
in long term. I notice in your series we have many functions with _v2
and _v5 mixed together. Worse, some functions that are _v2 only are
not suffixed with _v2. I still think
Ralf Thielow ralf.thie...@gmail.com writes:
The outputs in handle_change_delete() contain a lot of placeholders.
This could end up in confusion to translators. Add a hint for translators
that they can easily understand it without study the code.
Helped-by: Junio C Hamano gits...@pobox.com
On Sun, Aug 05, 2012 at 10:35:06PM -0400, Ben Walton wrote:
Excerpts from Junio C Hamano's message of Sun Aug 05 21:59:48 -0400 2012:
Wouldn't
#if solaris
#define getpass getpassphrase
#endif
without anything else be more than sufficient?
Yes, it would, but
On Sun, Aug 05, 2012 at 01:11:47PM -0700, Junio C Hamano wrote:
Tay Ray Chuan rcta...@gmail.com writes:
Factor out the opening and closing of /dev/tty from
git_terminal_prompt(), so that callers may first test if a controlling
terminal is available before proceeding with prompting
On Sat, Aug 04, 2012 at 03:49:12PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
There are some calculations that git makes repeatedly, even
though the results are invariant for a certain input (e.g.,
the patch-id of a certain commit). We can make a space/time
tradeoff
Here are the topics that have been cooking. Commits prefixed with '-' are
only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'.
I am planning to tag 1.7.12-rc2 tomorrow. GSoC index-v5 topic is
queued in 'pu' together with quick band-aid patches to give people
easier
On Sat, Aug 04, 2012 at 03:58:10PM -0700, Junio C Hamano wrote:
Jeff King p...@peff.net writes:
It is frequently useful to have a fast, generic data
structure mapping keys to values. We already have something
like this in the decorate API, but it has two downsides:
1. The key type
On Sat, Aug 04, 2012 at 01:11:46PM -0400, Jeff King wrote:
+#define IMPLEMENT_CACHE(name, maptype, ktype, vtype) \
+static struct map_persist_sha1pair_uint32 name##_map; \
A minor fixup, but this should obviously be map_persist_##maptype. It
doesn't matter for this series (since we only
It is an implementation detail that a new tag is created by adding a
file in the .git/refs/tags directory. The only thing the user needs
to know is that a git tag creates a ref in the refs/tags namespace,
and without -f, it does not overwrite an existing tag.
Inspired by a report from 乙酸鋰
The Makefile already offers the variable $(FIND) and uses it except in one
place. Fix it.
Signed-off-by: Johannes Sixt j...@kdbg.org
---
For my Windows builds, I need FIND=/usr/bin/find in config.mak because
I have /usr/bin is too late in PATH to override MS's incompatible 'find'.
Makefile |
Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Aug 06, 2012 at 05:31:00PM -0400, Ben Walton wrote:
I'm happy to spend a few cycles on it. I don't have access to any
real Solaris boxes these days, but I imagine I can get OpenSolaris
running under VirtualBox without too much trouble...
I'm also happy to do this work and have
Junio C Hamano gits...@pobox.com writes:
- When you have one object store and a repository that does not yet
borrow from it, you may want to make the repository borrow from
the object store. Obviously you can run echo like the sample
script in the previous item above, but it is not
Excerpts from Jeff King's message of Mon Aug 06 17:34:04 -0400 2012:
On Mon, Aug 06, 2012 at 05:31:00PM -0400, Ben Walton wrote:
I'm happy to spend a few cycles on it. I don't have access to any
real Solaris boxes these days, but I imagine I can get OpenSolaris
running under
On Mon, Aug 06, 2012 at 06:09:08PM -0400, Ben Walton wrote:
I'm currently in pkgutil hell trying to remember how to get a working
gcc on Solaris. Bleh. What kind of OS doesn't ship with a compiler by
default? :)
One that's losing mindshare and isn't gaining traction? *g* Feel free
to
Excerpts from Jeff King's message of Mon Aug 06 18:31:13 -0400 2012:
Looking over the code, I recall now why I used stdio: strbuf_getline
requires it. These days we have strbuf_getwholeline_fd. It's
slightly less efficient (it has to read() a character at a time),
but since we are talking
Jeff King p...@peff.net writes:
The stdio behavior on Solaris is weird. If I run this sample program:
#include stdio.h
int main(void)
{
FILE *fh = fopen(/dev/tty, w+);
char buf[32] = {0};
fgets(buf, sizeof(buf), fh);
fprintf(fh, got %s\n, buf);
return 0;
}
Excerpts from Jeff King's message of Mon Aug 06 18:42:22 -0400 2012:
+if (strbuf_getwholeline(sb, fd, term))
Shouldn't this be strbuf_getwholeline_fd though?
Otherwise, I think this is a good addition.
Thanks
-Ben
--
Ben Walton
Systems Programmer - CHASS
University of Toronto
On Mon, Aug 06, 2012 at 07:31:30PM -0400, Ben Walton wrote:
Excerpts from Jeff King's message of Mon Aug 06 18:42:22 -0400 2012:
+if (strbuf_getwholeline(sb, fd, term))
Shouldn't this be strbuf_getwholeline_fd though?
Whoops, yes. When I got your email, I had just finished the patch
On Tue, Aug 07, 2012 at 01:05:45AM +0200, Andreas Schwab wrote:
The stdio behavior on Solaris is weird. If I run this sample program:
#include stdio.h
int main(void)
{
FILE *fh = fopen(/dev/tty, w+);
char buf[32] = {0};
fgets(buf, sizeof(buf), fh);
On Mon, Aug 06, 2012 at 08:23:18PM -0400, Jeff King wrote:
This is all moot if we end up ripping stdio out of this code for other
reasons, but it does give us another option for a fix.
And here is what that patch would look like:
-- 8 --
Subject: [PATCH] terminal: seek when switching between
Steven Walter stevenrwal...@gmail.com wrote:
Consider the case where you have trunk, branchA of trunk, and branchB of
branchA. trunk is merged back into branchB, and then branchB is
reintegrated into trunk. The merge of branchB into trunk will have
svn:mergeinfo property references to both
Steven Walter stevenrwal...@gmail.com wrote:
This fixes a bug where git finds the incorrect merge parent. Consider a
repository with trunk, branch1 of trunk, and branch2 of branch1.
Without this change, git interprets a merge of branch2 into trunk as a
merge of branch1 into trunk.
Sam: your
On Tue, Aug 7, 2012 at 8:35 AM, Jeff King p...@peff.net wrote:
Subject: [PATCH] terminal: seek when switching between reading and writing
When a stdio stream is opened in update mode (e.g., w+),
the C standard forbids switching between reading or writing
without an intervening positioning
Excerpts from Jeff King's message of Mon Aug 06 20:35:41 -0400 2012:
---
compat/terminal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/compat/terminal.c b/compat/terminal.c
index 6d16c8f..bbb038d 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -59,6 +59,7 @@ char
Ben Walton bwal...@artsci.utoronto.ca writes:
Now that git_terminal_prompt can cleanly interact with /dev/tty on
Solaris, enable HAVE_DEV_TTY so that this code path is used for
credential reading instead of relying on the crippled getpass().
Signed-off-by: Ben Walton
On Mon, Aug 06, 2012 at 08:43:02PM -0700, Junio C Hamano wrote:
Ben Walton bwal...@artsci.utoronto.ca writes:
Now that git_terminal_prompt can cleanly interact with /dev/tty on
Solaris, enable HAVE_DEV_TTY so that this code path is used for
credential reading instead of relying on the
On Tue, Aug 07, 2012 at 12:03:26AM -0400, Jeff King wrote:
So which direction do you guys want to go? Use the bidirectional
stdio with fseek() for now, with the expectation that Tay's other
series will rewrite it to fd based one?
I think so. The stdio fix is short and obviously correct,
This informational message can cause a problem if 'git prune' is spawned
from an auto-gc during receive-pack. In this case, the informational
message will be sent back over the wire to the git client and the client
will try to interpret it as part of the pack protocol and will produce an
error.
On Mon, Aug 06, 2012 at 10:01:49PM -0700, Brandon Casey wrote:
This informational message can cause a problem if 'git prune' is spawned
from an auto-gc during receive-pack. In this case, the informational
message will be sent back over the wire to the git client and the client
will try to
Junio C Hamano gits...@pobox.com writes:
Note that this chooses to expose what comes out of the standard
output of the subprocess to the standard error to be shown to the
user sitting on the other end. This is in line with what we do to
all of our hooks (Cf. cd83c74 (Redirect update hook
43 matches
Mail list logo
