| From | Subject | Date |
|---|---|---|
| Tomas Pospisek | Bug? file at the same time being deleted and not registered
(I'm not subscribed, so please in case do Cc: me)
Short version:
==============
$ # we're on a mhddfs backed filesystem here, that doesn't support hardlinks
$ mkdir bar
$ cd bar/
$ git init
Initialized empty Git repository in /mnt/mhddfs/tmp/bar/.git/
$ touch a_file
$ git add a_file
$ git commit a_file -m bla
[master (root-commit) ca0ce50] bla
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 a_file
$ git status
# On branch master
# ...
| May 23, 2:09 pm 2010 |
| Jeff King | Re: Bug? file at the same time being deleted and not reg ...
If you mean this (from your strace):
link(".git/objects/df/tmp_obj_cL0wfQ", ".git/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078") = -1 ENOSYS (Function not implemented)
Note that it is immediately followed by:
rename(".git/objects/df/tmp_obj_cL0wfQ", ".git/objects/df/2b8fc99e1c1d4dbc0a854d9f72157f1d6ea078") = 0
IOW, git tries the hard-link first, then falls back to the rename. If
the rename also fails, git does complain. So I don't think that is your
problem.
I would guess ...
| May 23, 4:44 pm 2010 |
| Ramkumar Ramachandra | [PATCH 0/7] Import David's SVN exporter
Except for the first patch, this patch series attempts to include
David's exporter [1] into git.git. I've made some efforts to go
through every small detail in the code to clean and document it for
clarity. If the code is more-or-less ready for inclusion (perhaps into
'next'?), the plan is to continue developing the exporter on a
separate repository and pull changes into git.git. I haven't written a
Makefile rule for building this yet.
The first patch includes the skeleton remote helper I sent ...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 2/7] Add cpp macro implementation of treaps
The implementation exposes an API to generate type-specific treap
implmentation and various functions to operate on it. Taken directly
from David Michael Barr's svn-dump-fast-export repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/trp.h | 221 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 221 insertions(+), 0 deletions(-)
create mode 100644 vcs-svn/trp.h
diff --git a/vcs-svn/trp.h b/vcs-svn/trp.h
new file mode 100644
index ...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 4/7] Add a memory pool library
Add a memory pool library implemented using cpp macros. The macro can
be used to create a type-specific memory pool API. The memory nodes
themselves are stored in a treap, using macros in trp.h. Taken
directly from David Michael Barr's svn-dump-fast-export repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/obj_pool.h | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 0 deletions(-)
create mode 100644 ...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [WIP PATCH 1/7] Add skeleton remote helper for SVN
Create remote-svn.c, which is essentially a stripped-down version of
remote-curl.c to build the SVN remote helper upon. Also add a Makefile
rule to build it.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
Makefile | 9 ++-
remote-svn.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++
vcs-svn/svnclient.c | 20 +++++
vcs-svn/svnclient.h | 7 ++
4 files changed, 236 insertions(+), 1 deletions(-)
create mode 100644 remote-svn.c
create mode ...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 3/7] Add buffer pool library
line_buffer creates a couple of static buffers and expose an API for
using them. The idea is to maintain a fixed static memory pool to
avoid constant allocation and de-allocation of memory. Taken directly
from David Michael Barr's svn-dump-fast-export repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/line_buffer.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++++
vcs-svn/line_buffer.h | 14 ++++++
2 files changed, 129 insertions(+), 0 deletions(-)
...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 5/7] Add API for string-specific memory pool
string_pool uses the macros in the memory pool library to create a
memory pool for strings and expose an API for handling the
strings. Taken directly from David Michael Barr's svn-dump-fast-export
repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/string_pool.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++
vcs-svn/string_pool.h | 11 ++++++
2 files changed, 95 insertions(+), 0 deletions(-)
create mode 100644 vcs-svn/string_pool.c
create mode ...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 7/7] Add handler for SVN dump
Expose an API to parse an SVN dump created with `svnadmin dump` and
emit a fast-import stream using fast_export and repo_tree. This is a
temporary workaround: it will be replaced with a client that
communicates live with a remote SVN server in future. Taken directly
from David Michael Barr's svn-dump-fast-export repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/svndump.c | 277 +++++++++++++++++++++++++++++++++++++++++++++++++++++
vcs-svn/svndump.h | 7 ++
...
| May 23, 2:40 pm 2010 |
| Ramkumar Ramachandra | [PATCH 6/7] Add SVN revision parser and exporter
repo_tree parses SVN revisions to build a Git objects, and use
fast_export to emit them so they can be imported into the Git object
store via a fast-import. Taken directly from David Michael Barr's
svn-dump-fast-export repository.
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
vcs-svn/fast_export.c | 61 +++++++++
vcs-svn/fast_export.h | 17 +++
vcs-svn/repo_tree.c | 333 +++++++++++++++++++++++++++++++++++++++++++++++++
vcs-svn/repo_tree.h | 31 +++++
4 files ...
| May 23, 2:40 pm 2010 |
| Bruce Stephens | Re: gitignore - how to ignore only in current directory
Make the pattern begin with /
[...]
--
| May 23, 1:33 pm 2010 |
| Howard Miller | Re: gitignore - how to ignore only in current directory
Ahh thanks!! Now I know the answer I can see that the docs say that (sort of) :)
--
| May 23, 1:38 pm 2010 |
| Björn Steinbrink | Re: gitignore - how to ignore only in current directory
If the pattern contains a non-trailing slash, then the pattern is
matched against the whole path (relative to the directory the .gitignore
file is in), not just against the filename relative to its parent
directory. So if you want to ignore "foo" only in the directory the
.gitignore file is in use "/foo" (without the quotes).
Björn
--
| May 23, 1:36 pm 2010 |
| Howard Miller | gitignore - how to ignore only in current directory
I want to ignore a particular file name in a particular directory.
However, the same filename may appear in subdirectories and in those
cases I do *not* want it ignored. The documentation seems to imply
that git will read up the directories looking for .gitignore files and
will ignore files that I need included.
Have I misunderstood this and/or how can this be done. Any
enlightenment appreciated!
--
| May 23, 1:28 pm 2010 |
| Björn Steinbrink | [PATCH] diff: Support visibility modifiers in the PHP hu ...
Starting with PHP5, class methods can have a visibility modifier, which
caused the methods not to be matched by the existing regexp, so extend
the regexp to match those modifiers. And while we're at it, allow the
"static" modifier as well.
Since the "static" modifier can appear either before or after the
visibility modifier, let's just allow any number of modifiers to appear
in any order, as that simplifies the regexp and shouldn't cause any
false positives.
Signed-off-by: Björn Steinbrink ...
| May 23, 11:05 am 2010 |
| MINGOO YANG | MAIL ME BACK IF INTERESTED!
Aknowledge,
An Iraqi business man made a huge deposit in my bank where am a director
and he died with his entire family in the war leaving behind no next of
kin, I'm ready to share with you if you choose to stand as my deceased
client next of kin. If interested mail me at: mnghoyng@yahoo.com.hk
Regards,
Ming
--
| May 23, 3:00 am 2010 |
| Jakub Narebski | Re: [PATCHv3 GSoC] git-instaweb: Configure it to work wi ...
For what it is worth:
Acked-by: Jakub Narebski <jnareb@gmail.com>
But I think more important would be ACK from Eric Wong, author and
maintainer of git-instaweb. I guess that because it is preparatory
work, only related to the main stated goal of your GSoC 2010, you
don't need "signoff" from mentor(s) (in the form of Mentored-by:)...
--
Jakub Narebski
Poland
--
| May 23, 2:54 am 2010 |
| Eric Wong | Re: [PATCHv3 GSoC] git-instaweb: Configure it to work wi ...
Hi Pavan, I'm late to this thread, but I'm leaning against forcing
access logs onto people. I don't believe access logs are necessary for
instaweb. Error logs are important for debugging breakage, yes, but
access logs aren't worth the trouble IMHO.
Also, using the same error log paths might make it confusing to people
switching between web servers. In fact, it may be the most confusing
for those folks if they're trying different web servers and forgetting
to shut down the previous server ...
| May 23, 2:56 am 2010 |
| Pavan Kumar Sunkara | [PATCHv3 GSoC] git-instaweb: Configure it to work with n ...
git-instaweb in its current form (re)creates gitweb.cgi and
(some of) required static files in $GIT_DIR/gitweb/ directory.
Splitting gitweb would make it difficult for git-instaweb to
continue with this method.
Use the instaweb.gitwebdir config variable to point git-instaweb script
to a global directory which contains gitweb files as server root
and the httpd.conf along with server logs and pid go into
'$(GIT_DIR)/gitweb' directory.
While at it, change apache2 configuration to use the same ...
| May 23, 12:32 am 2010 |
| Pavan Kumar Sunkara | Re: [PATCHv3 GSoC] git-instaweb: Configure it to work wi ...
Well, Until before this patch, lighttpd and mongoose have been using
the same error log and access log.
So, I enabled it for apache2 too in the process of debugging
git-instaweb while using apache2.
IMVHO If there is no problem using the same logs for lighttpd and
mongoose until now, I don't think it will be a problem when apache2 is
included into that group.
--
| May 23, 3:18 am 2010 |
| Clemens Buchacher | [PATCH] setup: do not change to work tree prematurely
If the work tree is known and a git command is invoked from within
a git directory, git_setup_directory() will try to find the
relative path from the work tree to the git dir. After doing so it
changes directories to the work tree. It fails to update the
relative path to the git directory, however.
Instead, do not change the working directory at this point and wait
for git_setup_work_tree() to handle this correctly.
This fixes the following bug.
$ cd .git
$ git --work-tree=/tmp/git ...
| May 22, 5:07 pm 2010 |
| Jonathan Nieder | Re: [PATCH] setup: do not change to work tree prematurely
Hi Clemens,
Without your patch applied, I get
$ cd .git
$ git --work-tree=/tmp/git symbolic-ref HEAD
refs/heads/hello
I should have done the following instead:
$ worktree=$(pwd)
$ cd .git
$ git --work-tree="$worktree" symbolic-ref HEAD
If I understand correctly, you made two changes here:
- interpret GIT_WORK_TREE and friends relative to .git instead of
the original cwd (by not calling chdir(retval) before
get_git_work_tree())
- make setup_git_directory stay ...
| May 22, 6:35 pm 2010 |
| Clemens Buchacher | Re: [PATCH] setup: do not change to work tree prematurely
That is not possible, because we return a pointer to cwd plus an
Indeed, if you put it that way, this change does not look good.
Thanks
--
| May 23, 2:14 am 2010 |
| Gelonida | Re: export one commit id from a repository
Thanks a lot for your answer.
That's what I was looking for :-)
--
| May 23, 3:08 am 2010 |
| Andrew Sayers | Re: What's the best way to make my company migrate to Git?
Hi Daniele,
I agree that a lead developer moving a team from graphical SVN is a
different problem. I don't think git-gui does SVN, I couldn't work out
how to make TortioseGit work with SVN, and I doubt EGit will like SVN
very much.
You're also right that git-svn has limitations with merging and
rebasing. Specifically, don't use them unless you know what you're
doing - see `man git-svn` for more. Git-svn is also less
newbie-friendly than either git or svn on its own.
Having said that, ...
| May 23, 7:52 am 2010 |
| Andrew Sayers | Re: What's the best way to make my company migrate to Git?
I had a similar experience - a colleague with a habit of making huge
commits happily cleaned up his act when he was shown this. More
generally, it seems like everyone reacts to the list of git features
with "that one's weird, I don't care about that one, that one's
irritating, WHERE HAS THIS BEEN ALL MY LIFE!, don't care about that one,
that one doesn't make sense...". A major part of selling people on git
is finding the one thing that they each immediately love.
- Andrew
--
| May 23, 8:06 am 2010 |
| Lin Mac | Re: What's the best way to make my company migrate to Git?
I'm a developer who had started to learn git for 1 and a half year,
and start using git for half year. It took me 1 year to make myself
believe that I am ready to use git as my daily working project.
Although I also wants to push my company to use git, but I prefer to
start from one. I "forced" one of my colleague to use git -- I only
use git to share code with him...
My colleague shows amazing insterest on "git add -p".
"see? you could decided what to add to the commit and what no to. ...
| May 23, 2:12 am 2010 |
| Daniele Segato | Re: What's the best way to make my company migrate to Git?
Hi David,
I'm quoting all your email with no cleaning here because I think you did
not included the git mailing list as a mistake.
I KNOW other will not share my view. Another team leader with more
experience then me already told me that "moving to something different
of subversion is of no interest to him because he don't want to learn
something new"[1]. This happened during a random chit-chat when I
casually asked: "what would you think about moving from Subversion to
something more ...
| May 23, 3:46 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: [RFC/PATCHv3] git-instaweb: Add support for running ...
You could easily do (pseudocode):
unless (eval { require Config::Any; 1 }) {
do $conf_file;
} else {
my $parser = Config::Any->new( ... );
$parser->docnf( $conf_file );
}
Then you'd read (eval) a perl config file by default, but remain
compatible with saner config formats for users prepared to install
things from the CPAN.
--
| May 23, 5:38 am 2010 |
| Jakub Narebski | Re: [RFC/PATCHv3] git-instaweb: Add support for running ...
Yes, .psgi file in the (Perl) PSGI/Plack world is, as I understand it,
analogous to .ru file in the (Ruby) Rack world. PSGI/Plack was inspired
by WSGI from Python world and Rack from Ruby world.
There is no web server in Perl core, although probably HTTP::Server::Simple
and HTTP::Engine comes close. Well, there is HTTP::Server::Brick inspired
by WEBrick...
Using PSGI/Plack (via wrapper around CGI) allows easily to serve
gitweb's static files (stylesheet, images, etc.), gives ...
| May 23, 4:17 am 2010 |
| Eric Wong | Re: [RFC/PATCHv3] git-instaweb: Add support for running ...
Hi Jakub,
Yes, the psgi wrapper is acceptable and probably ideal.
My understanding is that the .psgi file is analogous to a .ru file in
the (Ruby) Rack world[1], and having only a .ru file is probably how I
would add Rack support to git-instaweb if WEBrick weren't in Ruby
I don't think we need parsing in the gitweb.psgi wrapper, we'll just
consider gitweb.psgi the config file. This is also the case for
Rack .ru files, which can be made executable and have a shebang
pointing to ...
| May 23, 2:19 am 2010 |
| Eric Wong | Re: [RFC/PATCH] git-instaweb: Add support for running gi ...
Your polling http_is_ready() function is fine, and really the only
portable solution across all servers (and OSes).
But if your webserver lets you run arbitrary code hooks after it
binds the listen socket, what I do when writing integration tests
is have it open a FIFO for writing.
Adapted and abridged from the Rainbows! web server test suite, the
following config snippet is from the config file for the Rainbows! web
server:
---------------- rainbows.conf.rb -----------------
after_fork ...
| May 23, 2:31 am 2010 |
| Jakub Narebski | Re: [RFC/PATCH] git-instaweb: Add support for running gi ...
Well, even if we use the solution below it would be good fallback for
I was thinking about 'flock' function in Perl (and similar in other
languages), and '/usr/bin/flock' utility from util-linux. But using
FIFO as a semaphore might be a better idea: it is slighly more portable,
I guess.
Anyway, Plack handlers have (undocumented!) 'server_ready' option to web
servers, containing callback (code reference). It can be set via
parse_options method of Plack::Runner, for example. It is used ...
| May 23, 1:21 pm 2010 |
| Ævar Arnfjörð Bjarmason | Re: What's cooking extra
On Sun, May 23, 2010 at 12:53, Eyvind Bernhardsen
It is, sanity checks for broken user tools like these are
unfortunately important for Windows adoption of Git.
--
| May 23, 6:26 am 2010 |
| Clemens Buchacher | Re: What's cooking extra
Unsetting crlf/text already disables converting it to LF. The user
would have to change the line endings in his work tree and commit
the file with wrong line endings. I do not see how this can happen
No, I am aware of autocrlf=input, but apparently I did not
understand the meaning of eol=lf correctly. So if a file has CRLF
endings in the repository, and eol=lf, it will _not_ be converted
to LF in the work tree? Conversely, if it has LF endings in the
repository, and eol=crlf, it _will_ be ...
| May 23, 4:51 am 2010 |
| Eyvind Bernhardsen | Re: What's cooking extra
That's because you don't use (or work with people who use) editors that mangle line endings without asking. Modern versions of vi and Emacs don't do this, but the problem still exists in popular Windows editors. I don't have strong feelings about the need for this feature, but it has been requested so it's probably useful.
That is correct, but "eol=lf" means that the file _should_ be LF-only in the repository. If it isn't, the repository is "corrupted". Such a file is marked as dirty when it ...
| May 23, 5:53 am 2010 |
| Eyvind Bernhardsen | Re: What's cooking extra
I appreciate your comments. The more people who take a critical look at the series, the better :) I think most of your concerns were covered during the discussion, but it's always good to have more sanity checks.
Yeah, that's what I initially thought too, but it makes sense to be able to use normalization to prevent line ending breakages in your repository. If a file needs CRLFs for some tool to work, you don't want anyone to inadvertently convert it to LF, and "eol=crlf" makes git enforce ...
| May 23, 3:36 am 2010 |
| Jeff King | Re: Possible bug with argument parsing in git blame
Sorry, I still can't reproduce with:
mkdir repo && cd repo && git init
mkdir subdir
commit() {
echo content >>subdir/file
git add subdir/file
git commit -m foo
}
commit; commit; commit; commit; commit
git blame HEAD~3..HEAD~1 subdir/file >no-dash &&
git blame HEAD~3..HEAD~1 -- subdir/file >dash &&
diff no-dash dash &&
echo ok
So there must be some difference between your setup and my test case.
Can you give more details?
-Peff
PS I tested on ...
| May 23, 1:08 pm 2010 |
| Jeff King | Re: Possible bug with argument parsing in git blame
I can't reproduce the problem here. For example, in git.git, both of the
following produce the same output:
git blame HEAD~5..HEAD~3 alloc.c
git blame HEAD~5..HEAD~3 -- alloc.c
Can you provide the exact set of commands to replicate your repository
state and show the failure?
Also, I tested with the current 'master'. Are you using an older version
of git?
-Peff
--
| May 23, 1:00 am 2010 |
| Clemens Buchacher | Re: [PATCH v2] autocrlf: Make it work also for un-normal ...
I think this is a good change. But it only covers the part where we
translate CR -> LF when staging changes. With Eyvind's patches, if
I understand correctly, it will be possible to convert files to
have LF line endings. Such files will be translated from LF -> CR
when adding changes.
So if the file already has LF line endings, will this cause the
same problem the other way around?
Clemens
--
| May 23, 2:30 am 2010 |
| Jeff King | Re: [tig PATCH] fix off-by-one on parent selection
We may write some new filename into opt_file in the follow_parent_rename
call, but setup_blame_parent_line always diffs the original file. Which
means we lose the line position when following a rename.
We need to do the equivalent of:
git diff -U0 \
opt_ref:opt_file \
blame->commit->id:blame->commit->filename
IOW, to blame directly between the two blobs. Sadly, I don't think there
is a plumbing command to do this, so we are stuck using regular "git
diff", which may have ...
| May 23, 12:55 am 2010 |
| Jeff King | Re: [tig PATCH] fix off-by-one on parent selection
Yeah, that works for me. I was hesitant to do it because I wasn't sure
if other callers were relying on that behavior, but it looks like all
This confused me at first, because those outputs should be the same, but
now I see: the pretty %P does not respect history simplification, so you
get the _true_ parent of b801d8b2b, and not the simplified one when
limiting history to 'tig.c'.
So yes, the rev-list version is better, because it at least realizes
that tig.c has no parent.
But I think ...
| May 23, 12:40 am 2010 |
| Jeff King | Re: Bug with URL-decoding
Yeah, at this point file:// is more or less just an alias for a straight
path (and ssh:// an alias for "host:path" syntax). We correctly
percent-decode http:// URLs because we just hand them to curl, which
does the right thing. We should be decoding these ones when we pick
apart the URL components.
Patch series to follow:
[1/2]: make url-related functions reusable
[2/2]: decode file:// and ssh:// URLs
With these patches, you can do:
git clone file:///tmp/x%2By
or
git ...
| May 23, 2:16 am 2010 |
| Jeff King | [PATCH 1/2] make url-related functions reusable
The is_url function and url percent-decoding functions were
static, but are generally useful. Let's make them available
to other parts of the code.
Signed-off-by: Jeff King <peff@peff.net>
---
There was some minor tweaking of the url_decode functions to be more
generally useful.
Makefile | 1 +
http-backend.c | 59 +--------------------------
transport.c | 51 +-----------------------
url.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
url.h ...
| May 23, 2:17 am 2010 |
| Jeff King | [PATCH 2/2] decode file:// and ssh:// URLs
We generally treat these as equivalent to "/path/to/repo"
and "host:path_to_repo" respectively. However, they are URLs
and as such may be percent-encoded. The current code simply
uses them as-is without any decoding.
With this patch, we will now percent-decode any file:// or
ssh:// url (or ssh+git, git+ssh, etc) at the transport
layer. We continue to treat plain paths and "host:path"
syntax literally.
Signed-off-by: Jeff King <peff@peff.net>
---
I think this also impacts git:// URLs. Which ...
| May 23, 2:19 am 2010 |
| Jeff King | Re: [PATCH] Show branch information in short output of g ...
OK. Nobody else seems to be commenting, so I would go ahead and put
Inline email is best, but I think an email attachment would be preferred
to putting it on some out-of-band service (it's nice for the mailing
list archive to have a record of everything).
-Peff
--
| May 23, 2:23 am 2010 |
| previous day | today | next day |
|---|---|---|
| May 22, 2010 | May 23, 2010 | May 24, 2010 |
| Greg KH | Og dreams of kernels |
| Jens Axboe | [PATCH 31/33] Fusion: sg chaining support |
| Arnd Bergmann | Re: finding your own dead "CONFIG_" variables |
| Mark Brown | [PATCH 2/2] Subject: natsemi: Allow users to disable workaround for DspCfg reset |
| Tony Breeds | [LGUEST] Look in object dir for .config |
git: | |
| Brian Downing | Re: Git in a Nutshell guide |
| John Benes | Re: master has some toys |
| Matthias Lederhofer | [PATCH 4/7] introduce GIT_WORK_TREE to specify the work tree |
| Alexander Sulfrian | [RFC/PATCH] RE: git calls SSH_ASKPASS even if DISPLAY is not set |
| Junio C Hamano | Re: Rss produced by git is not valid xml? |
| Linux Kernel Mailing List | iSeries: fix section mismatch in iseries_veth |
| Linux K |
