| From | Subject | Date |
|---|---|---|
| Johannes Sixt | Re: What's not in 'master', and likely not to be until 1.5.4
[Don't have Cc: in KNode. oh well...]
Thanks a lot!
This would become a gigantic patch, which I really dislike. It's much easier
The custom lstat() implementation cannot come after the custom struct stat
because we can't call Windows's stat() with a custom struct stat. But I
also don't want the custom lstat() in the code from the beginning because
I strongly disagree. The series is completely bisectable on *nix. But if the
Doesn't this go too far? How many systems are there where no...
| Jan 18, 6:07 pm 2008 |
| Johannes Schindelin | Re: What's not in 'master', and likely not to be until 1.5.4
Hi,
I meant the subjects of the commit messages. I.e. "Add target
Hmm. You're right, of course, for *nix.
But for MinGW I am not really sure, as you do not really get a
fully functional system prior to all of the 42 patches...
I am really torn on this, because I can understand your point of view.
But when there would be an issue with MinGW, and I wanted to find out if
it worked _at all_, it would be nice to have an easily determined commit
where MinGW was supposed to be fully...
| Jan 18, 6:37 pm 2008 |
| Junio C Hamano | Re: What's not in 'master' but should be
If you expected it, you should have added the above four and
half lines in the initial message. cgit is something even I
have heard of, and breakage of it because of what we have is
worth taking into consideration. It would have been nicer if
Instead of wasting more time in the exchange in this thread, I
spent a several uninterrupted minutes' attention to read over
your patch to make sure there is no accidental slippage (with
help from Dscho as well). I'll make an exception and will
apply.
...
| Jan 18, 4:59 pm 2008 |
| Junio C Hamano | Re: [PATCH] git-send-email.perl: check for lines longer than...
I wonder what the performance implication of this approach would
be, though. I am tempted to say that it would be negligible --
I suspect that taking this "Safe against SMTP line length limit"
topic all the way ("all the way" is post 1.5.4, I am inclined to
agree that this may be a good fix to an existing bug) would
require that git-format-patch --attach to learn to apply QP on
patch text to avoid producing very long lines to root-cause the
issue [*1*].
[Footnote]
*1* It's actually second-...
| Jan 18, 4:57 pm 2008 |
| Jeff King | Re: [PATCH] git-send-email.perl: check for lines longer than...
We now open and do one conditional per line for each file (in addition
to already going through each file a separate time and doing more
complex processing). Doing that over the entirety of "git log
--pretty=email -p" on git.git takes about 1 second on my machine for
11402 patches. Obviously there's slightly more syscall overhead as you
have to open() each patch, but I think think it is clear that the
Perhaps. If such things are sufficiently rare, one could simply attach
the patch in their MUA....
| Jan 18, 5:30 pm 2008 |
| Jim Meyering | [PATCH] fast-import: Don't use a maybe-clobbered errno value
Without this change, each diagnostic could use an errno value
clobbered by the close or unlink in rollback_lock_file.
Signed-off-by: Jim Meyering <meyering@redhat.com>
---
fast-import.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 5e89eef..45b4edf 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1541,9 +1541,10 @@ static void dump_marks(void)
f = fdopen(mark_fd, "w");
if (!f) {
+ int saved_errno = errno...
| Jan 18, 2:35 pm 2008 |
| Jakub Narebski | Re: git on MacOSX and files with decomposed utf-8 file names
Errr... doesn't UTF-16 (as compared to USC-2) sometimes (for some exotic
characters) require more than two bytes per character?
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
-
| Jan 18, 1:24 pm 2008 |
| Sergio Callegari | git submodule when submodule is not a clone of a repository
Hi,
I am trying to use submodules to keep a project organized.
I am using a workflow that is probably not the common one and I am running into
problems.
Basically, I have a superproject TOP, with subproject A and B. The thing is that
A and B are _not_ cloned from some existing repo. They are two brand new
repositories created with git init.
Basically, I am doing this so that in the superproject I commit states with
specific versions of A and B (that are logically distinct things) that are kno...
| Jan 18, 1:25 pm 2008 |
| Lars Hjemli | Re: git submodule when submodule is not a clone of a reposit...
Actually, we could (and probably should) teach git-submodule not to
fetch if the requested SHA1 is already available in the submodule, and
I guess this would solve the problem quite nicely for your usage.
But that will probably not happen before 1.5.4.
--
larsh
-
| Jan 18, 1:46 pm 2008 |
| Junio C Hamano | Re: git submodule when submodule is not a clone of a reposit...
I think that is a very sensible optimization.
-
| Jan 18, 7:26 pm 2008 |
| Benoit Sigoure | gitk geometry bug on OSX
Hi list,
there is another nit which annoys me in gitk. Besides the fact that
the maximize button (the green `+' button that is part of Apple-style
windows) does not do anything, I can't maximize the window on a 2nd
screen even if I try manually. Wild guess: I can't make the window
bigger than the maximum area usable on the main screen of my MacBook
(max area = screen resolution - area used by the Apple menu - (dock
hides automatically ? 0 : min size of dock)).
Whether this is a bug i...
| Jan 18, 12:33 pm 2008 |
| Paolo Bonzini | [PATCH] git-commit: add a prepare-commit-msg hook
The prepare-commit-msg hook is run whenever a "fresh" commit message
(i.e. not one taken from another commit with -c) is shown in the editor.
It can modify the commit message in-place and/or abort the commit.
While the default hook just adds a Signed-Off-By line at the bottom
of the commit messsage, the hook is more intended to build a template
for the commit message following project standards.
Signed-Off-By: Paolo Bonzini <bonzini@gnu.org>
---
Documentation/git-commit.txt | 13 ...
| Jan 18, 10:51 am 2008 |
| Junio C Hamano | Re: [PATCH] git-commit: add a prepare-commit-msg hook
I do not particularly like hooks that act before or after an
operation is initiated locally, act solely on local data. This
is maybe because I still consider git tools building blocks
suitable for higher level scripting more than other people do.
There are five valid reasons you might want a hook to a git
operation:
(1) A hook that countermands the normal decision made by the
underlying command. Examples of this class are the update
hook and the pre-commit hook.
(2) A hook that ...
| Jan 18, 6:05 pm 2008 |
| Alex Riesen | Re: [PATCH] git-commit: add a prepare-commit-msg hook
"preedit-new-commit-msg", perhaps. A "prepare-" suggests it is called
every time, even if no editor is specified, which it is not.
And it really does look like a template...
-
| Jan 18, 3:05 pm 2008 |
| Paolo Bonzini | Re: [PATCH] git-commit: add a prepare-commit-msg hook
It is, but quite a powerful one. :-) template-commit-msg?
Paolo
-
| Jan 18, 3:46 pm 2008 |
| Alex Riesen | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Except that "template" is already taken. Someone uses it and some may
Not really. It will be run even if the template (the one Git have
already) is not used.
It really looks a bit complicated. If at all, how about running that
"pre-editor" hook with information about where the message comes from?
I.e. if the message comes from a template:
preedit-commit-msg .git/COMMIT_MSG template
or, for a message coming from commit:
preedit-commit-msg .git/COMMIT_MSG commit 0123456789abdef
...
| Jan 18, 5:08 pm 2008 |
| Johannes Schindelin | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Hi,
Would it not be much better for that hook to verify that the template has
not been added?
Or would not be yet even better to use the commit.template config
variable, which was intended for that purpose?
Ciao,
Dscho
-
| Jan 18, 11:47 am 2008 |
| Paolo Bonzini | Re: [PATCH] git-commit: add a prepare-commit-msg hook
The template might not necessarily be fixed, for example it could be
preloaded with the list of modified files. See the cover letter for an
example.
Paolo
-
| Jan 18, 11:51 am 2008 |
| Johannes Schindelin | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Hi,
What I meant is this:
In the message hook, just grep if the template was already added. If it
was, just return. If it was not, add it.
No need for yet another hook.
Ciao,
Dscho
-
| Jan 18, 12:06 pm 2008 |
| Paolo Bonzini | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Ah, so you want me to always type ":q!" to exit and unnecessarily
complicate the commit-msg hook. Cunning, but no, thanks.
I'll make an example. This is my prepare-commit-msg hook:
diff_collect_changelog ()
{
git diff "$@" -- \
`git diff "$@" --name-status -r | \
awk '/ChangeLog/ { print substr ($0, 3) }'` | sed -n \
-e '/^@@/,/^+/ {' \
-e ' s/^ //p' \
-e ' t' \
-e '}' \
-e '/^diff/,/^@@/ {' \
-e ' s/^diff --git a\/\(.*\)\/ChangeLog[^ ]*...
| Jan 18, 12:37 pm 2008 |
| Johannes Schindelin | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Hi,
No, my intention was to avoid complications. Like introducing yet another
commit hook. I like clean, elegant semantics. I don't like overbloated
semantics. That's why I speak up whenever I fear it is entering git.
Hth,
Dscho
-
| Jan 18, 2:06 pm 2008 |
| Benoit Sigoure | Re: [PATCH] git-commit: add a prepare-commit-msg hook
FWIW I'd love such a hook and I've been writing wrappers around Git
commit for over a year now to simulate this. I know many people with
whom I work that would also love such a feature.
--
Benoit Sigoure aka Tsuna
EPITA Research and Development Laboratory
-
| Jan 18, 3:01 pm 2008 |
| Paolo Bonzini | Re: [PATCH] git-commit: add a prepare-commit-msg hook
Do you think my three line patch is too complicated? Possibly I was too
zealous in documenting the semantics for the new hook and that looked
like unelegant semantics.
Do you have another possibility which allows the same workflow (git
commit shows the output of that script) within the existing framework?
Paolo
-
| Jan 18, 2:51 pm 2008 |
| Marco Costalba | fast-import.c: zlib_compression_level vs pack_compression_le...
Just a small thing I would like to bring to your attention before 1.5.4 is out
During my work on compression/decompression cleanup I have found that
in fast-import.c the zlib_compression_level is used, while in
builtin-pack-objects is used pack_compression_level instead.
This 2 flags corresponds, more or less directly, (some cleanup is
needed also in that area, but this is another story) to:
core.loosecompression
and
pack.compression
config settings.
My question is, does fast-import ...
| Jan 18, 9:04 am 2008 |
| Nicolas Pitre | Re: fast-import.c: zlib_compression_level vs pack_compressio...
Yes it should.
Nicolas
-
| Jan 18, 11:44 am 2008 |
| Kevin Ballard | git-svn should default to --repack
I was very surprised to find that git-svn does not in fact default to
--repack. I firmly believe it should. Here's an example as to why it
should.
I used git-svn to import a repository with 33000 revisions and about
7500 files. It took about 18 hours to import. When it was done,
my .git folder had 242001 files that comprised 2.0GB. I ran `git gc --
agressive --prune` and let that sit overnight (I wish it was more
verbose, it went for over an hour without printing anything), and that
m...
| Jan 18, 8:17 am 2008 |
| Karl | Re: git-svn should default to --repack
I believe so too. And nowadays there's "git gc --auto", which was made
for occasions such as this, so it should be a breeze to implement. The
overhead might be low enough that it can be called after _every_
imported revision.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
-
| Jan 18, 11:56 am 2008 |
| Junio C Hamano | Re: git-svn should default to --repack
Careful. I made the same mistake and it had to be corrected
with e0cd252eb0ba6453acd64762625b004aa4cc162b.
"gc --auto" after every 1000 or so feels like a good default and
I would agree that would be a real fix to a real usability bug.
Patches?
-
| Jan 18, 4:44 pm 2008 |
| Charles Bailey | Re: [PATCH] Fix random fast-import errors when compiled with...
I can ACK this as fixing the test suite failures on Mac OS X 10.4.11
both with and without NO_MMAP=Yes on top of 1.5.4.rc3.24.gb53139 and
also on my oldish Fedora install with NO_MMAP=Yes.
Acked-by: Charles Bailey <charles@hashpling.org>
-
| Jan 18, 5:26 am 2008 |
| Junio C Hamano | Re: [PATCH] Fix random fast-import errors when compiled with...
Well, I do not want to be picky with these things, but you do
not own that area, so that would be "Tested-by:"
I've already committed the simplified version I suggested to
Shawn.
-
| Jan 18, 5:36 am 2008 |
| Charles Bailey | Re: [PATCH] Fix random fast-import errors when compiled with...
Sorry, I thought that Acked-by was an acceptable tag for people not
involved in the development path of a patch. I don't want to add a
"Tested-by" as I am not a fast-import user and I am *only* reporting
the success of the test suite, not any real-world testing.
Charles.
-
| Jan 18, 5:45 am 2008 |
| Junio C Hamano | Re: [PATCH] Fix random fast-import errors when compiled with...
It still counts as "Tested-by:". Earlier you saw breakage and
now you see it fixed in your environment, to which neither I nor
Shawn have access to. That's a good verification that the patch
fixed the issue for you and your feedback was very much
appreciated (your timely initial breakage report even more so).
Acked-by: is usually given by people who are the most familiar
with the code being affected (or at least by the ones more
familiar than the patch's author), in order to let me and the
wor...
| Jan 18, 6:57 am 2008 |
| Ian Brown | errors in git pull
Hello,
I am working agains a linux kernel net git repository.
It occurred to me more than once that when trying to
git-pull a repository I get the following errors; there errors appear
also after I am running
"git-reset --hard".
Any idea what can it be ?
I must add that I did not made changes in my local copy of the repository.
the command I am running is:
git-pull git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25.git
Here are the errors I get:
mygateway:/work/src/2.6....
| Jan 18, 4:49 am 2008 |
| Johannes Schindelin | Re: errors in git pull
Hi,
To simplify, you can
git remote add origin git://<...>
These are merge conflicts. Git thinks you have changed something.
Now, this might be true, but it also might be the case that the tree you
are pulling was rebased, i.e. rewound to a certain point in commit
history, and committed to _differently_.
As a consequence, your state _before_ pulling looks as if _you_ changed
something. Since these changes are different than the now-current
changes, but touch the same code...
| Jan 18, 9:07 am 2008 |
| Johannes Sixt | Re: [PATCH] Fix random fast-import errors when compiled with...
Thanks a lot. It works here on Windows, too.
-- Hannes
-
| Jan 18, 3:53 am 2008 |
| Junio C Hamano | Re: [PATCH] Fix random fast-import errors when compiled with...
Nobody seems to pass anything but true in retain_fd parameter.
I am not sure about this inuse_cnt business.
The only caller we know that needs this function is fast-import
that wants to drop all windows into a pack while keeping the
file descriptor and it should not have an in-use windows.
It is unclear what semantics is the right one for callers that
do want to retain some windows but still want to call this
function. If somebody is in the middle of chasing a delta chain
and still calls th...
| Jan 18, 2:10 am 2008 |
| Brian Dessent | Re: git on MacOSX and files with decomposed utf-8 file names
Cygwin does not yet support doing the smart thing. At the moment you
can only open() files in the current 8 bit codepage. There is a patch
floating around to allow using UTF-8, but it was rejected for inclusion
because it was considered too hackish. Instead work has been ongoing
for some time to replumb the internal representation of Windows
filenames to use UTF-16 instead of plain chars, so that conversion
overhead can be held at a minimum. In conjuction with dropping Win9x/ME
support this als...
| Jan 18, 12:08 am 2008 |
| Linus Torvalds | Re: [PATCH] Fix random fast-import errors when compiled with...
In fact, even with mmap(), it's not guaranteed. There are really crappy
mmap implementations out there, partly due to bad CPU design (virtual CPU
caches without coherency), but more often due to total crap OS.
(Yeah, Linux did count in that area at some point. Long ago. Early 90's.
Maybe)
I think HP-UX used to have non-coherent mmap for the longest time, due to
carrying around some totally crap memory management based on some ancient
BSD version that everybody else (including the BSD's...
| Jan 18, 12:27 am 2008 |
| Charles Bailey | Re: [PATCH] Fix random fast-import errors when compiled with...
I've just checked the Mac OS X build and it looks like there is a mmap
and git is indeed using it, so this is obviously an example of a
"really crappy" mmap implementation.
This adds more ammunition to the fight against the whole Mac OS X is
powered/built/based on UNIX myth.
Charles.
-
| Jan 18, 4:42 am 2008 |
| Linus Torvalds | Re: [PATCH] Fix random fast-import errors when compiled with...
Looking closer, this is not necessarily the case here.
Git uses MAP_PRIVATE, because that whole pack-file mapping was really
*meant* to map an existing read-only pack-file, and fast-import seems to
really be screwing with it.
It so happens that Linux has a particularly clean and streamlined VM, and
if you do only reads to a MAP_PRIVATE mapping on a normal filesystem,
you'll always be as coherent as with MAP_SHARED because Linux will simply
map in the page cache pages directly.
But t...
| Jan 18, 1:08 pm 2008 |
| lag | How well is blue pill working for you?
Improbable effect on your health! http://eu.rxneall864.com
-
| Jan 17, 11:06 pm 2008 |
| Junio C Hamano | Re: [PATCH] Include rev-list options in git-log manpage.
Have you generated documentation with and without patch and run
diff between them?
There is an obvious duplicated inclusion of pretty-options.txt[]
in git-log.{1,html}.
is _clearly_ written for git-rev-list and unsuitable for any of
the commands listed above.
git-log manual page has been saying that "This manual page
describes only the most frequently used options." I would agree
that it is a laudable goal to replace that sentence with an
included common source text, but there needs to b...
| Jan 18, 3:21 am 2008 |
| Miklos Vajna | [PATCH] Include rev-list options in git-log manpage.
Replace the "This manual page describes only the most frequently used options."
text with the list of rev-list options in git-log manpage. (The git-diff-tree
options are already included.)
Move these options to a separate file and include it from both
git-rev-list.txt and git-log.txt.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Yes and no. I generated the documentation, but I forgot to diff the
I missed that one. Now should be fixed. Also there were other duplicated
F...
| Jan 18, 12:17 pm 2008 |
| Johannes Sixt | Re: [PATCH] Include rev-list options in git-log manpage.
Had you used format-patch -C then the patch would have been shorter by
~240 lines. And it would have been immediately obvious that you have put
I wonder why these brackets are necessary. This text applies to git-log,
too, no? Can't you just remove that paragraph from git-log.txt?
-- Hannes
-
| Jan 18, 12:37 pm 2008 |
| Miklos Vajna | [PATCH] Include rev-list options in git-log manpage.
Replace the "This manual page describes only the most frequently used options."
text with the list of rev-list options in git-log manpage. (The git-diff-tree
options are already included.)
Move these options to a separate file and include it from both
git-rev-list.txt and git-log.txt.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
Okay, now using -C :)
Also I removed the duplicated options from git-log.txt (--first-parent
and -g) to avoid duplicated descriptions.
Docum...
| Jan 18, 1:18 pm 2008 |
| Junio C Hamano | Re: [PATCH] Include rev-list options in git-log manpage.
I do not like these. What you are really trying to express is
"this section makes sense only in rev-list documentation", not
"among the current set of documentation, the one this section
does not make sense in is git-log". We might end up including
this in some other documents.
IOW, they should rather be "ifdef::git-rev-list[]" instead,
(of course you have to define that token yourself if there isn't
one already).
-
| Jan 18, 3:51 pm 2008 |
| Miklos Vajna | [PATCH] Include rev-list options in git-log manpage.
[Empty message]
| Jan 18, 6:50 pm 2008 |
| Miklos Vajna | [PATCH] Include rev-list options in git-log manpage.
Replace the "This manual page describes only the most frequently used options."
text with the list of rev-list options in git-log manpage. (The git-diff-tree
options are already included.)
Move these options to a separate file and include it from both
git-rev-list.txt and git-log.txt.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
---
My bad, the previous version introduced two typos (ref-list instead of
rev-list). This one should be OK.
Documentation/git-log.txt ...
| Jan 18, 6:58 pm 2008 |
| Junio C Hamano | Re: [PATCH] Include rev-list options in git-log manpage.
Now, this moves option descriptions of git-log around for no
good reason, other than that it was more convenient in the
source.
Which is not a very good excuse in general, but I do not think
the original ordering was carefully designed to be optimal for
the readers either, so let's take it.
Thanks.
-
| Jan 18, 7:12 pm 2008 |
| Junio C Hamano | Re: [PATCH] Include rev-list options in git-log manpage.
I do not like these. What you are really trying to express is
"this section makes sense only in rev-list documentation", not
"the current set of documentation this section does not make
sese is git-log". We might end up including this in some other
documents.
IOW, they should rather be "ifdef::git-rev-list[]" instead.
-
| Jan 18, 3:50 pm 2008 |
| previous day | today | next day |
|---|---|---|
| January 17, 2008 | January 18, 2008 | January 19, 2008 |
| Greg Kroah-Hartman | [PATCH 001/196] Chinese: Add the known_regression URI to the HOWTO |
| Linus Torvalds | Linux 2.6.21-rc1 |
| Tarkan Erimer | Re: Dual-Licensing Linux Kernel with GPL V2 and GPL V3 |
| pageexec | Re: [stable] Linux 2.6.25.10 |
| Linus Torvalds | Re: [GIT]: Networking |
| Gerrit Renker | [PATCH 15/37] dccp: Set per-connection CCIDs via socket options |
| Natalie Protasevich | [BUG] New Kernel Bugs |
| Jarek Poplawski | [PATCH take 2] pkt_sched: Protect gen estimators under est_lock. |
git: | |
