2005-04-08 00:13:13 +02:00
|
|
|
#ifndef CACHE_H
|
|
|
|
|
#define CACHE_H
|
|
|
|
|
|
2005-12-05 20:54:29 +01:00
|
|
|
#include "git-compat-util.h"
|
Rewrite convert_to_{git,working_tree} to use strbuf's.
* Now, those functions take an "out" strbuf argument, where they store their
result if any. In that case, it also returns 1, else it returns 0.
* those functions support "in place" editing, in the sense that it's OK to
call them this way:
convert_to_git(path, sb->buf, sb->len, sb);
When doable, conversions are done in place for real, else the strbuf
content is just replaced with the new one, transparentely for the caller.
If you want to create a new filter working this way, being the accumulation
of filter1, filter2, ... filtern, then your meta_filter would be:
int meta_filter(..., const char *src, size_t len, struct strbuf *sb)
{
int ret = 0;
ret |= filter1(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
ret |= filter2(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
....
return ret | filtern(..., src, len, sb);
}
That's why subfilters the convert_to_* functions called were also rewritten
to work this way.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-09-16 15:51:04 +02:00
|
|
|
#include "strbuf.h"
|
Create pathname-based hash-table lookup into index
This creates a hash index of every single file added to the index.
Right now that hash index isn't actually used for much: I implemented a
"cache_name_exists()" function that uses it to efficiently look up a
filename in the index without having to do the O(logn) binary search,
but quite frankly, that's not why this patch is interesting.
No, the whole and only reason to create the hash of the filenames in the
index is that by modifying the hash function, you can fairly easily do
things like making it always hash equivalent names into the same bucket.
That, in turn, means that suddenly questions like "does this name exist
in the index under an _equivalent_ name?" becomes much much cheaper.
Guiding principles behind this patch:
- it shouldn't be too costly. In fact, my primary goal here was to
actually speed up "git commit" with a fully populated kernel tree, by
being faster at checking whether a file already existed in the index. I
did succeed, but only barely:
Best before:
[torvalds@woody linux]$ time git commit > /dev/null
real 0m0.255s
user 0m0.168s
sys 0m0.088s
Best after:
[torvalds@woody linux]$ time ~/git/git commit > /dev/null
real 0m0.233s
user 0m0.144s
sys 0m0.088s
so some things are actually faster (~8%).
Caveat: that's really the best case. Other things are invariably going
to be slightly slower, since we populate that index cache, and quite
frankly, few things really use it to look things up.
That said, the cost is really quite small. The worst case is probably
doing a "git ls-files", which will do very little except puopulate the
index, and never actually looks anything up in it, just lists it.
Before:
[torvalds@woody linux]$ time git ls-files > /dev/null
real 0m0.016s
user 0m0.016s
sys 0m0.000s
After:
[torvalds@woody linux]$ time ~/git/git ls-files > /dev/null
real 0m0.021s
user 0m0.012s
sys 0m0.008s
and while the thing has really gotten relatively much slower, we're
still talking about something almost unmeasurable (eg 5ms). And that
really should be pretty much the worst case.
So we lose 5ms on one "benchmark", but win 22ms on another. Pick your
poison - this patch has the advantage that it will _likely_ speed up
the cases that are complex and expensive more than it slows down the
cases that are already so fast that nobody cares. But if you look at
relative speedups/slowdowns, it doesn't look so good.
- It should be simple and clean
The code may be a bit subtle (the reasons I do hash removal the way I
do etc), but it re-uses the existing hash.c files, so it really is
fairly small and straightforward apart from a few odd details.
Now, this patch on its own doesn't really do much, but I think it's worth
looking at, if only because if done correctly, the name hashing really can
make an improvement to the whole issue of "do we have a filename that
looks like this in the index already". And at least it gets real testing
by being used even by default (ie there is a real use-case for it even
without any insane filesystems).
NOTE NOTE NOTE! The current hash is a joke. I'm ashamed of it, I'm just
not ashamed of it enough to really care. I took all the numbers out of my
nether regions - I'm sure it's good enough that it works in practice, but
the whole point was that you can make a really much fancier hash that
hashes characters not directly, but by their upper-case value or something
like that, and thus you get a case-insensitive hash, while still keeping
the name and the index itself totally case sensitive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-23 03:41:14 +01:00
|
|
|
#include "hash.h"
|
2009-09-09 13:38:58 +02:00
|
|
|
#include "advice.h"
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-04-21 21:33:22 +02:00
|
|
|
#include SHA1_HEADER
|
2008-10-01 20:05:20 +02:00
|
|
|
#ifndef git_SHA_CTX
|
|
|
|
|
#define git_SHA_CTX SHA_CTX
|
|
|
|
|
#define git_SHA1_Init SHA1_Init
|
|
|
|
|
#define git_SHA1_Update SHA1_Update
|
|
|
|
|
#define git_SHA1_Final SHA1_Final
|
|
|
|
|
#endif
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2008-10-01 20:05:20 +02:00
|
|
|
#include <zlib.h>
|
2007-11-07 04:24:28 +01:00
|
|
|
#if defined(NO_DEFLATE_BOUND) || ZLIB_VERNUM < 0x1200
|
2005-04-30 18:51:03 +02:00
|
|
|
#define deflateBound(c,s) ((s) + (((s) + 7) >> 3) + (((s) + 63) >> 6) + 11)
|
|
|
|
|
#endif
|
|
|
|
|
|
2009-01-08 04:54:47 +01:00
|
|
|
void git_inflate_init(z_streamp strm);
|
|
|
|
|
void git_inflate_end(z_streamp strm);
|
|
|
|
|
int git_inflate(z_streamp strm, int flush);
|
|
|
|
|
|
2006-02-26 16:13:46 +01:00
|
|
|
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
|
2005-04-30 18:51:03 +02:00
|
|
|
#define DTYPE(de) ((de)->d_type)
|
|
|
|
|
#else
|
2006-01-20 22:33:20 +01:00
|
|
|
#undef DT_UNKNOWN
|
|
|
|
|
#undef DT_DIR
|
|
|
|
|
#undef DT_REG
|
|
|
|
|
#undef DT_LNK
|
2005-04-30 18:51:03 +02:00
|
|
|
#define DT_UNKNOWN 0
|
|
|
|
|
#define DT_DIR 1
|
|
|
|
|
#define DT_REG 2
|
2005-05-13 02:16:04 +02:00
|
|
|
#define DT_LNK 3
|
2005-04-30 18:51:03 +02:00
|
|
|
#define DTYPE(de) DT_UNKNOWN
|
|
|
|
|
#endif
|
|
|
|
|
|
2007-04-22 18:43:56 +02:00
|
|
|
/* unknown mode (impossible combination S_IFIFO|S_IFCHR) */
|
|
|
|
|
#define S_IFINVALID 0030000
|
|
|
|
|
|
2007-04-10 06:14:58 +02:00
|
|
|
/*
|
|
|
|
|
* A "directory link" is a link to another git directory.
|
|
|
|
|
*
|
|
|
|
|
* The value 0160000 is not normally a valid mode, and
|
|
|
|
|
* also just happens to be S_IFDIR + S_IFLNK
|
|
|
|
|
*
|
|
|
|
|
* NOTE! We *really* shouldn't depend on the S_IFxxx macros
|
|
|
|
|
* always having the same values everywhere. We should use
|
|
|
|
|
* our internal git values for these things, and then we can
|
|
|
|
|
* translate that to the OS-specific value. It just so
|
|
|
|
|
* happens that everybody shares the same bit representation
|
|
|
|
|
* in the UNIX world (and apparently wider too..)
|
|
|
|
|
*/
|
2007-05-21 22:08:28 +02:00
|
|
|
#define S_IFGITLINK 0160000
|
|
|
|
|
#define S_ISGITLINK(m) (((m) & S_IFMT) == S_IFGITLINK)
|
2007-04-10 06:14:58 +02:00
|
|
|
|
2005-07-14 03:46:20 +02:00
|
|
|
/*
|
|
|
|
|
* Intensive research over the course of many years has shown that
|
|
|
|
|
* port 9418 is totally unused by anything else. Or
|
|
|
|
|
*
|
|
|
|
|
* Your search - "port 9418" - did not match any documents.
|
|
|
|
|
*
|
|
|
|
|
* as www.google.com puts it.
|
2005-09-12 20:23:00 +02:00
|
|
|
*
|
|
|
|
|
* This port has been properly assigned for git use by IANA:
|
|
|
|
|
* git (Assigned-9418) [I06-050728-0001].
|
|
|
|
|
*
|
|
|
|
|
* git 9418/tcp git pack transfer service
|
|
|
|
|
* git 9418/udp git pack transfer service
|
|
|
|
|
*
|
|
|
|
|
* with Linus Torvalds <torvalds@osdl.org> as the point of
|
|
|
|
|
* contact. September 2005.
|
|
|
|
|
*
|
|
|
|
|
* See http://www.iana.org/assignments/port-numbers
|
2005-07-14 03:46:20 +02:00
|
|
|
*/
|
|
|
|
|
#define DEFAULT_GIT_PORT 9418
|
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
/*
|
|
|
|
|
* Basic data structures for the directory cache
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define CACHE_SIGNATURE 0x44495243 /* "DIRC" */
|
|
|
|
|
struct cache_header {
|
2005-04-15 19:44:27 +02:00
|
|
|
unsigned int hdr_signature;
|
|
|
|
|
unsigned int hdr_version;
|
|
|
|
|
unsigned int hdr_entries;
|
2005-04-08 00:13:13 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* The "cache_time" is just the low 32 bits of the
|
|
|
|
|
* time. It doesn't matter if it overflows - we only
|
|
|
|
|
* check it for equality in the 32 bits we save.
|
|
|
|
|
*/
|
|
|
|
|
struct cache_time {
|
|
|
|
|
unsigned int sec;
|
|
|
|
|
unsigned int nsec;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* dev/ino/uid/gid/size are also just tracked to the low 32 bits
|
|
|
|
|
* Again - this is just a (very strong in practice) heuristic that
|
|
|
|
|
* the inode hasn't changed.
|
2005-04-15 19:44:27 +02:00
|
|
|
*
|
|
|
|
|
* We save the fields in big-endian order to allow using the
|
|
|
|
|
* index file over NFS transparently.
|
2005-04-08 00:13:13 +02:00
|
|
|
*/
|
2008-01-15 01:03:17 +01:00
|
|
|
struct ondisk_cache_entry {
|
|
|
|
|
struct cache_time ctime;
|
|
|
|
|
struct cache_time mtime;
|
|
|
|
|
unsigned int dev;
|
|
|
|
|
unsigned int ino;
|
|
|
|
|
unsigned int mode;
|
|
|
|
|
unsigned int uid;
|
|
|
|
|
unsigned int gid;
|
|
|
|
|
unsigned int size;
|
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
unsigned short flags;
|
|
|
|
|
char name[FLEX_ARRAY]; /* more */
|
|
|
|
|
};
|
|
|
|
|
|
2008-10-01 06:04:01 +02:00
|
|
|
/*
|
|
|
|
|
* This struct is used when CE_EXTENDED bit is 1
|
|
|
|
|
* The struct must match ondisk_cache_entry exactly from
|
|
|
|
|
* ctime till flags
|
|
|
|
|
*/
|
|
|
|
|
struct ondisk_cache_entry_extended {
|
|
|
|
|
struct cache_time ctime;
|
|
|
|
|
struct cache_time mtime;
|
|
|
|
|
unsigned int dev;
|
|
|
|
|
unsigned int ino;
|
|
|
|
|
unsigned int mode;
|
|
|
|
|
unsigned int uid;
|
|
|
|
|
unsigned int gid;
|
|
|
|
|
unsigned int size;
|
|
|
|
|
unsigned char sha1[20];
|
|
|
|
|
unsigned short flags;
|
|
|
|
|
unsigned short flags2;
|
|
|
|
|
char name[FLEX_ARRAY]; /* more */
|
|
|
|
|
};
|
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
struct cache_entry {
|
make USE_NSEC work as expected
Since the filesystem ext4 is now defined as stable in Linux v2.6.28,
and ext4 supports nanonsecond resolution timestamps natively, it is
time to make USE_NSEC work as expected.
This will make racy git situations less likely to happen. For 'git
checkout' this means it will be less likely that we have to open, read
the contents of the file into RAM, and check if file is really
modified or not. The result sould be a litle less used CPU time, less
pagefaults and a litle faster program, at least for 'git checkout'.
Since the number of possible racy git situations would increase when
disks gets faster, this patch would be more and more helpfull as times
go by. For a fast Solid State Disk, this patch should be helpfull.
Note that, when file operations starts to take less than 1 nanosecond,
one would again start to get more racy git situations.
For more info on racy git, see Documentation/technical/racy-git.txt
For more info on ext4, see http://kernelnewbies.org/Ext4
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-19 21:08:29 +01:00
|
|
|
struct cache_time ce_ctime;
|
|
|
|
|
struct cache_time ce_mtime;
|
2005-04-15 19:44:27 +02:00
|
|
|
unsigned int ce_dev;
|
|
|
|
|
unsigned int ce_ino;
|
|
|
|
|
unsigned int ce_mode;
|
|
|
|
|
unsigned int ce_uid;
|
|
|
|
|
unsigned int ce_gid;
|
|
|
|
|
unsigned int ce_size;
|
2008-01-15 01:03:17 +01:00
|
|
|
unsigned int ce_flags;
|
2005-04-08 00:13:13 +02:00
|
|
|
unsigned char sha1[20];
|
2008-02-23 05:41:17 +01:00
|
|
|
struct cache_entry *next;
|
2006-01-07 10:33:54 +01:00
|
|
|
char name[FLEX_ARRAY]; /* more */
|
2005-04-08 00:13:13 +02:00
|
|
|
};
|
|
|
|
|
|
2005-04-16 07:51:44 +02:00
|
|
|
#define CE_NAMEMASK (0x0fff)
|
|
|
|
|
#define CE_STAGEMASK (0x3000)
|
2008-08-17 08:02:08 +02:00
|
|
|
#define CE_EXTENDED (0x4000)
|
2006-02-09 06:15:24 +01:00
|
|
|
#define CE_VALID (0x8000)
|
2005-04-16 17:33:23 +02:00
|
|
|
#define CE_STAGESHIFT 12
|
2005-04-16 07:51:44 +02:00
|
|
|
|
2008-10-01 06:04:01 +02:00
|
|
|
/*
|
|
|
|
|
* Range 0xFFFF0000 in ce_flags is divided into
|
|
|
|
|
* two parts: in-memory flags and on-disk ones.
|
|
|
|
|
* Flags in CE_EXTENDED_FLAGS will get saved on-disk
|
|
|
|
|
* if you want to save a new flag, add it in
|
|
|
|
|
* CE_EXTENDED_FLAGS
|
|
|
|
|
*
|
|
|
|
|
* In-memory only flags
|
|
|
|
|
*/
|
2008-01-15 01:03:17 +01:00
|
|
|
#define CE_UPDATE (0x10000)
|
|
|
|
|
#define CE_REMOVE (0x20000)
|
2008-01-19 08:45:24 +01:00
|
|
|
#define CE_UPTODATE (0x40000)
|
Make git-add behave more sensibly in a case-insensitive environment
This expands on the previous patch, and allows "git add" to sanely handle
a filename that has changed case, keeping the case in the index constant,
and avoiding aliases.
In particular, if you have an index entry called "File", but the
checked-out tree is case-corrupted and has an entry called "file"
instead, doing a
git add .
(or naming "file" explicitly) will automatically notice that we have an
alias, and will replace the name "file" with the existing index
capitalization (ie "File").
However, if we actually have *both* a file called "File" and one called
"file", and they don't have the same lstat() information (ie we're on a
case-sensitive filesystem but have the "core.ignorecase" flag set), we
will error out if we try to add them both.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-22 22:22:44 +01:00
|
|
|
#define CE_ADDED (0x80000)
|
Fix name re-hashing semantics
We handled the case of removing and re-inserting cache entries badly,
which is something that merging commonly needs to do (removing the
different stages, and then re-inserting one of them as the merged
state).
We even had a rather ugly special case for this failure case, where
replace_index_entry() basically turned itself into a no-op if the new
and the old entries were the same, exactly because the hash routines
didn't handle it on their own.
So what this patch does is to not just have the UNHASHED bit, but a
HASHED bit too, and when you insert an entry into the name hash, that
involves:
- clear the UNHASHED bit, because now it's valid again for lookup
(which is really all that UNHASHED meant)
- if we're being lazy, we're done here (but we still want to clear the
UNHASHED bit regardless of lazy mode, since we can become unlazy
later, and so we need the UNHASHED bit to always be set correctly,
even if we never actually insert the entry into the hash list)
- if it was already hashed, we just leave it on the list
- otherwise mark it HASHED and insert it into the list
this all means that unhashing and rehashing a name all just works
automatically. Obviously, you cannot change the name of an entry (that
would be a serious bug), but nothing can validly do that anyway (you'd
have to allocate a new struct cache_entry anyway since the name length
could change), so that's not a new limitation.
The code actually gets simpler in many ways, although the lazy hashing
does mean that there are a few odd cases (ie something can be marked
unhashed even though it was never on the hash in the first place, and
isn't actually marked hashed!).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-02-23 05:37:40 +01:00
|
|
|
|
|
|
|
|
#define CE_HASHED (0x100000)
|
|
|
|
|
#define CE_UNHASHED (0x200000)
|
2010-01-04 09:02:00 +01:00
|
|
|
#define CE_CONFLICTED (0x800000)
|
2008-01-15 01:03:17 +01:00
|
|
|
|
2009-08-20 15:47:06 +02:00
|
|
|
/* Only remove in work directory, not index */
|
|
|
|
|
#define CE_WT_REMOVE (0x400000)
|
|
|
|
|
|
unpack-trees.c: prepare for looking ahead in the index
This prepares but does not yet implement a look-ahead in the index entries
when traverse-trees.c decides to give us tree entries in an order that
does not match what is in the index.
A case where a look-ahead in the index is necessary happens when merging
branch B into branch A while the index matches the current branch A, using
a tree O as their common ancestor, and these three trees looks like this:
O A B
t t
t-i t-i t-i
t-j t-j
t/1
t/2
The traverse_trees() function gets "t", "t-i" and "t" from trees O, A and
B first, and notices that A may have a matching "t" behind "t-i" and "t-j"
(indeed it does), and tells A to give that entry instead. After unpacking
blob "t" from tree B (as it hasn't changed since O in B and A removed it,
it will result in its removal), it descends into directory "t/".
The side that walked index in parallel to the tree traversal used to be
implemented with one pointer, o->pos, that points at the next index entry
to be processed. When this happens, the pointer o->pos still points at
"t-i" that is the first entry. We should be able to skip "t-i" and "t-j"
and locate "t/1" from the index while the recursive invocation of
traverse_trees() walks and match entries found there, and later come back
to process "t-i".
While that look-ahead is not implemented yet, this adds a flag bit,
CE_UNPACKED, to mark the entries in the index that has already been
processed. o->pos pointer has been renamed to o->cache_bottom and it
points at the first entry that may still need to be processed.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-07 23:59:54 +01:00
|
|
|
#define CE_UNPACKED (0x1000000)
|
|
|
|
|
|
2008-10-01 06:04:01 +02:00
|
|
|
/*
|
|
|
|
|
* Extended on-disk flags
|
|
|
|
|
*/
|
2008-11-29 04:55:25 +01:00
|
|
|
#define CE_INTENT_TO_ADD 0x20000000
|
2009-08-20 15:46:57 +02:00
|
|
|
#define CE_SKIP_WORKTREE 0x40000000
|
2008-10-01 06:04:01 +02:00
|
|
|
/* CE_EXTENDED2 is for future extension */
|
|
|
|
|
#define CE_EXTENDED2 0x80000000
|
|
|
|
|
|
2009-08-20 15:46:57 +02:00
|
|
|
#define CE_EXTENDED_FLAGS (CE_INTENT_TO_ADD | CE_SKIP_WORKTREE)
|
2008-10-01 06:04:01 +02:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Safeguard to avoid saving wrong flags:
|
|
|
|
|
* - CE_EXTENDED2 won't get saved until its semantic is known
|
|
|
|
|
* - Bits in 0x0000FFFF have been saved in ce_flags already
|
|
|
|
|
* - Bits in 0x003F0000 are currently in-memory flags
|
|
|
|
|
*/
|
|
|
|
|
#if CE_EXTENDED_FLAGS & 0x803FFFFF
|
|
|
|
|
#error "CE_EXTENDED_FLAGS out of range"
|
|
|
|
|
#endif
|
|
|
|
|
|
2008-02-23 05:41:17 +01:00
|
|
|
/*
|
|
|
|
|
* Copy the sha1 and stat state of a cache entry from one to
|
|
|
|
|
* another. But we never change the name, or the hash state!
|
|
|
|
|
*/
|
|
|
|
|
#define CE_STATE_MASK (CE_HASHED | CE_UNHASHED)
|
|
|
|
|
static inline void copy_cache_entry(struct cache_entry *dst, struct cache_entry *src)
|
|
|
|
|
{
|
|
|
|
|
unsigned int state = dst->ce_flags & CE_STATE_MASK;
|
|
|
|
|
|
|
|
|
|
/* Don't copy hash chain and name */
|
|
|
|
|
memcpy(dst, src, offsetof(struct cache_entry, next));
|
|
|
|
|
|
|
|
|
|
/* Restore the hash state */
|
|
|
|
|
dst->ce_flags = (dst->ce_flags & ~CE_STATE_MASK) | state;
|
|
|
|
|
}
|
|
|
|
|
|
2008-01-19 08:42:00 +01:00
|
|
|
static inline unsigned create_ce_flags(size_t len, unsigned stage)
|
|
|
|
|
{
|
|
|
|
|
if (len >= CE_NAMEMASK)
|
|
|
|
|
len = CE_NAMEMASK;
|
|
|
|
|
return (len | (stage << CE_STAGESHIFT));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static inline size_t ce_namelen(const struct cache_entry *ce)
|
|
|
|
|
{
|
|
|
|
|
size_t len = ce->ce_flags & CE_NAMEMASK;
|
|
|
|
|
if (len < CE_NAMEMASK)
|
|
|
|
|
return len;
|
|
|
|
|
return strlen(ce->name + CE_NAMEMASK) + CE_NAMEMASK;
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-16 17:33:23 +02:00
|
|
|
#define ce_size(ce) cache_entry_size(ce_namelen(ce))
|
2008-10-01 06:04:01 +02:00
|
|
|
#define ondisk_ce_size(ce) (((ce)->ce_flags & CE_EXTENDED) ? \
|
|
|
|
|
ondisk_cache_entry_extended_size(ce_namelen(ce)) : \
|
|
|
|
|
ondisk_cache_entry_size(ce_namelen(ce)))
|
2008-01-15 01:03:17 +01:00
|
|
|
#define ce_stage(ce) ((CE_STAGEMASK & (ce)->ce_flags) >> CE_STAGESHIFT)
|
2008-01-19 08:45:24 +01:00
|
|
|
#define ce_uptodate(ce) ((ce)->ce_flags & CE_UPTODATE)
|
2009-08-20 15:46:57 +02:00
|
|
|
#define ce_skip_worktree(ce) ((ce)->ce_flags & CE_SKIP_WORKTREE)
|
2008-01-19 08:45:24 +01:00
|
|
|
#define ce_mark_uptodate(ce) ((ce)->ce_flags |= CE_UPTODATE)
|
2005-04-16 17:33:23 +02:00
|
|
|
|
2005-04-17 07:26:31 +02:00
|
|
|
#define ce_permissions(mode) (((mode) & 0100) ? 0755 : 0644)
|
2005-05-05 14:38:25 +02:00
|
|
|
static inline unsigned int create_ce_mode(unsigned int mode)
|
|
|
|
|
{
|
|
|
|
|
if (S_ISLNK(mode))
|
2008-01-15 01:03:17 +01:00
|
|
|
return S_IFLNK;
|
2007-05-21 22:08:28 +02:00
|
|
|
if (S_ISDIR(mode) || S_ISGITLINK(mode))
|
2008-01-15 01:03:17 +01:00
|
|
|
return S_IFGITLINK;
|
|
|
|
|
return S_IFREG | ce_permissions(mode);
|
2005-05-05 14:38:25 +02:00
|
|
|
}
|
2007-02-17 07:43:48 +01:00
|
|
|
static inline unsigned int ce_mode_from_stat(struct cache_entry *ce, unsigned int mode)
|
|
|
|
|
{
|
2007-03-02 22:11:30 +01:00
|
|
|
extern int trust_executable_bit, has_symlinks;
|
|
|
|
|
if (!has_symlinks && S_ISREG(mode) &&
|
2008-01-15 01:03:17 +01:00
|
|
|
ce && S_ISLNK(ce->ce_mode))
|
2007-03-02 22:11:30 +01:00
|
|
|
return ce->ce_mode;
|
2007-02-17 07:43:48 +01:00
|
|
|
if (!trust_executable_bit && S_ISREG(mode)) {
|
2008-01-15 01:03:17 +01:00
|
|
|
if (ce && S_ISREG(ce->ce_mode))
|
2007-02-17 07:43:48 +01:00
|
|
|
return ce->ce_mode;
|
|
|
|
|
return create_ce_mode(0666);
|
|
|
|
|
}
|
|
|
|
|
return create_ce_mode(mode);
|
|
|
|
|
}
|
2008-01-31 10:17:48 +01:00
|
|
|
static inline int ce_to_dtype(const struct cache_entry *ce)
|
|
|
|
|
{
|
|
|
|
|
unsigned ce_mode = ntohl(ce->ce_mode);
|
|
|
|
|
if (S_ISREG(ce_mode))
|
|
|
|
|
return DT_REG;
|
|
|
|
|
else if (S_ISDIR(ce_mode) || S_ISGITLINK(ce_mode))
|
|
|
|
|
return DT_DIR;
|
|
|
|
|
else if (S_ISLNK(ce_mode))
|
|
|
|
|
return DT_LNK;
|
|
|
|
|
else
|
|
|
|
|
return DT_UNKNOWN;
|
|
|
|
|
}
|
2006-03-30 08:55:43 +02:00
|
|
|
#define canon_mode(mode) \
|
|
|
|
|
(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
|
2007-05-21 22:08:28 +02:00
|
|
|
S_ISLNK(mode) ? S_IFLNK : S_ISDIR(mode) ? S_IFDIR : S_IFGITLINK)
|
2005-04-17 07:26:31 +02:00
|
|
|
|
2008-10-01 06:04:01 +02:00
|
|
|
#define flexible_size(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
|
|
|
|
|
#define cache_entry_size(len) flexible_size(cache_entry,len)
|
|
|
|
|
#define ondisk_cache_entry_size(len) flexible_size(ondisk_cache_entry,len)
|
|
|
|
|
#define ondisk_cache_entry_extended_size(len) flexible_size(ondisk_cache_entry_extended,len)
|
2005-04-16 06:45:38 +02:00
|
|
|
|
2007-04-02 03:14:06 +02:00
|
|
|
struct index_state {
|
|
|
|
|
struct cache_entry **cache;
|
|
|
|
|
unsigned int cache_nr, cache_alloc, cache_changed;
|
2009-12-25 09:30:51 +01:00
|
|
|
struct string_list *resolve_undo;
|
2007-04-02 03:14:06 +02:00
|
|
|
struct cache_tree *cache_tree;
|
make USE_NSEC work as expected
Since the filesystem ext4 is now defined as stable in Linux v2.6.28,
and ext4 supports nanonsecond resolution timestamps natively, it is
time to make USE_NSEC work as expected.
This will make racy git situations less likely to happen. For 'git
checkout' this means it will be less likely that we have to open, read
the contents of the file into RAM, and check if file is really
modified or not. The result sould be a litle less used CPU time, less
pagefaults and a litle faster program, at least for 'git checkout'.
Since the number of possible racy git situations would increase when
disks gets faster, this patch would be more and more helpfull as times
go by. For a fast Solid State Disk, this patch should be helpfull.
Note that, when file operations starts to take less than 1 nanosecond,
one would again start to get more racy git situations.
For more info on racy git, see Documentation/technical/racy-git.txt
For more info on ext4, see http://kernelnewbies.org/Ext4
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-19 21:08:29 +01:00
|
|
|
struct cache_time timestamp;
|
2008-01-15 01:03:17 +01:00
|
|
|
void *alloc;
|
unpack_trees(): protect the handcrafted in-core index from read_cache()
unpack_trees() rebuilds the in-core index from scratch by allocating a new
structure and finishing it off by copying the built one to the final
index.
The resulting in-core index is Ok for most use, but read_cache() does not
recognize it as such. The function is meant to be no-op if you already
have loaded the index, until you call discard_cache().
This change the way read_cache() detects an already initialized in-core
index, by introducing an extra bit, and marks the handcrafted in-core
index as initialized, to avoid this problem.
A better fix in the longer term would be to change the read_cache() API so
that it will always discard and re-read from the on-disk index to avoid
confusion. But there are higher level API that have relied on the current
semantics, and they and their users all need to get converted, which is
outside the scope of 'maint' track.
An example of such a higher level API is write_cache_as_tree(), which is
used by git-write-tree as well as later Porcelains like git-merge, revert
and cherry-pick. In the longer term, we should remove read_cache() from
there and add one to cmd_write_tree(); other callers expect that the
in-core index they prepared is what gets written as a tree so no other
change is necessary for this particular codepath.
The original version of this patch marked the index by pointing an
otherwise wasted malloc'ed memory with o->result.alloc, but this version
uses Linus's idea to use a new "initialized" bit, which is conceptually
much cleaner.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-08-23 21:57:30 +02:00
|
|
|
unsigned name_hash_initialized : 1,
|
|
|
|
|
initialized : 1;
|
Create pathname-based hash-table lookup into index
This creates a hash index of every single file added to the index.
Right now that hash index isn't actually used for much: I implemented a
"cache_name_exists()" function that uses it to efficiently look up a
filename in the index without having to do the O(logn) binary search,
but quite frankly, that's not why this patch is interesting.
No, the whole and only reason to create the hash of the filenames in the
index is that by modifying the hash function, you can fairly easily do
things like making it always hash equivalent names into the same bucket.
That, in turn, means that suddenly questions like "does this name exist
in the index under an _equivalent_ name?" becomes much much cheaper.
Guiding principles behind this patch:
- it shouldn't be too costly. In fact, my primary goal here was to
actually speed up "git commit" with a fully populated kernel tree, by
being faster at checking whether a file already existed in the index. I
did succeed, but only barely:
Best before:
[torvalds@woody linux]$ time git commit > /dev/null
real 0m0.255s
user 0m0.168s
sys 0m0.088s
Best after:
[torvalds@woody linux]$ time ~/git/git commit > /dev/null
real 0m0.233s
user 0m0.144s
sys 0m0.088s
so some things are actually faster (~8%).
Caveat: that's really the best case. Other things are invariably going
to be slightly slower, since we populate that index cache, and quite
frankly, few things really use it to look things up.
That said, the cost is really quite small. The worst case is probably
doing a "git ls-files", which will do very little except puopulate the
index, and never actually looks anything up in it, just lists it.
Before:
[torvalds@woody linux]$ time git ls-files > /dev/null
real 0m0.016s
user 0m0.016s
sys 0m0.000s
After:
[torvalds@woody linux]$ time ~/git/git ls-files > /dev/null
real 0m0.021s
user 0m0.012s
sys 0m0.008s
and while the thing has really gotten relatively much slower, we're
still talking about something almost unmeasurable (eg 5ms). And that
really should be pretty much the worst case.
So we lose 5ms on one "benchmark", but win 22ms on another. Pick your
poison - this patch has the advantage that it will _likely_ speed up
the cases that are complex and expensive more than it slows down the
cases that are already so fast that nobody cares. But if you look at
relative speedups/slowdowns, it doesn't look so good.
- It should be simple and clean
The code may be a bit subtle (the reasons I do hash removal the way I
do etc), but it re-uses the existing hash.c files, so it really is
fairly small and straightforward apart from a few odd details.
Now, this patch on its own doesn't really do much, but I think it's worth
looking at, if only because if done correctly, the name hashing really can
make an improvement to the whole issue of "do we have a filename that
looks like this in the index already". And at least it gets real testing
by being used even by default (ie there is a real use-case for it even
without any insane filesystems).
NOTE NOTE NOTE! The current hash is a joke. I'm ashamed of it, I'm just
not ashamed of it enough to really care. I took all the numbers out of my
nether regions - I'm sure it's good enough that it works in practice, but
the whole point was that you can make a really much fancier hash that
hashes characters not directly, but by their upper-case value or something
like that, and thus you get a case-insensitive hash, while still keeping
the name and the index itself totally case sensitive.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-01-23 03:41:14 +01:00
|
|
|
struct hash_table name_hash;
|
2007-04-02 03:14:06 +02:00
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern struct index_state the_index;
|
|
|
|
|
|
2008-03-21 21:16:24 +01:00
|
|
|
/* Name hashing */
|
|
|
|
|
extern void add_name_hash(struct index_state *istate, struct cache_entry *ce);
|
|
|
|
|
/*
|
|
|
|
|
* We don't actually *remove* it, we can just mark it invalid so that
|
|
|
|
|
* we won't find it in lookups.
|
|
|
|
|
*
|
|
|
|
|
* Not only would we have to search the lists (simple enough), but
|
|
|
|
|
* we'd also have to rehash other hash buckets in case this makes the
|
|
|
|
|
* hash bucket empty (common). So it's much better to just mark
|
|
|
|
|
* it.
|
|
|
|
|
*/
|
|
|
|
|
static inline void remove_name_hash(struct cache_entry *ce)
|
|
|
|
|
{
|
|
|
|
|
ce->ce_flags |= CE_UNHASHED;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2007-04-02 08:26:07 +02:00
|
|
|
#ifndef NO_THE_INDEX_COMPATIBILITY_MACROS
|
2007-04-02 03:14:06 +02:00
|
|
|
#define active_cache (the_index.cache)
|
|
|
|
|
#define active_nr (the_index.cache_nr)
|
|
|
|
|
#define active_alloc (the_index.cache_alloc)
|
|
|
|
|
#define active_cache_changed (the_index.cache_changed)
|
|
|
|
|
#define active_cache_tree (the_index.cache_tree)
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2007-04-02 08:26:07 +02:00
|
|
|
#define read_cache() read_index(&the_index)
|
|
|
|
|
#define read_cache_from(path) read_index_from(&the_index, (path))
|
2008-11-14 01:36:30 +01:00
|
|
|
#define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))
|
checkout: Fix "initial checkout" detection
Earlier commit 5521883 (checkout: do not lose staged removal, 2008-09-07)
tightened the rule to prevent switching branches from losing local
changes, so that staged removal of paths can be protected, while
attempting to keep a loophole to still allow a special case of switching
out of an un-checked-out state.
However, the loophole was made a bit too tight, and did not allow
switching from one branch (in an un-checked-out state) to check out
another branch.
The change to builtin-checkout.c in this commit loosens it to allow this,
by not insisting the original commit and the new commit to be the same.
It also introduces a new function, is_index_unborn (and an associated
macro, is_cache_unborn), to check if the repository is truly in an
un-checked-out state more reliably, by making sure that $GIT_INDEX_FILE
did not exist when populating the in-core index structure. A few places
the earlier commit 5521883 added the check for the initial checkout
condition are updated to use this function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-12 20:52:35 +01:00
|
|
|
#define is_cache_unborn() is_index_unborn(&the_index)
|
2008-06-27 18:21:58 +02:00
|
|
|
#define read_cache_unmerged() read_index_unmerged(&the_index)
|
2007-04-02 08:26:07 +02:00
|
|
|
#define write_cache(newfd, cache, entries) write_index(&the_index, (newfd))
|
|
|
|
|
#define discard_cache() discard_index(&the_index)
|
2008-02-07 17:40:13 +01:00
|
|
|
#define unmerged_cache() unmerged_index(&the_index)
|
2007-04-02 08:26:07 +02:00
|
|
|
#define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen))
|
|
|
|
|
#define add_cache_entry(ce, option) add_index_entry(&the_index, (ce), (option))
|
2008-07-21 02:25:56 +02:00
|
|
|
#define rename_cache_entry_at(pos, new_name) rename_index_entry_at(&the_index, (pos), (new_name))
|
2007-04-02 08:26:07 +02:00
|
|
|
#define remove_cache_entry_at(pos) remove_index_entry_at(&the_index, (pos))
|
|
|
|
|
#define remove_file_from_cache(path) remove_file_from_index(&the_index, (path))
|
2008-05-21 21:04:34 +02:00
|
|
|
#define add_to_cache(path, st, flags) add_to_index(&the_index, (path), (st), (flags))
|
|
|
|
|
#define add_file_to_cache(path, flags) add_file_to_index(&the_index, (path), (flags))
|
2009-08-21 10:57:59 +02:00
|
|
|
#define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL)
|
2007-11-10 09:15:03 +01:00
|
|
|
#define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
|
|
|
|
|
#define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
|
2008-03-21 23:55:19 +01:00
|
|
|
#define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))
|
2008-10-16 17:07:26 +02:00
|
|
|
#define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen))
|
2009-12-25 09:30:51 +01:00
|
|
|
#define resolve_undo_clear() resolve_undo_clear_index(&the_index)
|
2009-12-25 22:40:02 +01:00
|
|
|
#define unmerge_cache_entry_at(at) unmerge_index_entry_at(&the_index, at)
|
2009-12-25 20:57:11 +01:00
|
|
|
#define unmerge_cache(pathspec) unmerge_index(&the_index, pathspec)
|
2007-04-02 08:26:07 +02:00
|
|
|
#endif
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2007-02-28 20:45:56 +01:00
|
|
|
enum object_type {
|
|
|
|
|
OBJ_BAD = -1,
|
|
|
|
|
OBJ_NONE = 0,
|
|
|
|
|
OBJ_COMMIT = 1,
|
|
|
|
|
OBJ_TREE = 2,
|
|
|
|
|
OBJ_BLOB = 3,
|
|
|
|
|
OBJ_TAG = 4,
|
|
|
|
|
/* 5 for future expansion */
|
|
|
|
|
OBJ_OFS_DELTA = 6,
|
|
|
|
|
OBJ_REF_DELTA = 7,
|
2008-02-25 22:46:04 +01:00
|
|
|
OBJ_ANY,
|
2007-02-28 20:45:56 +01:00
|
|
|
OBJ_MAX,
|
|
|
|
|
};
|
|
|
|
|
|
2007-12-01 07:22:38 +01:00
|
|
|
static inline enum object_type object_type(unsigned int mode)
|
|
|
|
|
{
|
|
|
|
|
return S_ISDIR(mode) ? OBJ_TREE :
|
|
|
|
|
S_ISGITLINK(mode) ? OBJ_COMMIT :
|
|
|
|
|
OBJ_BLOB;
|
|
|
|
|
}
|
|
|
|
|
|
2005-05-10 07:57:58 +02:00
|
|
|
#define GIT_DIR_ENVIRONMENT "GIT_DIR"
|
2007-06-06 09:10:42 +02:00
|
|
|
#define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
|
2005-05-10 07:57:58 +02:00
|
|
|
#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
|
2005-05-10 02:57:56 +02:00
|
|
|
#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
|
2005-04-21 19:55:18 +02:00
|
|
|
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
|
2005-07-30 09:58:28 +02:00
|
|
|
#define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
|
2006-12-19 10:28:15 +01:00
|
|
|
#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
|
|
|
|
|
#define CONFIG_ENVIRONMENT "GIT_CONFIG"
|
|
|
|
|
#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
|
2008-05-20 08:49:26 +02:00
|
|
|
#define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
|
2009-11-18 07:50:58 +01:00
|
|
|
#define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS"
|
Add basic infrastructure to assign attributes to paths
This adds the basic infrastructure to assign attributes to
paths, in a way similar to what the exclusion mechanism does
based on $GIT_DIR/info/exclude and .gitignore files.
An attribute is just a simple string that does not contain any
whitespace. They can be specified in $GIT_DIR/info/attributes
file, and .gitattributes file in each directory.
Each line in these files defines a pattern matching rule.
Similar to the exclusion mechanism, a later match overrides an
earlier match in the same file, and entries from .gitattributes
file in the same directory takes precedence over the ones from
parent directories. Lines in $GIT_DIR/info/attributes file are
used as the lowest precedence default rules.
A line is either a comment (an empty line, or a line that begins
with a '#'), or a rule, which is a whitespace separated list of
tokens. The first token on the line is a shell glob pattern.
The rest are names of attributes, each of which can optionally
be prefixed with '!'. Such a line means "if a path matches this
glob, this attribute is set (or unset -- if the attribute name
is prefixed with '!'). For glob matching, the same "if the
pattern does not have a slash in it, the basename of the path is
matched with fnmatch(3) against the pattern, otherwise, the path
is matched with the pattern with FNM_PATHNAME" rule as the
exclusion mechanism is used.
This does not define what an attribute means. Tying an
attribute to various effects it has on git operation for paths
that have it will be specified separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-12 10:07:32 +02:00
|
|
|
#define GITATTRIBUTES_FILE ".gitattributes"
|
|
|
|
|
#define INFOATTRIBUTES_FILE "info/attributes"
|
attribute macro support
This adds "attribute macros" (for lack of better name). So far,
we have low-level attributes such as crlf and diff, which are
defined in operational terms --- setting or unsetting them on a
particular path directly affects what is done to the path. For
example, in order to decline diffs or crlf conversions on a
binary blob, no diffs on PostScript files, and treat all other
files normally, you would have something like these:
* diff crlf
*.ps !diff
proprietary.o !diff !crlf
That is fine as the operation goes, but gets unwieldy rather
rapidly, when we start adding more low-level attributes that are
defined in operational terms. A near-term example of such an
attribute would be 'merge-3way' which would control if git
should attempt the usual 3-way file-level merge internally, or
leave merging to a specialized external program of user's
choice. When it is added, we do _not_ want to force the users
to update the above to:
* diff crlf merge-3way
*.ps !diff
proprietary.o !diff !crlf !merge-3way
The way this patch solves this issue is to realize that the
attributes the user is assigning to paths are not defined in
terms of operations but in terms of what they are.
All of the three low-level attributes usually make sense for
most of the files that sane SCM users have git operate on (these
files are typically called "text'). Only a few cases, such as
binary blob, need exception to decline the "usual treatment
given to text files" -- and people mark them as "binary".
So this allows the $GIT_DIR/info/alternates and .gitattributes
at the toplevel of the project to also specify attributes that
assigns other attributes. The syntax is '[attr]' followed by an
attribute name followed by a list of attribute names:
[attr] binary !diff !crlf !merge-3way
When "binary" attribute is set to a path, if the path has not
got diff/crlf/merge-3way attribute set or unset by other rules,
this rule unsets the three low-level attributes.
It is expected that the user level .gitattributes will be
expressed mostly in terms of attributes based on what the files
are, and the above sample would become like this:
(built-in attribute configuration)
[attr] binary !diff !crlf !merge-3way
* diff crlf merge-3way
(project specific .gitattributes)
proprietary.o binary
(user preference $GIT_DIR/info/attributes)
*.ps !diff
There are a few caveats.
* As described above, you can define these macros only in
$GIT_DIR/info/attributes and toplevel .gitattributes.
* There is no attempt to detect circular definition of macro
attributes, and definitions are evaluated from bottom to top
as usual to fill in other attributes that have not yet got
values. The following would work as expected:
[attr] text diff crlf
[attr] ps text !diff
*.ps ps
while this would most likely not (I haven't tried):
[attr] ps text !diff
[attr] text diff crlf
*.ps ps
* When a macro says "[attr] A B !C", saying that a path does
not have attribute A does not let you tell anything about
attributes B or C. That is, given this:
[attr] text diff crlf
[attr] ps text !diff
*.txt !ps
path hello.txt, which would match "*.txt" pattern, would have
"ps" attribute set to zero, but that does not make text
attribute of hello.txt set to false (nor diff attribute set to
true).
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-14 17:54:37 +02:00
|
|
|
#define ATTRIBUTE_MACRO_PREFIX "[attr]"
|
2009-10-09 12:21:57 +02:00
|
|
|
#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
|
|
|
|
|
#define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
|
2010-03-12 18:04:26 +01:00
|
|
|
#define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF"
|
2010-03-12 18:04:32 +01:00
|
|
|
#define GIT_NOTES_REWRITE_REF_ENVIRONMENT "GIT_NOTES_REWRITE_REF"
|
|
|
|
|
#define GIT_NOTES_REWRITE_MODE_ENVIRONMENT "GIT_NOTES_REWRITE_MODE"
|
2005-04-21 19:55:18 +02:00
|
|
|
|
2010-02-25 00:34:14 +01:00
|
|
|
/*
|
|
|
|
|
* Repository-local GIT_* environment variables
|
|
|
|
|
* The array is NULL-terminated to simplify its usage in contexts such
|
|
|
|
|
* environment creation or simple walk of the list.
|
|
|
|
|
* The number of non-NULL entries is available as a macro.
|
|
|
|
|
*/
|
|
|
|
|
#define LOCAL_REPO_ENV_SIZE 8
|
|
|
|
|
extern const char *const local_repo_env[LOCAL_REPO_ENV_SIZE + 1];
|
|
|
|
|
|
2007-01-07 11:00:28 +01:00
|
|
|
extern int is_bare_repository_cfg;
|
|
|
|
|
extern int is_bare_repository(void);
|
2007-01-20 03:09:34 +01:00
|
|
|
extern int is_inside_git_dir(void);
|
Clean up work-tree handling
The old version of work-tree support was an unholy mess, barely readable,
and not to the point.
For example, why do you have to provide a worktree, when it is not used?
As in "git status". Now it works.
Another riddle was: if you can have work trees inside the git dir, why
are some programs complaining that they need a work tree?
IOW it is allowed to call
$ git --git-dir=../ --work-tree=. bla
when you really want to. In this case, you are both in the git directory
and in the working tree. So, programs have to actually test for the right
thing, namely if they are inside a working tree, and not if they are
inside a git directory.
Also, GIT_DIR=../.git should behave the same as if no GIT_DIR was
specified, unless there is a repository in the current working directory.
It does now.
The logic to determine if a repository is bare, or has a work tree
(tertium non datur), is this:
--work-tree=bla overrides GIT_WORK_TREE, which overrides core.bare = true,
which overrides core.worktree, which overrides GIT_DIR/.. when GIT_DIR
ends in /.git, which overrides the directory in which .git/ was found.
In related news, a long standing bug was fixed: when in .git/bla/x.git/,
which is a bare repository, git formerly assumed ../.. to be the
appropriate git dir. This problem was reported by Shawn Pearce to have
caused much pain, where a colleague mistakenly ran "git init" in "/" a
long time ago, and bare repositories just would not work.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-01 02:30:14 +02:00
|
|
|
extern char *git_work_tree_cfg;
|
2007-06-06 09:10:42 +02:00
|
|
|
extern int is_inside_work_tree(void);
|
2008-09-27 10:41:50 +02:00
|
|
|
extern int have_git_dir(void);
|
2006-08-23 12:39:11 +02:00
|
|
|
extern const char *get_git_dir(void);
|
2005-05-10 07:57:58 +02:00
|
|
|
extern char *get_object_directory(void);
|
|
|
|
|
extern char *get_index_file(void);
|
2005-07-30 09:58:28 +02:00
|
|
|
extern char *get_graft_file(void);
|
2007-08-01 02:29:38 +02:00
|
|
|
extern int set_git_dir(const char *path);
|
Clean up work-tree handling
The old version of work-tree support was an unholy mess, barely readable,
and not to the point.
For example, why do you have to provide a worktree, when it is not used?
As in "git status". Now it works.
Another riddle was: if you can have work trees inside the git dir, why
are some programs complaining that they need a work tree?
IOW it is allowed to call
$ git --git-dir=../ --work-tree=. bla
when you really want to. In this case, you are both in the git directory
and in the working tree. So, programs have to actually test for the right
thing, namely if they are inside a working tree, and not if they are
inside a git directory.
Also, GIT_DIR=../.git should behave the same as if no GIT_DIR was
specified, unless there is a repository in the current working directory.
It does now.
The logic to determine if a repository is bare, or has a work tree
(tertium non datur), is this:
--work-tree=bla overrides GIT_WORK_TREE, which overrides core.bare = true,
which overrides core.worktree, which overrides GIT_DIR/.. when GIT_DIR
ends in /.git, which overrides the directory in which .git/ was found.
In related news, a long standing bug was fixed: when in .git/bla/x.git/,
which is a bare repository, git formerly assumed ../.. to be the
appropriate git dir. This problem was reported by Shawn Pearce to have
caused much pain, where a colleague mistakenly ran "git init" in "/" a
long time ago, and bare repositories just would not work.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-08-01 02:30:14 +02:00
|
|
|
extern const char *get_git_work_tree(void);
|
2008-02-20 23:13:13 +01:00
|
|
|
extern const char *read_gitfile_gently(const char *path);
|
2008-04-27 19:39:21 +02:00
|
|
|
extern void set_git_work_tree(const char *tree);
|
2005-05-10 07:57:58 +02:00
|
|
|
|
|
|
|
|
#define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
|
2005-04-21 19:55:18 +02:00
|
|
|
|
2005-09-21 09:00:47 +02:00
|
|
|
extern const char **get_pathspec(const char *prefix, const char **pathspec);
|
2007-11-03 12:23:11 +01:00
|
|
|
extern void setup_work_tree(void);
|
2005-11-26 08:14:15 +01:00
|
|
|
extern const char *setup_git_directory_gently(int *);
|
2005-08-17 03:06:34 +02:00
|
|
|
extern const char *setup_git_directory(void);
|
2005-09-21 09:00:47 +02:00
|
|
|
extern const char *prefix_path(const char *prefix, int len, const char *path);
|
2005-11-26 08:14:15 +01:00
|
|
|
extern const char *prefix_filename(const char *prefix, int len, const char *path);
|
2009-10-18 09:27:24 +02:00
|
|
|
extern int check_filename(const char *prefix, const char *name);
|
2006-04-26 19:15:54 +02:00
|
|
|
extern void verify_filename(const char *prefix, const char *name);
|
2006-04-27 00:09:27 +02:00
|
|
|
extern void verify_non_filename(const char *prefix, const char *name);
|
2005-08-17 03:06:34 +02:00
|
|
|
|
2008-04-27 19:39:27 +02:00
|
|
|
#define INIT_DB_QUIET 0x0001
|
|
|
|
|
|
|
|
|
|
extern int init_db(const char *template_dir, unsigned int flags);
|
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
#define alloc_nr(x) (((x)+16)*3/2)
|
|
|
|
|
|
2007-06-11 15:39:44 +02:00
|
|
|
/*
|
|
|
|
|
* Realloc the buffer pointed at by variable 'x' so that it can hold
|
|
|
|
|
* at least 'nr' entries; the number of entries currently allocated
|
|
|
|
|
* is 'alloc', using the standard growing factor alloc_nr() macro.
|
|
|
|
|
*
|
|
|
|
|
* DO NOT USE any expression with side-effect for 'x' or 'alloc'.
|
|
|
|
|
*/
|
|
|
|
|
#define ALLOC_GROW(x, nr, alloc) \
|
|
|
|
|
do { \
|
2007-06-17 00:37:39 +02:00
|
|
|
if ((nr) > alloc) { \
|
Extend --pretty=oneline to cover the first paragraph,
so that an ugly commit message like this can be
handled sanely.
Currently, --pretty=oneline and --pretty=email (hence
format-patch) take and use only the first line of the commit log
message. This changes them to:
- Take the first paragraph, where the definition of the first
paragraph is "skip all blank lines from the beginning, and
then grab everything up to the next empty line".
- Replace all line breaks with a whitespace.
This change would not affect a well-behaved commit message that
adheres to the convention of "single line summary, a blank line,
and then body of message", as its first paragraph always
consists of a single line. Commit messages from different
culture, such as the ones imported from CVS/SVN, can however get
chomped with the existing behaviour at the first linebreak in
the middle of sentence right now, which would become much easier
to see with this change.
The Subject: and --pretty=oneline output would become very long
and unsightly for non-conforming commits, but their messages are
already ugly anyway, and thischange at least avoids the loss of
information.
The Subject: line from a multi-line paragraph is folded using
RFC2822 line folding rules at the places where line breaks were
in the original.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-06-12 07:10:55 +02:00
|
|
|
if (alloc_nr(alloc) < (nr)) \
|
|
|
|
|
alloc = (nr); \
|
|
|
|
|
else \
|
|
|
|
|
alloc = alloc_nr(alloc); \
|
2007-06-11 15:39:44 +02:00
|
|
|
x = xrealloc((x), alloc * sizeof(*(x))); \
|
|
|
|
|
} \
|
|
|
|
|
} while(0)
|
|
|
|
|
|
2005-04-09 18:48:20 +02:00
|
|
|
/* Initialize and use the cache information */
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int read_index(struct index_state *);
|
2008-11-14 01:36:30 +01:00
|
|
|
extern int read_index_preload(struct index_state *, const char **pathspec);
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int read_index_from(struct index_state *, const char *path);
|
checkout: Fix "initial checkout" detection
Earlier commit 5521883 (checkout: do not lose staged removal, 2008-09-07)
tightened the rule to prevent switching branches from losing local
changes, so that staged removal of paths can be protected, while
attempting to keep a loophole to still allow a special case of switching
out of an un-checked-out state.
However, the loophole was made a bit too tight, and did not allow
switching from one branch (in an un-checked-out state) to check out
another branch.
The change to builtin-checkout.c in this commit loosens it to allow this,
by not insisting the original commit and the new commit to be the same.
It also introduces a new function, is_index_unborn (and an associated
macro, is_cache_unborn), to check if the repository is truly in an
un-checked-out state more reliably, by making sure that $GIT_INDEX_FILE
did not exist when populating the in-core index structure. A few places
the earlier commit 5521883 added the check for the initial checkout
condition are updated to use this function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-11-12 20:52:35 +01:00
|
|
|
extern int is_index_unborn(struct index_state *);
|
2008-06-27 18:21:58 +02:00
|
|
|
extern int read_index_unmerged(struct index_state *);
|
write_index(): update index_state->timestamp after flushing to disk
Since this timestamp is used to check for racy-clean files, it is
important to keep it uptodate.
For the 'git checkout' command without the '-q' option, this make a
huge difference. Before, each and every file which was updated, was
racy-clean after the call to unpack_trees() and write_index() but
before the GIT process ended.
And because of the call to show_local_changes() in builtin-checkout.c,
we ended up reading those files back into memory, doing a SHA1 to
check if the files was really different from the index. And, of
course, no file was different.
With this fix, 'git checkout' without the '-q' option should now be
almost as fast as with the '-q' option, but not quite, as we still do
some few lstat(2) calls more without the '-q' option.
Below is some average numbers for 10 checkout's to v2.6.27 and 10 to
v2.6.25 of the Linux kernel, to show the difference:
before (git version 1.6.2.rc1.256.g58a87):
7.860 user 2.427 sys 19.465 real 52.8% CPU faults: 0 major 95331 minor
after:
6.184 user 2.160 sys 17.619 real 47.4% CPU faults: 0 major 38994 minor
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-23 19:02:57 +01:00
|
|
|
extern int write_index(struct index_state *, int newfd);
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int discard_index(struct index_state *);
|
2008-03-06 21:46:09 +01:00
|
|
|
extern int unmerged_index(const struct index_state *);
|
2006-05-18 21:07:31 +02:00
|
|
|
extern int verify_path(const char *path);
|
2008-03-21 23:55:19 +01:00
|
|
|
extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
|
2008-03-06 21:46:09 +01:00
|
|
|
extern int index_name_pos(const struct index_state *, const char *name, int namelen);
|
2005-05-08 06:55:21 +02:00
|
|
|
#define ADD_CACHE_OK_TO_ADD 1 /* Ok to add */
|
|
|
|
|
#define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */
|
2005-06-25 11:25:29 +02:00
|
|
|
#define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */
|
2007-08-09 22:42:50 +02:00
|
|
|
#define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */
|
2008-08-21 10:44:53 +02:00
|
|
|
#define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
|
2008-07-21 02:25:56 +02:00
|
|
|
extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int remove_index_entry_at(struct index_state *, int pos);
|
check_updates(): effective removal of cache entries marked CE_REMOVE
Below is oprofile output from GIT command 'git chekcout -q my-v2.6.25'
(move from tag v2.6.27 to tag v2.6.25 of the Linux kernel):
CPU: Core 2, speed 1999.95 MHz (estimated)
Counted CPU_CLK_UNHALTED events (Clock cycles when not halted) with a unit
mask of 0x00 (Unhalted core cycles) count 20000
Counted INST_RETIRED_ANY_P events (number of instructions retired) with a
unit mask of 0x00 (No unit mask) count 20000
CPU_CLK_UNHALT...|INST_RETIRED:2...|
samples| %| samples| %|
------------------------------------
409247 100.000 342878 100.000 git
CPU_CLK_UNHALT...|INST_RETIRED:2...|
samples| %| samples| %|
------------------------------------
260476 63.6476 257843 75.1996 libz.so.1.2.3
100876 24.6492 64378 18.7758 kernel-2.6.28.4_2.vmlinux
30850 7.5382 7874 2.2964 libc-2.9.so
14775 3.6103 8390 2.4469 git
2020 0.4936 4325 1.2614 libcrypto.so.0.9.8
191 0.0467 32 0.0093 libpthread-2.9.so
58 0.0142 36 0.0105 ld-2.9.so
1 2.4e-04 0 0 libldap-2.3.so.0.2.31
Detail list of the top 20 function entries (libz counted in one blob):
CPU_CLK_UNHALTED INST_RETIRED_ANY_P
samples % samples % image name symbol name
260476 63.6862 257843 75.2725 libz.so.1.2.3 /lib/libz.so.1.2.3
16587 4.0555 3636 1.0615 libc-2.9.so memcpy
7710 1.8851 277 0.0809 libc-2.9.so memmove
3679 0.8995 1108 0.3235 kernel-2.6.28.4_2.vmlinux d_validate
3546 0.8670 2607 0.7611 kernel-2.6.28.4_2.vmlinux __getblk
3174 0.7760 1813 0.5293 libc-2.9.so _int_malloc
2396 0.5858 3681 1.0746 kernel-2.6.28.4_2.vmlinux copy_to_user
2270 0.5550 2528 0.7380 kernel-2.6.28.4_2.vmlinux __link_path_walk
2205 0.5391 1797 0.5246 kernel-2.6.28.4_2.vmlinux ext4_mark_iloc_dirty
2103 0.5142 1203 0.3512 kernel-2.6.28.4_2.vmlinux find_first_zero_bit
2077 0.5078 997 0.2911 kernel-2.6.28.4_2.vmlinux do_get_write_access
2070 0.5061 514 0.1501 git cache_name_compare
2043 0.4995 1501 0.4382 kernel-2.6.28.4_2.vmlinux rcu_irq_exit
2022 0.4944 1732 0.5056 kernel-2.6.28.4_2.vmlinux __ext4_get_inode_loc
2020 0.4939 4325 1.2626 libcrypto.so.0.9.8 /usr/lib/libcrypto.so.0.9.8
1965 0.4804 1384 0.4040 git patch_delta
1708 0.4176 984 0.2873 kernel-2.6.28.4_2.vmlinux rcu_sched_grace_period
1682 0.4112 727 0.2122 kernel-2.6.28.4_2.vmlinux sysfs_slab_alias
1659 0.4056 290 0.0847 git find_pack_entry_one
1480 0.3619 1307 0.3816 kernel-2.6.28.4_2.vmlinux ext4_writepage_trans_blocks
Notice the memmove line, where the CPU did 7710 / 277 = 27.8 cycles
per instruction, and compared to the total cycles spent inside the
source code of GIT for this command, all the memmove() calls
translates to (7710 * 100) / 14775 = 52.2% of this.
Retesting with a GIT program compiled for gcov usage, I found out that
the memmove() calls came from remove_index_entry_at() in read-cache.c,
where we have:
memmove(istate->cache + pos,
istate->cache + pos + 1,
(istate->cache_nr - pos) * sizeof(struct cache_entry *));
remove_index_entry_at() is called 4902 times from check_updates() in
unpack-trees.c, and each time called we move each cache_entry pointers
(from the removed one) one step to the left.
Since we have 28828 entries in the cache this time, and if we on
average move half of them each time, we in total move approximately
4902 * 0.5 * 28828 * 4 = 282 629 712 bytes, or twice this amount if
each pointer is 8 bytes (64 bit).
OK, is seems that the function check_updates() is called 28 times, so
the estimated guess above had been more correct if check_updates() had
been called only once, but the point is: we get lots of bytes moved.
To fix this, and use an O(N) algorithm instead, where N is the number
of cache_entries, we delete/remove all entries in one loop through all
entries.
From a retest, the new remove_marked_cache_entries() from the patch
below, ended up with the following output line from oprofile:
46 0.0105 15 0.0041 git remove_marked_cache_entries
If we can trust the numbers from oprofile in this case, we saved
approximately ((7710 - 46) * 20000) / (2 * 1000 * 1000 * 1000) = 0.077
seconds CPU time with this fix for this particular test. And notice
that now the CPU did only 46 / 15 = 3.1 cycles/instruction.
Signed-off-by: Kjetil Barvik <barvik@broadpark.no>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-02-18 23:18:03 +01:00
|
|
|
extern void remove_marked_cache_entries(struct index_state *istate);
|
2007-04-02 08:26:07 +02:00
|
|
|
extern int remove_file_from_index(struct index_state *, const char *path);
|
2008-05-21 21:04:34 +02:00
|
|
|
#define ADD_CACHE_VERBOSE 1
|
|
|
|
|
#define ADD_CACHE_PRETEND 2
|
2008-05-25 23:03:50 +02:00
|
|
|
#define ADD_CACHE_IGNORE_ERRORS 4
|
2008-07-21 10:24:17 +02:00
|
|
|
#define ADD_CACHE_IGNORE_REMOVAL 8
|
2008-08-21 10:44:53 +02:00
|
|
|
#define ADD_CACHE_INTENT 16
|
2008-05-21 21:04:34 +02:00
|
|
|
extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags);
|
|
|
|
|
extern int add_file_to_index(struct index_state *, const char *path, int flags);
|
2007-09-11 05:17:28 +02:00
|
|
|
extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh);
|
2005-05-15 04:04:25 +02:00
|
|
|
extern int ce_same_name(struct cache_entry *a, struct cache_entry *b);
|
2008-10-16 17:07:26 +02:00
|
|
|
extern int index_name_is_other(const struct index_state *, const char *, int);
|
2007-11-10 09:15:03 +01:00
|
|
|
|
|
|
|
|
/* do stat comparison even if CE_VALID is true */
|
|
|
|
|
#define CE_MATCH_IGNORE_VALID 01
|
|
|
|
|
/* do not check the contents but report dirty on racily-clean entries */
|
2009-12-14 12:43:58 +01:00
|
|
|
#define CE_MATCH_RACY_IS_DIRTY 02
|
|
|
|
|
/* do stat comparison even if CE_SKIP_WORKTREE is true */
|
|
|
|
|
#define CE_MATCH_IGNORE_SKIP_WORKTREE 04
|
2008-03-06 21:46:09 +01:00
|
|
|
extern int ie_match_stat(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
|
|
|
|
|
extern int ie_modified(const struct index_state *, struct cache_entry *, struct stat *, unsigned int);
|
2007-11-10 09:15:03 +01:00
|
|
|
|
2005-07-15 01:55:06 +02:00
|
|
|
extern int ce_path_match(const struct cache_entry *ce, const char **pathspec);
|
2007-02-28 20:52:04 +01:00
|
|
|
extern int index_fd(unsigned char *sha1, int fd, struct stat *st, int write_object, enum object_type type, const char *path);
|
2005-10-07 12:42:00 +02:00
|
|
|
extern int index_path(unsigned char *sha1, const char *path, struct stat *st, int write_object);
|
2005-05-15 23:23:12 +02:00
|
|
|
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
|
|
|
|
|
|
2006-05-19 18:56:35 +02:00
|
|
|
#define REFRESH_REALLY 0x0001 /* ignore_valid */
|
|
|
|
|
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
|
|
|
|
|
#define REFRESH_QUIET 0x0004 /* be quiet about it */
|
|
|
|
|
#define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */
|
2008-07-20 08:25:00 +02:00
|
|
|
#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
|
2009-08-21 10:57:58 +02:00
|
|
|
#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
|
2009-08-21 10:57:59 +02:00
|
|
|
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen, char *header_msg);
|
2006-05-19 18:56:35 +02:00
|
|
|
|
2006-06-06 21:51:49 +02:00
|
|
|
struct lock_file {
|
|
|
|
|
struct lock_file *next;
|
2007-11-13 21:05:03 +01:00
|
|
|
int fd;
|
2007-04-21 12:11:10 +02:00
|
|
|
pid_t owner;
|
2007-01-02 20:19:05 +01:00
|
|
|
char on_list;
|
2006-06-06 21:51:49 +02:00
|
|
|
char filename[PATH_MAX];
|
2005-05-15 23:23:12 +02:00
|
|
|
};
|
2008-10-18 00:44:39 +02:00
|
|
|
#define LOCK_DIE_ON_ERROR 1
|
|
|
|
|
#define LOCK_NODEREF 2
|
2009-09-27 01:15:09 +02:00
|
|
|
extern int unable_to_lock_error(const char *path, int err);
|
2009-02-19 13:54:18 +01:00
|
|
|
extern NORETURN void unable_to_lock_index_die(const char *path, int err);
|
2006-08-12 10:03:47 +02:00
|
|
|
extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
|
2008-04-18 01:32:26 +02:00
|
|
|
extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
|
2006-06-06 21:51:49 +02:00
|
|
|
extern int commit_lock_file(struct lock_file *);
|
_GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.
When defined, this allows plumbing commands that update the
index (add, apply, checkout-index, merge-recursive, mv,
read-tree, rm, update-index, and write-tree) to write their
resulting index to an alternative index file while holding a
lock to the original index file. With this, git-commit that
jumps the index does not have to make an extra copy of the index
file, and more importantly, it can do the update while holding
the lock on the index.
However, I think the interface to let an environment variable
specify the output is a mistake, as shown in the documentation.
If a curious user has the environment variable set to something
other than the file GIT_INDEX_FILE points at, almost everything
will break. This should instead be a command line parameter to
tell these plumbing commands to write the result in the named
file, to prevent stupid mistakes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-04-01 08:09:02 +02:00
|
|
|
|
|
|
|
|
extern int hold_locked_index(struct lock_file *, int);
|
|
|
|
|
extern int commit_locked_index(struct lock_file *);
|
2007-04-01 08:27:41 +02:00
|
|
|
extern void set_alternate_index_output(const char *);
|
2008-01-16 20:05:32 +01:00
|
|
|
extern int close_lock_file(struct lock_file *);
|
2006-06-06 21:51:49 +02:00
|
|
|
extern void rollback_lock_file(struct lock_file *);
|
2008-10-26 03:33:56 +01:00
|
|
|
extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
|
2005-04-09 18:48:20 +02:00
|
|
|
|
2006-02-27 23:47:45 +01:00
|
|
|
/* Environment bits from configuration mechanism */
|
2005-10-11 01:31:08 +02:00
|
|
|
extern int trust_executable_bit;
|
2008-07-28 08:31:28 +02:00
|
|
|
extern int trust_ctime;
|
2007-06-25 00:11:24 +02:00
|
|
|
extern int quote_path_fully;
|
2007-03-02 22:11:30 +01:00
|
|
|
extern int has_symlinks;
|
2008-03-22 00:52:46 +01:00
|
|
|
extern int ignore_case;
|
2006-02-09 06:15:24 +01:00
|
|
|
extern int assume_unchanged;
|
2006-05-02 09:40:24 +02:00
|
|
|
extern int prefer_symlink_refs;
|
2006-05-17 11:55:40 +02:00
|
|
|
extern int log_all_ref_updates;
|
2006-03-21 03:45:47 +01:00
|
|
|
extern int warn_ambiguous_refs;
|
2005-12-22 23:13:56 +01:00
|
|
|
extern int shared_repository;
|
2006-02-27 23:47:45 +01:00
|
|
|
extern const char *apply_default_whitespace;
|
2009-08-04 13:16:49 +02:00
|
|
|
extern const char *apply_default_ignorewhitespace;
|
2006-07-03 22:11:47 +02:00
|
|
|
extern int zlib_compression_level;
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 22:56:50 +02:00
|
|
|
extern int core_compression_level;
|
|
|
|
|
extern int core_compression_seen;
|
2006-12-23 08:34:28 +01:00
|
|
|
extern size_t packed_git_window_size;
|
2006-12-23 08:33:35 +01:00
|
|
|
extern size_t packed_git_limit;
|
2007-03-19 06:14:37 +01:00
|
|
|
extern size_t delta_base_cache_limit;
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 20:07:23 +01:00
|
|
|
extern int auto_crlf;
|
2009-01-23 10:07:46 +01:00
|
|
|
extern int read_replace_refs;
|
2008-06-19 00:18:44 +02:00
|
|
|
extern int fsync_object_files;
|
2008-11-14 01:36:30 +01:00
|
|
|
extern int core_preload_index;
|
2009-08-20 15:47:08 +02:00
|
|
|
extern int core_apply_sparse_checkout;
|
2005-10-11 01:31:08 +02:00
|
|
|
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 12:25:58 +01:00
|
|
|
enum safe_crlf {
|
|
|
|
|
SAFE_CRLF_FALSE = 0,
|
|
|
|
|
SAFE_CRLF_FAIL = 1,
|
|
|
|
|
SAFE_CRLF_WARN = 2,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern enum safe_crlf safe_crlf;
|
|
|
|
|
|
2008-02-19 17:24:37 +01:00
|
|
|
enum branch_track {
|
2008-08-21 19:23:20 +02:00
|
|
|
BRANCH_TRACK_UNSPECIFIED = -1,
|
2008-02-19 17:24:37 +01:00
|
|
|
BRANCH_TRACK_NEVER = 0,
|
|
|
|
|
BRANCH_TRACK_REMOTE,
|
|
|
|
|
BRANCH_TRACK_ALWAYS,
|
|
|
|
|
BRANCH_TRACK_EXPLICIT,
|
2010-01-18 21:44:11 +01:00
|
|
|
BRANCH_TRACK_OVERRIDE,
|
2008-02-19 17:24:37 +01:00
|
|
|
};
|
|
|
|
|
|
2008-05-11 00:36:29 +02:00
|
|
|
enum rebase_setup_type {
|
|
|
|
|
AUTOREBASE_NEVER = 0,
|
|
|
|
|
AUTOREBASE_LOCAL,
|
|
|
|
|
AUTOREBASE_REMOTE,
|
|
|
|
|
AUTOREBASE_ALWAYS,
|
|
|
|
|
};
|
|
|
|
|
|
2009-03-16 16:42:51 +01:00
|
|
|
enum push_default_type {
|
|
|
|
|
PUSH_DEFAULT_NOTHING = 0,
|
|
|
|
|
PUSH_DEFAULT_MATCHING,
|
|
|
|
|
PUSH_DEFAULT_TRACKING,
|
|
|
|
|
PUSH_DEFAULT_CURRENT,
|
|
|
|
|
};
|
|
|
|
|
|
2008-02-19 17:24:37 +01:00
|
|
|
extern enum branch_track git_branch_track;
|
2008-05-11 00:36:29 +02:00
|
|
|
extern enum rebase_setup_type autorebase;
|
2009-03-16 16:42:51 +01:00
|
|
|
extern enum push_default_type push_default;
|
2008-02-19 17:24:37 +01:00
|
|
|
|
2009-04-28 00:32:25 +02:00
|
|
|
enum object_creation_mode {
|
|
|
|
|
OBJECT_CREATION_USES_HARDLINKS = 0,
|
|
|
|
|
OBJECT_CREATION_USES_RENAMES = 1,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
extern enum object_creation_mode object_creation_mode;
|
2009-04-25 11:57:14 +02:00
|
|
|
|
2009-10-09 12:21:57 +02:00
|
|
|
extern char *notes_ref_name;
|
|
|
|
|
|
2009-07-23 17:33:49 +02:00
|
|
|
extern int grafts_replace_parents;
|
|
|
|
|
|
2005-11-26 00:59:09 +01:00
|
|
|
#define GIT_REPO_VERSION 0
|
|
|
|
|
extern int repository_format_version;
|
|
|
|
|
extern int check_repository_format(void);
|
|
|
|
|
|
2005-04-09 18:48:20 +02:00
|
|
|
#define MTIME_CHANGED 0x0001
|
|
|
|
|
#define CTIME_CHANGED 0x0002
|
|
|
|
|
#define OWNER_CHANGED 0x0004
|
|
|
|
|
#define MODE_CHANGED 0x0008
|
|
|
|
|
#define INODE_CHANGED 0x0010
|
|
|
|
|
#define DATA_CHANGED 0x0020
|
2005-05-05 14:38:25 +02:00
|
|
|
#define TYPE_CHANGED 0x0040
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2008-10-26 22:59:13 +01:00
|
|
|
extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)
|
|
|
|
|
__attribute__((format (printf, 3, 4)));
|
2008-10-27 10:22:21 +01:00
|
|
|
extern char *git_snpath(char *buf, size_t n, const char *fmt, ...)
|
|
|
|
|
__attribute__((format (printf, 3, 4)));
|
2008-10-27 11:17:51 +01:00
|
|
|
extern char *git_pathdup(const char *fmt, ...)
|
|
|
|
|
__attribute__((format (printf, 1, 2)));
|
2008-10-26 22:59:13 +01:00
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
/* Return a statically allocated filename matching the sha1 signature */
|
2005-08-09 17:30:22 +02:00
|
|
|
extern char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
|
|
|
|
extern char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
2005-04-10 23:03:58 +02:00
|
|
|
extern char *sha1_file_name(const unsigned char *sha1);
|
2005-08-01 02:53:44 +02:00
|
|
|
extern char *sha1_pack_name(const unsigned char *sha1);
|
|
|
|
|
extern char *sha1_pack_index_name(const unsigned char *sha1);
|
2005-10-12 00:22:48 +02:00
|
|
|
extern const char *find_unique_abbrev(const unsigned char *sha1, int);
|
2005-09-30 23:02:47 +02:00
|
|
|
extern const unsigned char null_sha1[20];
|
2006-08-15 22:37:19 +02:00
|
|
|
static inline int is_null_sha1(const unsigned char *sha1)
|
|
|
|
|
{
|
|
|
|
|
return !memcmp(sha1, null_sha1, 20);
|
|
|
|
|
}
|
2006-08-17 20:54:57 +02:00
|
|
|
static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
|
|
|
|
|
{
|
|
|
|
|
return memcmp(sha1, sha2, 20);
|
|
|
|
|
}
|
2006-08-23 08:49:00 +02:00
|
|
|
static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
|
|
|
|
|
{
|
|
|
|
|
memcpy(sha_dst, sha_src, 20);
|
|
|
|
|
}
|
2006-08-23 22:57:23 +02:00
|
|
|
static inline void hashclr(unsigned char *hash)
|
|
|
|
|
{
|
|
|
|
|
memset(hash, 0, 20);
|
|
|
|
|
}
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2008-11-12 09:17:52 +01:00
|
|
|
#define EMPTY_TREE_SHA1_HEX \
|
|
|
|
|
"4b825dc642cb6eb9a060e54bf8d69288fbee4904"
|
|
|
|
|
#define EMPTY_TREE_SHA1_BIN \
|
|
|
|
|
"\x4b\x82\x5d\xc6\x42\xcb\x6e\xb9\xa0\x60" \
|
|
|
|
|
"\xe5\x4b\xf8\xd6\x92\x88\xfb\xee\x49\x04"
|
|
|
|
|
|
2005-08-04 22:43:03 +02:00
|
|
|
int git_mkstemp(char *path, size_t n, const char *template);
|
|
|
|
|
|
2009-05-31 10:35:52 +02:00
|
|
|
int git_mkstemps(char *path, size_t n, const char *template, int suffix_len);
|
|
|
|
|
|
2010-02-22 23:32:13 +01:00
|
|
|
/* set default permissions by passing mode arguments to open(2) */
|
|
|
|
|
int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
|
|
|
|
|
int git_mkstemp_mode(char *pattern, int mode);
|
|
|
|
|
|
2008-04-16 10:34:24 +02:00
|
|
|
/*
|
|
|
|
|
* NOTE NOTE NOTE!!
|
|
|
|
|
*
|
|
|
|
|
* PERM_UMASK, OLD_PERM_GROUP and OLD_PERM_EVERYBODY enumerations must
|
|
|
|
|
* not be changed. Old repositories have core.sharedrepository written in
|
|
|
|
|
* numeric format, and therefore these values are preserved for compatibility
|
|
|
|
|
* reasons.
|
|
|
|
|
*/
|
2006-06-10 08:09:49 +02:00
|
|
|
enum sharedrepo {
|
2008-04-16 10:34:24 +02:00
|
|
|
PERM_UMASK = 0,
|
|
|
|
|
OLD_PERM_GROUP = 1,
|
|
|
|
|
OLD_PERM_EVERYBODY = 2,
|
|
|
|
|
PERM_GROUP = 0660,
|
|
|
|
|
PERM_EVERYBODY = 0664,
|
2006-06-10 08:09:49 +02:00
|
|
|
};
|
|
|
|
|
int git_config_perm(const char *var, const char *value);
|
2009-03-28 07:21:00 +01:00
|
|
|
int set_shared_perm(const char *path, int mode);
|
|
|
|
|
#define adjust_shared_perm(path) set_shared_perm((path), 0)
|
2005-07-06 10:11:52 +02:00
|
|
|
int safe_create_leading_directories(char *path);
|
2008-06-25 07:41:34 +02:00
|
|
|
int safe_create_leading_directories_const(const char *path);
|
2009-11-17 18:24:25 +01:00
|
|
|
extern char *expand_user_path(const char *path);
|
2005-11-21 01:52:52 +01:00
|
|
|
char *enter_repo(char *path, int strict);
|
2007-08-01 02:28:59 +02:00
|
|
|
static inline int is_absolute_path(const char *path)
|
|
|
|
|
{
|
2008-03-05 21:51:27 +01:00
|
|
|
return path[0] == '/' || has_dos_drive_prefix(path);
|
2007-08-01 02:28:59 +02:00
|
|
|
}
|
2008-09-09 10:27:07 +02:00
|
|
|
int is_directory(const char *);
|
2007-08-01 02:28:59 +02:00
|
|
|
const char *make_absolute_path(const char *path);
|
2008-06-06 05:15:19 +02:00
|
|
|
const char *make_nonrelative_path(const char *path);
|
Make git_dir a path relative to work_tree in setup_work_tree()
Once we find the absolute paths for git_dir and work_tree, we can make
git_dir a relative path since we know pwd will be work_tree. This should
save the kernel some time traversing the path to work_tree all the time
if git_dir is inside work_tree.
Daniel's patch didn't apply for me as-is, so I recreated it with some
differences, and here are the numbers from ten runs each.
There is some IO for me - probably due to more-or-less random flushing of
the journal - so the variation is bigger than I'd like, but whatever:
Before:
real 0m8.135s
real 0m7.933s
real 0m8.080s
real 0m7.954s
real 0m7.949s
real 0m8.112s
real 0m7.934s
real 0m8.059s
real 0m7.979s
real 0m8.038s
After:
real 0m7.685s
real 0m7.968s
real 0m7.703s
real 0m7.850s
real 0m7.995s
real 0m7.817s
real 0m7.963s
real 0m7.955s
real 0m7.848s
real 0m7.969s
Now, going by "best of ten" (on the assumption that the longer numbers
are all due to IO), I'm saying a 7.933s -> 7.685s reduction, and it does
seem to be outside of the noise (ie the "after" case never broke 8s, while
the "before" case did so half the time).
So looks like about 3% to me.
Doing it for a slightly smaller test-case (just the "arch" subdirectory)
gets more stable numbers probably due to not filling the journal with
metadata updates, so we have:
Before:
real 0m1.633s
real 0m1.633s
real 0m1.633s
real 0m1.632s
real 0m1.632s
real 0m1.630s
real 0m1.634s
real 0m1.631s
real 0m1.632s
real 0m1.632s
After:
real 0m1.610s
real 0m1.609s
real 0m1.610s
real 0m1.608s
real 0m1.607s
real 0m1.610s
real 0m1.609s
real 0m1.611s
real 0m1.608s
real 0m1.611s
where I'ld just take the averages and say 1.632 vs 1.610, which is just
over 1% peformance improvement.
So it's not in the noise, but it's not as big as I initially thought and
measured.
(That said, it obviously depends on how deep the working directory path is
too, and whether it is behind NFS or something else that might need to
cause more work to look up).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-19 21:34:06 +02:00
|
|
|
const char *make_relative_path(const char *abs, const char *base);
|
2009-02-07 16:08:28 +01:00
|
|
|
int normalize_path_copy(char *dst, const char *src);
|
2008-05-20 08:49:26 +02:00
|
|
|
int longest_ancestor_length(const char *path, const char *prefix_list);
|
2009-02-19 20:10:49 +01:00
|
|
|
char *strip_path_suffix(const char *path, const char *suffix);
|
2009-11-09 20:26:43 +01:00
|
|
|
int daemon_avoid_alias(const char *path);
|
2010-02-16 06:22:08 +01:00
|
|
|
int offset_1st_component(const char *path);
|
2005-07-06 10:11:52 +02:00
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
/* Read and unpack a sha1 file into memory, write memory to a sha1 file */
|
2007-02-26 20:55:59 +01:00
|
|
|
extern int sha1_object_info(const unsigned char *, unsigned long *);
|
2009-01-23 10:07:01 +01:00
|
|
|
extern void *read_sha1_file_repl(const unsigned char *sha1, enum object_type *type, unsigned long *size, const unsigned char **replacement);
|
|
|
|
|
static inline void *read_sha1_file(const unsigned char *sha1, enum object_type *type, unsigned long *size)
|
|
|
|
|
{
|
|
|
|
|
return read_sha1_file_repl(sha1, type, size, NULL);
|
|
|
|
|
}
|
2007-03-20 21:02:09 +01:00
|
|
|
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
|
2010-04-02 02:03:18 +02:00
|
|
|
extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
|
2007-02-26 20:55:59 +01:00
|
|
|
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
|
2008-05-14 07:32:48 +02:00
|
|
|
extern int force_object_loose(const unsigned char *sha1, time_t mtime);
|
2005-04-24 03:47:23 +02:00
|
|
|
|
close another possibility for propagating pack corruption
Abstract
--------
With index v2 we have a per object CRC to allow quick and safe reuse of
pack data when repacking. This, however, doesn't currently prevent a
stealth corruption from being propagated into a new pack when _not_
reusing pack data as demonstrated by the modification to t5302 included
here.
The Context
-----------
The Git database is all checksummed with SHA1 hashes. Any kind of
corruption can be confirmed by verifying this per object hash against
corresponding data. However this can be costly to perform systematically
and therefore this check is often not performed at run time when
accessing the object database.
First, the loose object format is entirely compressed with zlib which
already provide a CRC verification of its own when inflating data. Any
disk corruption would be caught already in this case.
Then, packed objects are also compressed with zlib but only for their
actual payload. The object headers and delta base references are not
deflated for obvious performance reasons, however this leave them
vulnerable to potentially undetected disk corruptions. Object types
are often validated against the expected type when they're requested,
and deflated size must always match the size recorded in the object header,
so those cases are pretty much covered as well.
Where corruptions could go unnoticed is in the delta base reference.
Of course, in the OBJ_REF_DELTA case, the odds for a SHA1 reference to
get corrupted so it actually matches the SHA1 of another object with the
same size (the delta header stores the expected size of the base object
to apply against) are virtually zero. In the OBJ_OFS_DELTA case, the
reference is a pack offset which would have to match the start boundary
of a different base object but still with the same size, and although this
is relatively much more "probable" than in the OBJ_REF_DELTA case, the
probability is also about zero in absolute terms. Still, the possibility
exists as demonstrated in t5302 and is certainly greater than a SHA1
collision, especially in the OBJ_OFS_DELTA case which is now the default
when repacking.
Again, repacking by reusing existing pack data is OK since the per object
CRC provided by index v2 guards against any such corruptions. What t5302
failed to test is a full repack in such case.
The Solution
------------
As unlikely as this kind of stealth corruption can be in practice, it
certainly isn't acceptable to propagate it into a freshly created pack.
But, because this is so unlikely, we don't want to pay the run time cost
associated with extra validation checks all the time either. Furthermore,
consequences of such corruption in anything but repacking should be rather
visible, and even if it could be quite unpleasant, it still has far less
severe consequences than actively creating bad packs.
So the best compromize is to check packed object CRC when unpacking
objects, and only during the compression/writing phase of a repack, and
only when not streaming the result. The cost of this is minimal (less
than 1% CPU time), and visible only with a full repack.
Someone with a stats background could provide an objective evaluation of
this, but I suspect that it's bad RAM that has more potential for data
corruptions at this point, even in those cases where this extra check
is not performed. Still, it is best to prevent a known hole for
corruption when recreating object data into a new pack.
What about the streamed pack case? Well, any client receiving a pack
must always consider that pack as untrusty and perform full validation
anyway, hence no such stealth corruption could be propagated to remote
repositoryes already. It is therefore worthless doing local validation
in that case.
Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-10-31 16:31:08 +01:00
|
|
|
/* global flag to enable extra checks when accessing packed objects */
|
|
|
|
|
extern int do_check_packed_object_crc;
|
|
|
|
|
|
2005-06-03 17:05:39 +02:00
|
|
|
extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2006-09-01 09:17:47 +02:00
|
|
|
extern int move_temp_to_file(const char *tmpfile, const char *filename);
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2009-02-28 08:15:53 +01:00
|
|
|
extern int has_sha1_pack(const unsigned char *sha1);
|
2005-04-24 03:47:23 +02:00
|
|
|
extern int has_sha1_file(const unsigned char *sha1);
|
2008-11-10 06:59:57 +01:00
|
|
|
extern int has_loose_object_nonlocal(const unsigned char *sha1);
|
2005-04-24 03:47:23 +02:00
|
|
|
|
2005-08-01 02:53:44 +02:00
|
|
|
extern int has_pack_index(const unsigned char *sha1);
|
|
|
|
|
|
2007-05-30 19:32:19 +02:00
|
|
|
extern const signed char hexval_table[256];
|
|
|
|
|
static inline unsigned int hexval(unsigned char c)
|
2006-09-21 01:04:46 +02:00
|
|
|
{
|
|
|
|
|
return hexval_table[c];
|
|
|
|
|
}
|
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
/* Convert to/from hex/sha1 representation */
|
2006-01-25 10:03:18 +01:00
|
|
|
#define MINIMUM_ABBREV 4
|
|
|
|
|
#define DEFAULT_ABBREV 7
|
|
|
|
|
|
2005-05-02 01:36:56 +02:00
|
|
|
extern int get_sha1(const char *str, unsigned char *sha1);
|
2009-12-07 11:10:50 +01:00
|
|
|
extern int get_sha1_with_mode_1(const char *str, unsigned char *sha1, unsigned *mode, int gently, const char *prefix);
|
|
|
|
|
static inline int get_sha1_with_mode(const char *str, unsigned char *sha1, unsigned *mode)
|
|
|
|
|
{
|
|
|
|
|
return get_sha1_with_mode_1(str, sha1, mode, 1, NULL);
|
|
|
|
|
}
|
2005-04-09 21:09:27 +02:00
|
|
|
extern int get_sha1_hex(const char *hex, unsigned char *sha1);
|
|
|
|
|
extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
|
2005-09-25 18:59:37 +02:00
|
|
|
extern int read_ref(const char *filename, unsigned char *sha1);
|
2006-09-21 07:02:01 +02:00
|
|
|
extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
|
2007-01-19 10:15:15 +01:00
|
|
|
extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
|
2007-02-09 01:28:23 +01:00
|
|
|
extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
|
2009-03-21 20:51:34 +01:00
|
|
|
extern int interpret_branch_name(const char *str, struct strbuf *);
|
2009-10-18 21:34:56 +02:00
|
|
|
extern int get_sha1_mb(const char *str, unsigned char *sha1);
|
2007-01-19 10:15:15 +01:00
|
|
|
|
add refname_match()
We use at least two rulesets for matching abbreviated refnames with
full refnames (starting with 'refs/'). git-rev-parse and git-fetch
use slightly different rules.
This commit introduces a new function refname_match
(const char *abbrev_name, const char *full_name, const char **rules).
abbrev_name is expanded using the rules and matched against full_name.
If a match is found the function returns true. rules is a NULL-terminate
list of format patterns with "%.*s", for example:
const char *ref_rev_parse_rules[] = {
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
"refs/remotes/%.*s",
"refs/remotes/%.*s/HEAD",
NULL
};
Asterisks are included in the format strings because this is the form
required in sha1_name.c. Sharing the list with the functions there is
a good idea to avoid duplicating the rules. Hopefully this
facilitates unified matching rules in the future.
This commit makes the rules used by rev-parse for resolving refs to
sha1s available for string comparison. Before this change, the rules
were buried in get_sha1*() and dwim_ref().
A follow-up commit will refactor the rules used by fetch.
refname_match() will be used for matching refspecs in git-send-pack.
Thanks to Daniel Barkalow <barkalow@iabervon.org> for pointing
out that ref_matches_abbrev in remote.c solves a similar problem
and care should be taken to avoid confusion.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-11 15:01:46 +01:00
|
|
|
extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);
|
|
|
|
|
extern const char *ref_rev_parse_rules[];
|
2007-11-11 15:01:48 +01:00
|
|
|
extern const char *ref_fetch_rules[];
|
add refname_match()
We use at least two rulesets for matching abbreviated refnames with
full refnames (starting with 'refs/'). git-rev-parse and git-fetch
use slightly different rules.
This commit introduces a new function refname_match
(const char *abbrev_name, const char *full_name, const char **rules).
abbrev_name is expanded using the rules and matched against full_name.
If a match is found the function returns true. rules is a NULL-terminate
list of format patterns with "%.*s", for example:
const char *ref_rev_parse_rules[] = {
"%.*s",
"refs/%.*s",
"refs/tags/%.*s",
"refs/heads/%.*s",
"refs/remotes/%.*s",
"refs/remotes/%.*s/HEAD",
NULL
};
Asterisks are included in the format strings because this is the form
required in sha1_name.c. Sharing the list with the functions there is
a good idea to avoid duplicating the rules. Hopefully this
facilitates unified matching rules in the future.
This commit makes the rules used by rev-parse for resolving refs to
sha1s available for string comparison. Before this change, the rules
were buried in get_sha1*() and dwim_ref().
A follow-up commit will refactor the rules used by fetch.
refname_match() will be used for matching refspecs in git-send-pack.
Thanks to Daniel Barkalow <barkalow@iabervon.org> for pointing
out that ref_matches_abbrev in remote.c solves a similar problem
and care should be taken to avoid confusion.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-11 15:01:46 +01:00
|
|
|
|
2007-01-26 23:26:10 +01:00
|
|
|
extern int create_symref(const char *ref, const char *refs_heads_master, const char *logmsg);
|
2007-01-02 08:31:08 +01:00
|
|
|
extern int validate_headref(const char *ref);
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-05-20 18:09:18 +02:00
|
|
|
extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
|
2008-03-06 03:25:10 +01:00
|
|
|
extern int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
|
2005-04-09 21:59:11 +02:00
|
|
|
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
|
2005-04-08 00:13:13 +02:00
|
|
|
|
2005-04-29 01:42:27 +02:00
|
|
|
extern void *read_object_with_reference(const unsigned char *sha1,
|
2005-05-18 14:14:09 +02:00
|
|
|
const char *required_type,
|
2005-04-29 01:42:27 +02:00
|
|
|
unsigned long *size,
|
|
|
|
|
unsigned char *sha1_ret);
|
2005-04-21 03:06:49 +02:00
|
|
|
|
2007-12-24 09:51:01 +01:00
|
|
|
extern struct object *peel_to_type(const char *name, int namelen,
|
|
|
|
|
struct object *o, enum object_type);
|
|
|
|
|
|
2007-07-14 08:14:52 +02:00
|
|
|
enum date_mode {
|
|
|
|
|
DATE_NORMAL = 0,
|
|
|
|
|
DATE_RELATIVE,
|
|
|
|
|
DATE_SHORT,
|
|
|
|
|
DATE_LOCAL,
|
|
|
|
|
DATE_ISO8601,
|
2009-02-20 23:15:22 +01:00
|
|
|
DATE_RFC2822,
|
|
|
|
|
DATE_RAW
|
2007-07-14 08:14:52 +02:00
|
|
|
};
|
|
|
|
|
|
2007-02-27 16:21:04 +01:00
|
|
|
const char *show_date(unsigned long time, int timezone, enum date_mode mode);
|
2009-08-31 04:26:05 +02:00
|
|
|
const char *show_date_relative(unsigned long time, int tz,
|
|
|
|
|
const struct timeval *now,
|
|
|
|
|
char *timebuf,
|
|
|
|
|
size_t timebuf_size);
|
2005-09-20 00:53:50 +02:00
|
|
|
int parse_date(const char *date, char *buf, int bufsize);
|
2005-04-30 18:46:49 +02:00
|
|
|
void datestamp(char *buf, int bufsize);
|
2010-01-26 20:58:00 +01:00
|
|
|
#define approxidate(s) approxidate_careful((s), NULL)
|
|
|
|
|
unsigned long approxidate_careful(const char *, int *);
|
2009-08-31 04:26:05 +02:00
|
|
|
unsigned long approxidate_relative(const char *date, const struct timeval *now);
|
2007-09-28 16:17:31 +02:00
|
|
|
enum date_mode parse_date_format(const char *format);
|
2005-04-30 18:46:49 +02:00
|
|
|
|
2007-12-09 02:32:08 +01:00
|
|
|
#define IDENT_WARN_ON_NO_NAME 1
|
|
|
|
|
#define IDENT_ERROR_ON_NO_NAME 2
|
|
|
|
|
#define IDENT_NO_DATE 4
|
2006-02-19 05:31:05 +01:00
|
|
|
extern const char *git_author_info(int);
|
|
|
|
|
extern const char *git_committer_info(int);
|
2007-02-05 02:50:14 +01:00
|
|
|
extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
|
2007-12-02 22:43:34 +01:00
|
|
|
extern const char *fmt_name(const char *name, const char *email);
|
2009-11-12 01:01:27 +01:00
|
|
|
extern const char *git_editor(void);
|
2010-02-14 12:59:59 +01:00
|
|
|
extern const char *git_pager(int stdout_is_tty);
|
2005-07-12 20:49:27 +02:00
|
|
|
|
2005-06-06 06:59:54 +02:00
|
|
|
struct checkout {
|
|
|
|
|
const char *base_dir;
|
|
|
|
|
int base_dir_len;
|
|
|
|
|
unsigned force:1,
|
|
|
|
|
quiet:1,
|
|
|
|
|
not_new:1,
|
|
|
|
|
refresh_cache:1;
|
|
|
|
|
};
|
|
|
|
|
|
2007-04-25 16:18:08 +02:00
|
|
|
extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
|
2009-07-09 22:35:31 +02:00
|
|
|
|
|
|
|
|
struct cache_def {
|
|
|
|
|
char path[PATH_MAX + 1];
|
|
|
|
|
int len;
|
|
|
|
|
int flags;
|
|
|
|
|
int track_flags;
|
|
|
|
|
int prefix_len_stat_func;
|
|
|
|
|
};
|
|
|
|
|
|
2009-02-09 21:54:06 +01:00
|
|
|
extern int has_symlink_leading_path(const char *name, int len);
|
2009-07-09 22:35:31 +02:00
|
|
|
extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
|
2009-02-09 21:54:06 +01:00
|
|
|
extern int has_symlink_or_noent_leading_path(const char *name, int len);
|
|
|
|
|
extern int has_dirs_only_path(const char *name, int len, int prefix_len);
|
2009-02-09 21:54:07 +01:00
|
|
|
extern void schedule_dir_for_removal(const char *name, int len);
|
|
|
|
|
extern void remove_scheduled_dirs(void);
|
2005-06-06 06:59:54 +02:00
|
|
|
|
2005-06-28 23:56:57 +02:00
|
|
|
extern struct alternate_object_database {
|
2005-08-15 02:25:57 +02:00
|
|
|
struct alternate_object_database *next;
|
2005-06-28 23:56:57 +02:00
|
|
|
char *name;
|
2006-01-07 10:33:54 +01:00
|
|
|
char base[FLEX_ARRAY]; /* more */
|
2005-08-15 02:25:57 +02:00
|
|
|
} *alt_odb_list;
|
2005-06-28 23:56:57 +02:00
|
|
|
extern void prepare_alt_odb(void);
|
2008-04-18 01:32:30 +02:00
|
|
|
extern void add_to_alternates_file(const char *reference);
|
push: receiver end advertises refs from alternate repositories
Earlier, when pushing into a repository that borrows from alternate object
stores, we followed the longstanding design decision not to trust refs in
the alternate repository that houses the object store we are borrowing
from. If your public repository is borrowing from Linus's public
repository, you pushed into it long time ago, and now when you try to push
your updated history that is in sync with more recent history from Linus,
you will end up sending not just your own development, but also the
changes you acquired through Linus's tree, even though the objects needed
for the latter already exists at the receiving end. This is because the
receiving end does not advertise that the objects only reachable from the
borrowed repository (i.e. Linus's) are already available there.
This solves the issue by making the receiving end advertise refs from
borrowed repositories. They are not sent with their true names but with a
phoney name ".have" to make sure that the old senders will safely ignore
them (otherwise, the old senders will misbehave, trying to push matching
refs, and mirror push that deletes refs that only exist at the receiving
end).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-09 10:27:10 +02:00
|
|
|
typedef int alt_odb_fn(struct alternate_object_database *, void *);
|
|
|
|
|
extern void foreach_alt_odb(alt_odb_fn, void*);
|
2005-06-28 23:56:57 +02:00
|
|
|
|
2006-12-23 08:33:44 +01:00
|
|
|
struct pack_window {
|
|
|
|
|
struct pack_window *next;
|
|
|
|
|
unsigned char *base;
|
|
|
|
|
off_t offset;
|
|
|
|
|
size_t len;
|
|
|
|
|
unsigned int last_used;
|
|
|
|
|
unsigned int inuse_cnt;
|
|
|
|
|
};
|
|
|
|
|
|
2005-06-28 23:56:57 +02:00
|
|
|
extern struct packed_git {
|
|
|
|
|
struct packed_git *next;
|
2006-12-23 08:33:44 +01:00
|
|
|
struct pack_window *windows;
|
2006-12-23 08:33:47 +01:00
|
|
|
off_t pack_size;
|
2007-04-09 07:06:28 +02:00
|
|
|
const void *index_data;
|
|
|
|
|
size_t index_size;
|
|
|
|
|
uint32_t num_objects;
|
2008-06-24 03:23:39 +02:00
|
|
|
uint32_t num_bad_objects;
|
|
|
|
|
unsigned char *bad_object_sha1;
|
2007-03-16 21:42:50 +01:00
|
|
|
int index_version;
|
2007-04-09 07:06:28 +02:00
|
|
|
time_t mtime;
|
2006-12-23 08:34:01 +01:00
|
|
|
int pack_fd;
|
2008-11-12 18:59:03 +01:00
|
|
|
unsigned pack_local:1,
|
|
|
|
|
pack_keep:1;
|
2005-08-01 02:53:44 +02:00
|
|
|
unsigned char sha1[20];
|
2006-01-07 10:33:54 +01:00
|
|
|
/* something like ".git/objects/pack/xxxxx.pack" */
|
|
|
|
|
char pack_name[FLEX_ARRAY]; /* more */
|
2005-06-28 23:56:57 +02:00
|
|
|
} *packed_git;
|
2005-07-01 02:15:39 +02:00
|
|
|
|
|
|
|
|
struct pack_entry {
|
2007-03-07 02:44:30 +01:00
|
|
|
off_t offset;
|
2005-07-01 02:15:39 +02:00
|
|
|
unsigned char sha1[20];
|
|
|
|
|
struct packed_git *p;
|
|
|
|
|
};
|
|
|
|
|
|
2005-07-16 22:55:50 +02:00
|
|
|
struct ref {
|
|
|
|
|
struct ref *next;
|
|
|
|
|
unsigned char old_sha1[20];
|
|
|
|
|
unsigned char new_sha1[20];
|
2008-04-26 21:53:12 +02:00
|
|
|
char *symref;
|
2007-11-18 10:31:37 +01:00
|
|
|
unsigned int force:1,
|
|
|
|
|
merge:1,
|
|
|
|
|
nonfastforward:1,
|
|
|
|
|
deletion:1;
|
2007-11-17 13:54:27 +01:00
|
|
|
enum {
|
|
|
|
|
REF_STATUS_NONE = 0,
|
|
|
|
|
REF_STATUS_OK,
|
|
|
|
|
REF_STATUS_REJECT_NONFASTFORWARD,
|
|
|
|
|
REF_STATUS_REJECT_NODELETE,
|
|
|
|
|
REF_STATUS_UPTODATE,
|
2007-11-17 13:56:03 +01:00
|
|
|
REF_STATUS_REMOTE_REJECT,
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 08:16:52 +01:00
|
|
|
REF_STATUS_EXPECTING_REPORT,
|
2007-11-17 13:54:27 +01:00
|
|
|
} status;
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 08:16:52 +01:00
|
|
|
char *remote_status;
|
2005-08-04 01:35:29 +02:00
|
|
|
struct ref *peer_ref; /* when renaming */
|
2006-01-07 10:33:54 +01:00
|
|
|
char name[FLEX_ARRAY]; /* more */
|
2005-07-16 22:55:50 +02:00
|
|
|
};
|
|
|
|
|
|
Improve git-peek-remote
This makes git-peek-remote able to basically do everything that
git-ls-remote does (but obviously just for the native protocol, so no
http[s]: or rsync: support).
The default behaviour is the same, but you can now give a mixture of
"--refs", "--tags" and "--heads" flags, where "--refs" forces
git-peek-remote to only show real refs (ie none of the fakey tag lookups,
but also not the special pseudo-refs like HEAD and MERGE_HEAD).
The "--tags" and "--heads" flags respectively limit the output to just
regular tags and heads, of course.
You can still also ask to limit them by name too.
You can combine the flags, so
git peek-remote --refs --tags .
will show all local _true_ tags, without the generated tag lookups
(compare the output without the "--refs" flag).
And "--tags --heads" will show both tags and heads, but will avoid (for
example) any special refs outside of the standard locations.
I'm also planning on adding a "--ignore-local" flag that allows us to ask
it to ignore any refs that we already have in the local tree, but that's
an independent thing.
All this is obviously gearing up to making "git fetch" cheaper.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-04 21:29:10 +02:00
|
|
|
#define REF_NORMAL (1u << 0)
|
|
|
|
|
#define REF_HEADS (1u << 1)
|
|
|
|
|
#define REF_TAGS (1u << 2)
|
|
|
|
|
|
2009-02-25 09:32:10 +01:00
|
|
|
extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
|
2007-11-18 08:13:10 +01:00
|
|
|
|
2007-05-16 19:09:41 +02:00
|
|
|
#define CONNECT_VERBOSE (1u << 0)
|
2010-03-04 20:59:50 +01:00
|
|
|
extern char *git_getpass(const char *prompt);
|
2007-10-30 02:05:40 +01:00
|
|
|
extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
|
2007-10-19 21:47:53 +02:00
|
|
|
extern int finish_connect(struct child_process *conn);
|
2005-07-04 22:24:30 +02:00
|
|
|
extern int path_match(const char *path, int nr, char **match);
|
2008-09-09 10:27:09 +02:00
|
|
|
struct extra_have_objects {
|
|
|
|
|
int nr, alloc;
|
|
|
|
|
unsigned char (*array)[20];
|
|
|
|
|
};
|
|
|
|
|
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);
|
2005-10-28 04:48:54 +02:00
|
|
|
extern int server_supports(const char *feature);
|
2005-07-04 20:57:58 +02:00
|
|
|
|
2005-08-01 02:53:44 +02:00
|
|
|
extern struct packed_git *parse_pack_index(unsigned char *sha1);
|
|
|
|
|
|
2005-06-28 23:56:57 +02:00
|
|
|
extern void prepare_packed_git(void);
|
2006-11-01 23:06:21 +01:00
|
|
|
extern void reprepare_packed_git(void);
|
2005-08-01 02:53:44 +02:00
|
|
|
extern void install_packed_git(struct packed_git *pack);
|
|
|
|
|
|
2007-06-07 09:04:01 +02:00
|
|
|
extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
|
2005-08-01 02:53:44 +02:00
|
|
|
struct packed_git *packs);
|
|
|
|
|
|
2007-01-17 07:28:02 +01:00
|
|
|
extern void pack_report(void);
|
2007-05-26 07:24:19 +02:00
|
|
|
extern int open_pack_index(struct packed_git *);
|
2009-05-01 11:06:36 +02:00
|
|
|
extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned int *);
|
2008-01-18 04:57:00 +01:00
|
|
|
extern void close_pack_windows(struct packed_git *);
|
2006-12-23 08:34:08 +01:00
|
|
|
extern void unuse_pack(struct pack_window **);
|
2008-12-09 20:26:52 +01:00
|
|
|
extern void free_pack_by_name(const char *);
|
2009-02-10 22:36:12 +01:00
|
|
|
extern void clear_delta_base_cache(void);
|
2007-03-16 21:42:50 +01:00
|
|
|
extern struct packed_git *add_packed_git(const char *, int, int);
|
2007-05-26 07:24:19 +02:00
|
|
|
extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t);
|
2008-06-25 05:17:12 +02:00
|
|
|
extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t);
|
2007-03-07 02:44:30 +01:00
|
|
|
extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
|
|
|
|
|
extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
|
2008-10-30 00:02:46 +01:00
|
|
|
extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
|
2007-04-16 18:31:56 +02:00
|
|
|
extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
|
2007-03-07 02:44:30 +01:00
|
|
|
extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigned long *, unsigned long *, unsigned int *, unsigned char *);
|
2005-06-28 23:56:57 +02:00
|
|
|
|
[PATCH] Add update-server-info.
The git-update-server-info command prepares informational files
to help clients discover the contents of a repository, and pull
from it via a dumb transport protocols. Currently, the
following files are produced.
- The $repo/info/refs file lists the name of heads and tags
available in the $repo/refs/ directory, along with their
SHA1. This can be used by git-ls-remote command running on
the client side.
- The $repo/info/rev-cache file describes the commit ancestry
reachable from references in the $repo/refs/ directory. This
file is in an append-only binary format to make the server
side friendly to rsync mirroring scheme, and can be read by
git-show-rev-cache command.
- The $repo/objects/info/pack file lists the name of the packs
available, the interdependencies among them, and the head
commits and tags contained in them. Along with the other two
files, this is designed to help clients to make smart pull
decisions.
The git-receive-pack command is changed to invoke it at the end,
so just after a push to a public repository finishes via "git
push", the server info is automatically updated.
In addition, building of the rev-cache file can be done by a
standalone git-build-rev-cache command separately.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-24 02:54:41 +02:00
|
|
|
/* Dumb servers support */
|
|
|
|
|
extern int update_server_info(int);
|
|
|
|
|
|
2008-05-14 19:46:53 +02:00
|
|
|
typedef int (*config_fn_t)(const char *, const char *, void *);
|
|
|
|
|
extern int git_default_config(const char *, const char *, void *);
|
|
|
|
|
extern int git_config_from_file(config_fn_t fn, const char *, void *);
|
|
|
|
|
extern int git_config(config_fn_t fn, void *);
|
2007-07-12 15:32:26 +02:00
|
|
|
extern int git_parse_ulong(const char *, unsigned long *);
|
2005-10-11 01:31:08 +02:00
|
|
|
extern int git_config_int(const char *, const char *);
|
2007-07-12 15:32:26 +02:00
|
|
|
extern unsigned long git_config_ulong(const char *, const char *);
|
2008-04-13 03:33:31 +02:00
|
|
|
extern int git_config_bool_or_int(const char *, const char *, int *);
|
2005-10-11 01:31:08 +02:00
|
|
|
extern int git_config_bool(const char *, const char *);
|
2008-02-16 06:00:24 +01:00
|
|
|
extern int git_config_string(const char **, const char *, const char *);
|
2009-11-17 18:24:25 +01:00
|
|
|
extern int git_config_pathname(const char **, const char *, const char *);
|
2005-11-17 22:32:36 +01:00
|
|
|
extern int git_config_set(const char *, const char *);
|
2005-11-20 06:52:22 +01:00
|
|
|
extern int git_config_set_multivar(const char *, const char *, const char *, int);
|
2006-12-16 15:14:14 +01:00
|
|
|
extern int git_config_rename_section(const char *, const char *);
|
2007-11-13 21:05:05 +01:00
|
|
|
extern const char *git_etc_gitconfig(void);
|
2008-05-14 19:46:53 +02:00
|
|
|
extern int check_repository_format_version(const char *var, const char *value, void *cb);
|
2008-02-06 11:11:18 +01:00
|
|
|
extern int git_config_system(void);
|
|
|
|
|
extern int git_config_global(void);
|
2008-02-11 19:41:18 +01:00
|
|
|
extern int config_error_nonbool(const char *);
|
2008-06-30 09:37:47 +02:00
|
|
|
extern const char *config_exclusive_filename;
|
2005-10-11 01:31:08 +02:00
|
|
|
|
2005-10-12 03:47:34 +02:00
|
|
|
#define MAX_GITNAME (1000)
|
|
|
|
|
extern char git_default_email[MAX_GITNAME];
|
|
|
|
|
extern char git_default_name[MAX_GITNAME];
|
2010-01-08 16:39:11 +01:00
|
|
|
#define IDENT_NAME_GIVEN 01
|
|
|
|
|
#define IDENT_MAIL_GIVEN 02
|
|
|
|
|
#define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN)
|
2008-05-04 18:04:51 +02:00
|
|
|
extern int user_ident_explicitly_given;
|
2010-01-17 22:54:28 +01:00
|
|
|
extern int user_ident_sufficiently_given(void);
|
2005-10-12 03:47:34 +02:00
|
|
|
|
2007-03-12 20:33:18 +01:00
|
|
|
extern const char *git_commit_encoding;
|
2007-03-07 02:44:17 +01:00
|
|
|
extern const char *git_log_output_encoding;
|
2009-02-08 15:34:27 +01:00
|
|
|
extern const char *git_mailmap_file;
|
2005-11-28 01:09:40 +01:00
|
|
|
|
2007-06-29 19:40:46 +02:00
|
|
|
/* IO helper functions */
|
|
|
|
|
extern void maybe_flush_or_die(FILE *, const char *);
|
2005-10-22 10:28:13 +02:00
|
|
|
extern int copy_fd(int ifd, int ofd);
|
2008-02-25 20:24:48 +01:00
|
|
|
extern int copy_file(const char *dst, const char *src, int mode);
|
2009-09-12 11:03:48 +02:00
|
|
|
extern int copy_file_with_time(const char *dst, const char *src, int mode);
|
2006-08-21 20:43:43 +02:00
|
|
|
extern void write_or_die(int fd, const void *buf, size_t count);
|
2006-09-02 18:23:48 +02:00
|
|
|
extern int write_or_whine(int fd, const void *buf, size_t count, const char *msg);
|
2007-01-08 16:57:52 +01:00
|
|
|
extern int write_or_whine_pipe(int fd, const void *buf, size_t count, const char *msg);
|
2008-05-30 17:42:16 +02:00
|
|
|
extern void fsync_or_die(int fd, const char *);
|
2005-12-15 07:17:38 +01:00
|
|
|
|
use write_str_in_full helper to avoid literal string lengths
In 2d14d65 (Use a clearer style to issue commands to remote helpers,
2009-09-03) I happened to notice two changes like this:
- write_in_full(helper->in, "list\n", 5);
+
+ strbuf_addstr(&buf, "list\n");
+ write_in_full(helper->in, buf.buf, buf.len);
+ strbuf_reset(&buf);
IMHO, it would be better to define a new function,
static inline ssize_t write_str_in_full(int fd, const char *str)
{
return write_in_full(fd, str, strlen(str));
}
and then use it like this:
- strbuf_addstr(&buf, "list\n");
- write_in_full(helper->in, buf.buf, buf.len);
- strbuf_reset(&buf);
+ write_str_in_full(helper->in, "list\n");
Thus not requiring the added allocation, and still avoiding
the maintenance risk of literal string lengths.
These days, compilers are good enough that strlen("literal")
imposes no run-time cost.
Transformed via this:
perl -pi -e \
's/write_in_full\((.*?), (".*?"), \d+\)/write_str_in_full($1, $2)/'\
$(git grep -l 'write_in_full.*"')
Signed-off-by: Jim Meyering <meyering@redhat.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-12 10:54:32 +02:00
|
|
|
extern ssize_t read_in_full(int fd, void *buf, size_t count);
|
|
|
|
|
extern ssize_t write_in_full(int fd, const void *buf, size_t count);
|
|
|
|
|
static inline ssize_t write_str_in_full(int fd, const char *str)
|
|
|
|
|
{
|
|
|
|
|
return write_in_full(fd, str, strlen(str));
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-28 20:26:21 +01:00
|
|
|
/* pager.c */
|
|
|
|
|
extern void setup_pager(void);
|
2008-02-16 06:01:11 +01:00
|
|
|
extern const char *pager_program;
|
2007-12-11 07:27:33 +01:00
|
|
|
extern int pager_in_use(void);
|
2006-07-30 00:27:43 +02:00
|
|
|
extern int pager_use_color;
|
2006-02-28 20:26:21 +01:00
|
|
|
|
2008-02-16 06:01:41 +01:00
|
|
|
extern const char *editor_program;
|
2008-02-16 06:01:59 +01:00
|
|
|
extern const char *excludes_file;
|
2007-07-20 14:06:09 +02:00
|
|
|
|
binary patch.
This adds "binary patch" to the diff output and teaches apply
what to do with them.
On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line. This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case. However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.
This patch allows the diff to generate "binary" patch when
operating under --full-index option. The binary patch follows
the usual extended git diff headers, and looks like this:
"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"
Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...). <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding. Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters. The payload is the
same diff-delta as we use in the packfiles.
On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05 01:51:44 +02:00
|
|
|
/* base85 */
|
2007-04-10 00:56:33 +02:00
|
|
|
int decode_85(char *dst, const char *line, int linelen);
|
|
|
|
|
void encode_85(char *buf, const unsigned char *data, int bytes);
|
binary patch.
This adds "binary patch" to the diff output and teaches apply
what to do with them.
On the diff generation side, traditionally, we said "Binary
files differ\n" without giving anything other than the preimage
and postimage object name on the index line. This was good
enough for applying a patch generated from your own repository
(very useful while rebasing), because the postimage would be
available in such a case. However, this was not useful when the
recipient of such a patch via e-mail were to apply it, even if
the preimage was available.
This patch allows the diff to generate "binary" patch when
operating under --full-index option. The binary patch follows
the usual extended git diff headers, and looks like this:
"GIT binary patch\n"
<length byte><data>"\n"
...
"\n"
Each line is prefixed with a "length-byte", whose value is upper
or lowercase alphabet that encodes number of bytes that the data
on the line decodes to (1..52 -- 'A' means 1, 'B' means 2, ...,
'Z' means 26, 'a' means 27, ...). <data> is 1 or more groups of
5-byte sequence, each of which encodes up to 4 bytes in base85
encoding. Because 52 / 4 * 5 = 65 and we have the length byte,
an output line is capped to 66 characters. The payload is the
same diff-delta as we use in the packfiles.
On the consumption side, git-apply now can decode and apply the
binary patch when --allow-binary-replacement is given, the diff
was generated with --full-index, and the receiving repository
has the preimage blob, which is the same condition as it always
required when accepting an "Binary files differ\n" patch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-05-05 01:51:44 +02:00
|
|
|
|
Add specialized object allocator
This creates a simple specialized object allocator for basic
objects.
This avoids wasting space with malloc overhead (metadata and
extra alignment), since the specialized allocator knows the
alignment, and that objects, once allocated, are never freed.
It also allows us to track some basic statistics about object
allocations. For example, for the mozilla import, it shows
object usage as follows:
blobs: 627629 (14710 kB)
trees: 1119035 (34969 kB)
commits: 196423 (8440 kB)
tags: 1336 (46 kB)
and the simpler allocator shaves off about 2.5% off the memory
footprint off a "git-rev-list --all --objects", and is a bit
faster too.
[ Side note: this concludes the series of "save memory in object storage".
The thing is, there simply isn't much more to be saved on the objects.
Doing "git-rev-list --all --objects" on the mozilla archive has a final
total RSS of 131498 pages for me: that's about 513MB. Of that, the
object overhead is now just 56MB, the rest is going somewhere else (put
another way: the fact that this patch shaves off 2.5% of the total
memory overhead, considering that objects are now not much more than 10%
of the total shows how big the wasted space really was: this makes
object allocations much more memory- and time-efficient).
I haven't looked at where the rest is, but I suspect the bulk of it is
just the pack-file loading. It may be that we should pack the tree
objects separately from the blob objects: for git-rev-list --objects, we
don't actually ever need to even look at the blobs, but since trees and
blobs are interspersed in the pack-file, we end up not being dense in
the tree accesses, so we end up looking at more pages than we strictly
need to.
So with a 535MB pack-file, it's entirely possible - even likely - that
most of the remaining RSS is just the mmap of the pack-file itself. We
don't need to map in _all_ of it, but we do end up mapping a fair
amount. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-19 19:44:15 +02:00
|
|
|
/* alloc.c */
|
2007-04-17 07:11:43 +02:00
|
|
|
extern void *alloc_blob_node(void);
|
|
|
|
|
extern void *alloc_tree_node(void);
|
|
|
|
|
extern void *alloc_commit_node(void);
|
|
|
|
|
extern void *alloc_tag_node(void);
|
|
|
|
|
extern void *alloc_object_node(void);
|
Add specialized object allocator
This creates a simple specialized object allocator for basic
objects.
This avoids wasting space with malloc overhead (metadata and
extra alignment), since the specialized allocator knows the
alignment, and that objects, once allocated, are never freed.
It also allows us to track some basic statistics about object
allocations. For example, for the mozilla import, it shows
object usage as follows:
blobs: 627629 (14710 kB)
trees: 1119035 (34969 kB)
commits: 196423 (8440 kB)
tags: 1336 (46 kB)
and the simpler allocator shaves off about 2.5% off the memory
footprint off a "git-rev-list --all --objects", and is a bit
faster too.
[ Side note: this concludes the series of "save memory in object storage".
The thing is, there simply isn't much more to be saved on the objects.
Doing "git-rev-list --all --objects" on the mozilla archive has a final
total RSS of 131498 pages for me: that's about 513MB. Of that, the
object overhead is now just 56MB, the rest is going somewhere else (put
another way: the fact that this patch shaves off 2.5% of the total
memory overhead, considering that objects are now not much more than 10%
of the total shows how big the wasted space really was: this makes
object allocations much more memory- and time-efficient).
I haven't looked at where the rest is, but I suspect the bulk of it is
just the pack-file loading. It may be that we should pack the tree
objects separately from the blob objects: for git-rev-list --objects, we
don't actually ever need to even look at the blobs, but since trees and
blobs are interspersed in the pack-file, we end up not being dense in
the tree accesses, so we end up looking at more pages than we strictly
need to.
So with a 535MB pack-file, it's entirely possible - even likely - that
most of the remaining RSS is just the mmap of the pack-file itself. We
don't need to map in _all_ of it, but we do end up mapping a fair
amount. ]
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-19 19:44:15 +02:00
|
|
|
extern void alloc_report(void);
|
|
|
|
|
|
2006-09-02 18:23:48 +02:00
|
|
|
/* trace.c */
|
2009-11-14 22:33:13 +01:00
|
|
|
__attribute__((format (printf, 1, 2)))
|
2006-09-02 18:23:48 +02:00
|
|
|
extern void trace_printf(const char *format, ...);
|
2009-11-14 22:33:13 +01:00
|
|
|
__attribute__((format (printf, 2, 3)))
|
2007-12-03 05:51:50 +01:00
|
|
|
extern void trace_argv_printf(const char **argv, const char *format, ...);
|
2006-09-02 18:23:48 +02:00
|
|
|
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 20:07:23 +01:00
|
|
|
/* convert.c */
|
Rewrite convert_to_{git,working_tree} to use strbuf's.
* Now, those functions take an "out" strbuf argument, where they store their
result if any. In that case, it also returns 1, else it returns 0.
* those functions support "in place" editing, in the sense that it's OK to
call them this way:
convert_to_git(path, sb->buf, sb->len, sb);
When doable, conversions are done in place for real, else the strbuf
content is just replaced with the new one, transparentely for the caller.
If you want to create a new filter working this way, being the accumulation
of filter1, filter2, ... filtern, then your meta_filter would be:
int meta_filter(..., const char *src, size_t len, struct strbuf *sb)
{
int ret = 0;
ret |= filter1(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
ret |= filter2(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
....
return ret | filtern(..., src, len, sb);
}
That's why subfilters the convert_to_* functions called were also rewritten
to work this way.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-09-16 15:51:04 +02:00
|
|
|
/* returns 1 if *dst was used */
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 12:25:58 +01:00
|
|
|
extern int convert_to_git(const char *path, const char *src, size_t len,
|
|
|
|
|
struct strbuf *dst, enum safe_crlf checksafe);
|
Rewrite convert_to_{git,working_tree} to use strbuf's.
* Now, those functions take an "out" strbuf argument, where they store their
result if any. In that case, it also returns 1, else it returns 0.
* those functions support "in place" editing, in the sense that it's OK to
call them this way:
convert_to_git(path, sb->buf, sb->len, sb);
When doable, conversions are done in place for real, else the strbuf
content is just replaced with the new one, transparentely for the caller.
If you want to create a new filter working this way, being the accumulation
of filter1, filter2, ... filtern, then your meta_filter would be:
int meta_filter(..., const char *src, size_t len, struct strbuf *sb)
{
int ret = 0;
ret |= filter1(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
ret |= filter2(...., src, len, sb);
if (ret) {
src = sb->buf;
len = sb->len;
}
....
return ret | filtern(..., src, len, sb);
}
That's why subfilters the convert_to_* functions called were also rewritten
to work this way.
Signed-off-by: Pierre Habouzit <madcoder@debian.org>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-09-16 15:51:04 +02:00
|
|
|
extern int convert_to_working_tree(const char *path, const char *src, size_t len, struct strbuf *dst);
|
Lazy man's auto-CRLF
It currently does NOT know about file attributes, so it does its
conversion purely based on content. Maybe that is more in the "git
philosophy" anyway, since content is king, but I think we should try to do
the file attributes to turn it off on demand.
Anyway, BY DEFAULT it is off regardless, because it requires a
[core]
AutoCRLF = true
in your config file to be enabled. We could make that the default for
Windows, of course, the same way we do some other things (filemode etc).
But you can actually enable it on UNIX, and it will cause:
- "git update-index" will write blobs without CRLF
- "git diff" will diff working tree files without CRLF
- "git checkout" will write files to the working tree _with_ CRLF
and things work fine.
Funnily, it actually shows an odd file in git itself:
git clone -n git test-crlf
cd test-crlf
git config core.autocrlf true
git checkout
git diff
shows a diff for "Documentation/docbook-xsl.css". Why? Because we have
actually checked in that file *with* CRLF! So when "core.autocrlf" is
true, we'll always generate a *different* hash for it in the index,
because the index hash will be for the content _without_ CRLF.
Is this complete? I dunno. It seems to work for me. It doesn't use the
filename at all right now, and that's probably a deficiency (we could
certainly make the "is_binary()" heuristics also take standard filename
heuristics into account).
I don't pass in the filename at all for the "index_fd()" case
(git-update-index), so that would need to be passed around, but this
actually works fine.
NOTE NOTE NOTE! The "is_binary()" heuristics are totally made-up by yours
truly. I will not guarantee that they work at all reasonable. Caveat
emptor. But it _is_ simple, and it _is_ safe, since it's all off by
default.
The patch is pretty simple - the biggest part is the new "convert.c" file,
but even that is really just basic stuff that anybody can write in
"Teaching C 101" as a final project for their first class in programming.
Not to say that it's bug-free, of course - but at least we're not talking
about rocket surgery here.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-13 20:07:23 +01:00
|
|
|
|
2007-11-18 10:12:04 +01:00
|
|
|
/* add */
|
2008-05-12 19:58:10 +02:00
|
|
|
/*
|
|
|
|
|
* return 0 if success, 1 - if addition of a file failed and
|
|
|
|
|
* ADD_FILES_IGNORE_ERRORS was specified in flags
|
|
|
|
|
*/
|
|
|
|
|
int add_files_to_cache(const char *prefix, const char **pathspec, int flags);
|
2007-11-18 10:12:04 +01:00
|
|
|
|
2007-08-31 22:13:42 +02:00
|
|
|
/* diff.c */
|
|
|
|
|
extern int diff_auto_refresh_index;
|
|
|
|
|
|
2007-02-16 01:32:45 +01:00
|
|
|
/* match-trees.c */
|
|
|
|
|
void shift_tree(const unsigned char *, const unsigned char *, unsigned char *, int);
|
2008-07-01 07:18:57 +02:00
|
|
|
void shift_tree_by(const unsigned char *, const unsigned char *, unsigned char *, const char *);
|
2007-02-16 01:32:45 +01:00
|
|
|
|
2007-11-02 08:24:27 +01:00
|
|
|
/*
|
|
|
|
|
* whitespace rules.
|
|
|
|
|
* used by both diff and apply
|
|
|
|
|
*/
|
2009-09-06 07:21:17 +02:00
|
|
|
#define WS_BLANK_AT_EOL 01
|
2007-11-02 08:24:27 +01:00
|
|
|
#define WS_SPACE_BEFORE_TAB 02
|
2007-10-03 03:00:27 +02:00
|
|
|
#define WS_INDENT_WITH_NON_TAB 04
|
2008-01-15 09:59:05 +01:00
|
|
|
#define WS_CR_AT_EOL 010
|
apply --whitespace=warn/error: diagnose blank at EOF
"git apply" strips new blank lines at EOF under --whitespace=fix option,
but neigher --whitespace=warn nor --whitespace=error paid any attention to
these errors.
Introduce a new whitespace error class, blank-at-eof, to make the
whitespace error handling more consistent.
The patch adds a new "linenr" field to the struct fragment in order to
record which line the hunk started in the input file, but this is needed
solely for reporting purposes. The detection of this class of whitespace
errors cannot be done while parsing a patch like we do for all the other
classes of whitespace errors. It instead has to wait until we find where
to apply the hunk, but at that point, we do not have an access to the
original line number in the input file anymore, hence the new field.
Depending on your point of view, this may be a bugfix that makes warn and
error in line with fix. Or you could call it a new feature. The line
between them is somewhat fuzzy in this case.
Strictly speaking, triggering more errors than before is a change in
behaviour that is not backward compatible, even though the reason for the
change is because the code was not checking for an error that it should
have. People who do not want added blank lines at EOF to trigger an error
can disable the new error class.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-04 01:02:32 +02:00
|
|
|
#define WS_BLANK_AT_EOF 020
|
2009-09-06 07:21:17 +02:00
|
|
|
#define WS_TRAILING_SPACE (WS_BLANK_AT_EOL|WS_BLANK_AT_EOF)
|
2007-11-02 08:24:27 +01:00
|
|
|
#define WS_DEFAULT_RULE (WS_TRAILING_SPACE|WS_SPACE_BEFORE_TAB)
|
2007-12-06 09:14:14 +01:00
|
|
|
extern unsigned whitespace_rule_cfg;
|
|
|
|
|
extern unsigned whitespace_rule(const char *);
|
|
|
|
|
extern unsigned parse_whitespace_rule(const char *);
|
2008-06-27 00:35:21 +02:00
|
|
|
extern unsigned ws_check(const char *line, int len, unsigned ws_rule);
|
|
|
|
|
extern void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
|
2007-12-13 14:32:29 +01:00
|
|
|
extern char *whitespace_error_string(unsigned ws);
|
2008-02-24 01:59:16 +01:00
|
|
|
extern int ws_fix_copy(char *, const char *, int, unsigned, int *);
|
2008-06-27 00:36:59 +02:00
|
|
|
extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
|
2007-11-02 08:24:27 +01:00
|
|
|
|
2007-11-18 10:13:32 +01:00
|
|
|
/* ls-files */
|
|
|
|
|
int report_path_error(const char *ps_matched, const char **pathspec, int prefix_offset);
|
|
|
|
|
void overlay_tree_on_cache(const char *tree_name, const char *prefix);
|
|
|
|
|
|
2008-02-24 23:17:14 +01:00
|
|
|
char *alias_lookup(const char *alias);
|
2008-06-27 18:21:54 +02:00
|
|
|
int split_cmdline(char *cmdline, const char ***argv);
|
2008-02-24 23:17:14 +01:00
|
|
|
|
2010-03-06 21:34:41 +01:00
|
|
|
/* builtin/merge.c */
|
|
|
|
|
int checkout_fast_forward(const unsigned char *from, const unsigned char *to);
|
|
|
|
|
|
2005-04-08 00:13:13 +02:00
|
|
|
#endif /* CACHE_H */
|