--- /dev/null
+git-symbolic-ref(1)
+===================
+
+NAME
+----
+git-symbolic-ref - read and modify symbolic refs
+
+SYNOPSIS
+--------
+'git-symbolic-ref' <name> [<ref>]
+
+DESCRIPTION
+-----------
+Given one argument, reads which branch head the given symbolic
+ref refers to and outputs its path, relative to the `.git/`
+directory. Typically you would give `HEAD` as the <name>
+argument to see on which branch your working tree is on.
+
+Give two arguments, create or update a symbolic ref <name> to
+point at the given branch <ref>.
+
+Traditionally, `.git/HEAD` is a symlink pointing at
+`refs/heads/master`. When we want to switch to another branch,
+we did `ln -sf refs/heads/newbranch .git/HEAD`, and when we want
+to find out which branch we are on, we did `readlink .git/HEAD`.
+This was fine, and internally that is what still happens by
+default, but on platforms that does not have working symlinks,
+or that does not have the `readlink(1)` command, this was a bit
+cumbersome. On some platforms, `ln -sf` does not even work as
+advertised (horrors).
+
+A symbolic ref can be a regular file that stores a string that
+begins with `ref: refs/`. For example, your `.git/HEAD` *can*
+be a regular file whose contents is `ref: refs/heads/master`.
+This can be used on a filesystem that does not support symbolic
+links. Instead of doing `readlink .git/HEAD`, `git-symbolic-ref
+HEAD` can be used to find out which branch we are on. To point
+the HEAD to `newbranch`, instead of `ln -sf refs/heads/newbranch
+.git/HEAD`, `git-symbolic-ref HEAD refs/heads/newbranch` can be
+used.
+
+Currently, .git/HEAD uses a regular file symbolic ref on Cygwin,
+and everywhere else it is implemented as a symlink. This can be
+changed at compilation time.
+
+Author
+------
+Written by Junio C Hamano <junkio@cox.net>
+
+GIT
+---
+Part of the gitlink:git[7] suite
--- /dev/null
+git-update-ref(1)
+=================
+
+NAME
+----
+git-update-ref - update the object name stored in a ref safely
+
+SYNOPSIS
+--------
+`git-update-ref` <ref> <newvalue> [<oldvalue>]
+
+DESCRIPTION
+-----------
+Given two arguments, stores the <newvalue> in the <ref>, possibly
+dereferencing the symbolic refs. E.g. `git-update-ref HEAD
+<newvalue>` updates the current branch head to the new object.
+
+Given three arguments, stores the <newvalue> in the <ref>,
+possibly dereferencing the symbolic refs, after verifying that
+the current value of the <ref> matches <oldvalue>.
+E.g. `git-update-ref refs/heads/master <newvalue> <oldvalue>`
+updates the master branch head to <newvalue> only if its current
+value is <oldvalue>.
+
+It also allows a "ref" file to be a symbolic pointer to another
+ref file by starting with the four-byte header sequence of
+"ref:".
+
+More importantly, it allows the update of a ref file to follow
+these symbolic pointers, whether they are symlinks or these
+"regular file symbolic refs". It follows *real* symlinks only
+if they start with "refs/": otherwise it will just try to read
+them and update them as a regular file (i.e. it will allow the
+filesystem to follow them, but will overwrite such a symlink to
+somewhere else with a regular filename).
+
+In general, using
+
+ git-update-ref HEAD "$head"
+
+should be a _lot_ safer than doing
+
+ echo "$head" > "$GIT_DIR/HEAD"
+
+both from a symlink following standpoint *and* an error checking
+standpoint. The "refs/" rule for symlinks means that symlinks
+that point to "outside" the tree are safe: they'll be followed
+for reading but not for writing (so we'll never write through a
+ref symlink to some other tree, if you have copied a whole
+archive by creating a symlink tree).
+
+Author
+------
+Written by Linus Torvalds <torvalds@osdl.org>.
+
+GIT
+---
+Part of the gitlink:git[7] suite
case "$signoff" in
t)
- git-var GIT_COMMITTER_IDENT | sed -e '
- s/>.*/>/
- s/^/Signed-off-by: /
- ' >>.editmsg
+ {
+ echo
+ git-var GIT_COMMITTER_IDENT | sed -e '
+ s/>.*/>/
+ s/^/Signed-off-by: /
+ '
+ } >>.editmsg
;;
esac
+++ /dev/null
-#!/bin/sh
-# Copyright (C) 2005 Junio C Hamano
-#
-# This script is designed to emulate what the built-in diff driver
-# does when set as GIT_EXTERNAL_SCRIPT.
-
-case "$#" in
-1)
- echo "* Unmerged path $1"
- exit 0 ;;
-*)
- name1="$1" tmp1="$2" hex1="$3" mode1="$4" tmp2="$5" hex2="$6" mode2="$7"
- case "$#" in
- 7)
- name2="$name1" ;;
- 9)
- name2="$8" xfrm_msg="$9" ;;
- esac ;;
-esac
-
-show_create () {
- name_="$1" tmp_="$2" hex_="$3" mode_="$4"
- echo "diff --git a/$name_ b/$name_"
- echo "new file mode $mode_"
- diff ${GIT_DIFF_OPTS-'-pu'} -L /dev/null -L "b/$name_" /dev/null "$tmp_"
-}
-
-show_delete () {
- name_="$1" tmp_="$2" hex_="$3" mode_="$4"
- echo "diff --git a/$name_ b/$name_"
- echo "deleted file mode $mode_"
- diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name_" -L /dev/null "$tmp_" /dev/null
-}
-
-case "$mode1" in
-120*) type1=l ;;
-100*) type1=f ;;
-.) show_create "$name2" "$tmp2" "$hex2" "$mode2"
- exit 0 ;;
-esac
-case "$mode2" in
-120*) type2=l ;;
-100*) type2=f ;;
-.) show_delete "$name1" "$tmp1" "$hex1" "$mode1"
- exit 0 ;;
-esac
-
-if test "$type1" != "$type2"
-then
- show_delete "$name1" "$tmp1" "$hex1" "$mode1"
- show_create "$name2" "$tmp2" "$hex2" "$mode2"
- exit 0
-fi
-
-echo diff --git "a/$name1" "b/$name2"
-if test "$mode1" != "$mode2"
-then
- echo "old mode $mode1"
- echo "new mode $mode2"
- if test "$xfrm_msg" != ""
- then
- echo "$xfrm_msg"
- fi
-fi
-diff ${GIT_DIFF_OPTS-'-pu'} -L "a/$name1" -L "b/$name2" "$tmp1" "$tmp2"
-exit 0
-
q
}'
-_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
-stripCommitHead='/^'"$_x40"' (from '"$_x40"')$/d'
-
git-cherry -v "$rev1" "$rev2" |
while read sign rev comment
do
echo
git-diff-tree -p $diff_opts "$commit" | git-apply --stat --summary
echo
- git-diff-tree -p $diff_opts "$commit" | sed -e "$stripCommitHead"
+ git-diff-tree -p $diff_opts "$commit"
case "$mbox" in
t)
return ret;
}
+static int prefetches = 0;
+
+static struct object_list *in_transit = NULL;
+static struct object_list **end_of_transit = &in_transit;
+
void prefetch(unsigned char *sha1)
{
char type = 'o';
+ struct object_list *node;
+ if (prefetches > 100) {
+ fetch(in_transit->item->sha1);
+ }
+ node = xmalloc(sizeof(struct object_list));
+ node->next = NULL;
+ node->item = lookup_unknown_object(sha1);
+ *end_of_transit = node;
+ end_of_transit = &node->next;
force_write(fd_out, &type, 1);
force_write(fd_out, sha1, 20);
- //memcpy(requested + 20 * prefetches++, sha1, 20);
+ prefetches++;
}
static char conn_buf[4096];
{
int ret;
signed char remote;
+ struct object_list *temp;
+
+ if (memcmp(sha1, in_transit->item->sha1, 20)) {
+ // we must have already fetched it to clean the queue
+ return has_sha1_file(sha1) ? 0 : -1;
+ }
+ prefetches--;
+ temp = in_transit;
+ in_transit = in_transit->next;
+ if (!in_transit)
+ end_of_transit = &in_transit;
+ free(temp);
if (conn_buf_posn) {
remote = conn_buf[0];
projects / git.git / commitdiff