This backports the -t option git-ls-files in Cogito added to the Linus
version.
Signed-off-by: NPetr Baudis <pasky@ucw.cz>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This moves the private "say()" function to pull.c, renames it to
"pull_say()", and introduces a global variable "get_verbosely" that
makes the pull backends report what they fetch.  The -v option is
added to git-rpull and git-http-pull to match git-local-pull.

The documentation is updated to describe these pull commands.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

This adds descriptions for the core GIT commands that were not
mentioned in the previous version.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NJunio C Hamano <junkio@cox.net>

Signed-off-by: NDavid Greaves <david@dgreaves.com>
Signed-off-by: NJunio C Hamano <junkio@cox.net>

We may need to create subdirectories, before we can create a
symlink.
Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

The tree object parsing used to get the executable bit wrong,
and didn't know about symlinks. Also, fsck really wants the
full mode value so that it can verify the other bits for sanity,
so save it all in struct tree_entry.

  Update git-apply-patch-script for symbolic links.
  Make git-prune-script executable again.
  Do not write out new index if nothing has changed.
  diff-cache shows differences for unmerged paths without --cache.
  Update diff engine for symlinks stored in the cache.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This patch updates the git-apply-patch-script for the symbolic links
in the cache, recently added by Kay Sievers.

It currently is very anal about symbolic link changes.  It refuses to
change between a regular file and a symbolic link, and only allows
symbolic link changes if the patch is based on the same original.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This patch updates the external diff interface engine for the change
to store the symbolic links in the cache, recently done by Kay
Sievers.

The main thing it does is when comparing with the work tree, it
prepares the counterpart to the blob being compared by doing a
readlink followed by sending that result to a temporary file to
be diffed.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

I'd stupidly forgotten one merge_head -> merge conversion, and
all my tests were for the fast-forward case that never triggered
the bug.

We really always want to have S_IFREG there for non-symlinks,
otherwise we create corrupt index files.

While manually resolving a merge conflict, being able to run
diff-cache without --cache option between files in the work tree
and either of the ancestor trees is helpful to verify the hand
merged result.  However, diff-cache refuses to handle unmerged
paths, even when run without --cache option.

This changes the behaviour so that the above use case will
report the differences between the compared tree and the magic
0{40} SHA1 (i.e. "look at the work tree").  When there is no
corresponding file in the work tree, or when the command is run
with "--cache" option, it continues to report "unmerged".
Signed-off-by: NJunio C Hamano <junkio@cox.net>

The git-update-cache command, especially with --refresh, may not change
anything.  In such a case, writing 1.6MB of the same thing is a waste.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

I do not know why the executable bit was lost since the change went in as
GIT pull, not via e-mail patch, but here is a fix.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Mention the '-p' option in the usage help string of git-diff-tree.
Signed-Off-by: NThomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-Off-by: NLinus Torvalds <torvalds@osdl.org>

Separate out the merge resolve from the actual getting of the
data. Also, update the resolve phase to take advantage of the
fact that we don't need to do the commit->tree object lookup
by hand, since all the actors involved happily just act on a
commit object these days.

This allows you to work with a directory tree that isn't fully populated,
without making diff-cache say that all the files are gone.

Allow to store and track symlink in the repository. A symlink is stored
the same way as a regular file, only with the appropriate mode bits set.
The symlink target is therefore stored in a blob object.
This will hopefully make our udev repository fully functional. :)
Signed-off-by: NKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

Following up from my fix to rpull, please also apply this, which fixes
rpush.c to call git-rpull rather than rpull which no longer exists after
the Big Rename(TM)...
Signed-off-by: NAnton Altaparmakov <aia21@cantab.net>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

This fixes rpull.c to call git-rpush rather than rpush which no longer
exists after the Big Rename(TM)...
Signed-off-by: NAnton Altaparmakov <aia21@cantab.net>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

This way you always see what the state change was.

This avoids pruning the kernel v2.6.11 tree that now has a tag.

In particular, teach it about tags. Also, to make reachability actually
work for tags, we need to add the ref to the tagged object.

People are already starting to use a multi-head model.

This patch fixes memory leaks in parse_object() and related functions;
these leaks were very noticeable when running git-fsck-cache.
Signed-off-by: NSergey Vlasov <vsu@altlinux.ru>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

This fixes an error introduced to git-apply-patch-script in the previous
round.  We do not invoke patch for create/delete case, so we need to
be a bit careful about detecting conflicts like this.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This is useful to verify that you got the right thing.

This patch optimizes "diff-cache -p --cached" by avoiding to
inflate blobs into temporary files when the blob recorded in the
cache matches the corresponding file in the work tree.  The file
in the work tree is passed as the comparison source in such a
case instead.

This optimization kicks in only when we have already read the
cache this optimization and this is deliberate.  Especially,
diff-tree does not use this code, because changes are contained
in small number of files relative to the project size most of
the time, and reading cache is so expensive for a large project
that the cost of reading it outweighs the savings by not
inflating blobs.

Also this patch cleans up the structure passed from diff clients
by removing one unused structure member.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

(slightly updated from the version posted to the GIT mailing list
with small bugfixes).

This patch changes the git-apply-patch-script to exit non-zero when
the patch cannot be applied.  Previously, the external diff driver
deliberately ignored the exit status of GIT_EXTERNAL_DIFF command,
which was a design mistake.  It now stops the processing when
GIT_EXTERNAL_DIFF exits non-zero, so the damages from running
git-diff-* with git-apply-patch-script between two wrong trees can be
contained.

The "diff" command line generated by the built-in driver is changed to
always exit 0 in order to match this new behaviour.  I know Pasky does
not use GIT_EXTERNAL_DIFF yet, so this change should not break Cogito,
either.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

(updated from the version posted to GIT mailing list).

When a new blob is registered with update-cache, and before the cache
is written as a tree and committed, git-fsck-cache will find the blob
unreachable.  This patch adds a new flag, "--cache" to git-fsck-cache,
with which it keeps such blobs from considered "unreachable".

The git-prune-script is updated to use this new flag.  At the same time
it adds .git/refs/*/* to the set of default locations to look for heads,
which should be consistent with expectations from Cogito users.

Without this fix, "diff-cache -p --cached" after git-prune-script has
pruned the blob object will fail mysteriously and git-write-tree would
also fail.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

When git-local-pull with -l option gets ENOENT attempting to create
a hard link, there is no point falling back to other copy methods.
With this patch, git-local-pull detects such a case and gives up
copying the file early.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

This patch updates pull.c, the engine that decides which objects are
needed, given a commit to traverse from, to report which commit was
calling for the object that cannot be retrieved from the remote side.
This complements git-fsck-cache in that it checks the consistency of
the remote repository for reachability.
Signed-off-by: NJunio C Hamano <junkio@cox.net>

Coda doesn't like cross-directory hardlinks. So try to fall back
on a plain rename instead.

Make it much safer: we write to a temporary file, and then link that
temporary file to the final destination. This avoids all the nasty
races if several people write the same object at the same time.

It should also result in nicer on-disk layout, since it means that
objects all get created in the same subdirectory. That makes a lot
of block allocation algorithms happier, since the objects will now
be allocated from the same zone.

fsck_tag() failes to notice that the parsing of the tag may
have failed in the parse_object() call on the object that it
is tagging. 

Noticed by Junio.
Signed-off-by: NJunio C Hamano <junkio@cox.net>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>