1. Stefan Saasen
  2. git


Junio C Hamano  committed 5ca15b8 Merge

GIT 0.99.9f

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

  • Participants
  • Parent commits 77131db, 4bfb6b6
  • Branches master
  • Tags v0.99.9f

Comments (0)

Files changed (18)

File Documentation/Makefile

View file
  • Ignore whitespace
 # Determine "include::" file references in asciidoc files.
-TEXTFILES = $(wildcard git-*.txt)
-doc.dep : $(TEXTFILES) build-docdep.perl
+doc.dep : $(wildcard *.txt) build-docdep.perl
 	rm -f $@+ $@
 	perl ./build-docdep.perl >$@+
 	mv $@+ $@

File Documentation/build-docdep.perl

View file
  • Ignore whitespace
 my %include = ();
+my %included = ();
-for my $text (<git-*.txt>) {
+for my $text (<*.txt>) {
     open I, '<', $text || die "cannot read: $text";
-    (my $base = $text) =~ s/\.txt$//;
     while (<I>) {
 	if (/^include::/) {
-	    $include{$base}{$_} = 1;
+	    $include{$text}{$_} = 1;
+	    $included{$_} = 1;
     close I;
 # Do we care about chained includes???
-while (my ($base, $included) = each %include) {
-    my ($suffix) = '1';
-    if ($base eq 'git') {
-	$suffix = '7'; # yuck...
+my $changed = 1;
+while ($changed) {
+    $changed = 0;
+    while (my ($text, $included) = each %include) {
+	print STDERR "Looking at $text...\n";
+	for my $i (keys %$included) {
+	    print STDERR "$text includes $i.\n";
+	    # $text has include::$i; if $i includes $j
+	    # $text indirectly includes $j.
+	    if (exists $include{$i}) {
+		print STDERR "$i includes something.\n";
+		for my $j (keys %{$include{$i}}) {
+		    print STDERR "$text includes $i include $j\n";
+		    if (!exists $include{$text}{$j}) {
+			$include{$text}{$j} = 1;
+			$included{$j} = 1;
+			$changed = 1;
+		    }
+		}
+	    }
+	}
-    print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
+while (my ($text, $included) = each %include) {
+    if (! exists $included{$text} &&
+	(my $base = $text) =~ s/\.txt$//) {
+	my ($suffix) = '1';
+	if ($base eq 'git') {
+	    $suffix = '7'; # yuck...
+	}
+	print "$base.html $base.$suffix : ", join(" ", keys %$included), "\n";
+    }

File Documentation/fetch-options.txt

View file
  • Ignore whitespace
 -f, \--force::
 -t, \--tags::
+	By default, the git core utilities will not fetch and store
+	tags under the same name as the remote repository;  ask it
+	to do so using `--tags`.
 -u, \--update-head-ok::
 	By default `git-fetch` refuses to update the head which

File Documentation/howto/isolate-bugs-with-bisect.txt

View file
  • Ignore whitespace
+From:	Linus Torvalds <torvalds () osdl ! org>
+To:	git@vger.kernel.org
+Date:	2005-11-08 1:31:34
+Subject: Real-life kernel debugging scenario
+Abstract: Short-n-sweet, Linus tells us how to leverage `git-bisect` to perform
+	bug isolation on a repository where "good" and "bad" revisions are known
+	in order to identify a suspect commit.
+How To Use git-bisect To Isolate a Bogus Commit
+The way to use "git bisect" couldn't be easier.
+Figure out what the oldest bad state you know about is (that's usually the 
+head of "master", since that's what you just tried to boot and failed at). 
+Also, figure out the most recent known-good commit (usually the _previous_ 
+kernel you ran: and if you've only done a single "pull" in between, it 
+will be ORIG_HEAD).
+Then do
+	git bisect start
+	git bisect bad master		<- mark "master" as the bad state
+	git bisect good ORIG_HEAD	<- mark ORIG_HEAD as good (or
+					   whatever other known-good 
+					   thing you booted laste)
+and at this point "git bisect" will churn for a while, and tell you what 
+the mid-point between those two commits are, and check that state out as 
+the head of the bew "bisect" branch.
+Compile and reboot.
+If it's good, just do
+	git bisect good		<- mark current head as good
+otherwise, reboot into a good kernel instead, and do (surprise surprise, 
+git really is very intuitive):
+	git bisect bad		<- mark current head as bad
+and whatever you do, git will select a new half-way point. Do this for a 
+while, until git tells you exactly which commit was the first bad commit. 
+That's your culprit.
+It really works wonderfully well, except for the case where there was 
+_another_ commit that broke something in between, like introduced some 
+stupid compile error. In that case you should not mark that commit good or 
+bad: you should try to find another commit close-by, and do a "git reset 
+--hard <newcommit>" to try out _that_ commit instead, and then test that 
+instead (and mark it good or bad).
+You can do "git bisect visualize" while you do all this to see what's 
+going on by starting up gitk on the bisection range.
+Finally, once you've figured out exactly which commit was bad, you can 
+then go back to the master branch, and try reverting just that commit:
+	git checkout master
+	git revert <bad-commit-id>
+to verify that the top-of-kernel works with that single commit reverted.

File Documentation/tutorial.txt

View file
  • Ignore whitespace
 subdirectory, and initialize the git infrastructure with `git-init-db`:
-mkdir git-tutorial
-cd git-tutorial
+$ mkdir git-tutorial
+$ cd git-tutorial
+$ git-init-db
 to which git will reply
-	defaulting to local storage area
+defaulting to local storage area
 which is just git's way of saying that you haven't been doing anything
 strange, and that it will have created a local `.git` directory setup for
 get a feel for how this works:
-echo "Hello World" >hello
-echo "Silly example" >example
+$ echo "Hello World" >hello
+$ echo "Silly example" >example
 you have now created two files in your working tree (aka 'working directory'), but to
 So to populate the index with the two files you just created, you can do
-git-update-index --add hello example
+$ git-update-index --add hello example
 and you have now told git to track those two files.
 you'll notice that git will have added two new objects to the object
 database. If you did exactly the steps above, you should now be able to do
-	ls .git/objects/??/*
+$ ls .git/objects/??/*
 and see two files:
-	.git/objects/55/7db03de997c86a4a028e1ebd3a1ceb225be238 
-	.git/objects/f2/4c74a2e500f5ee1332c86b94199f52b1d1d962
 which correspond with the objects with names of 557db... and f24c7..
 If you want to, you can use `git-cat-file` to look at those objects, but
 you'll have to use the object name, not the filename of the object:
-	git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
+$ git-cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238
 where the `-t` tells `git-cat-file` to tell you what the "type" of the
 object is. git will tell you that you have a "blob" object (ie just a
 regular file), and you can see the contents with
-	git-cat-file "blob" 557db03
+$ git-cat-file "blob" 557db03
 which will print out "Hello World". The object 557db03 is nothing
 more than the contents of your file `hello`.
 start off by adding another line to `hello` first:
-echo "It's a new day for git" >>hello
+$ echo "It's a new day for git" >>hello
 and you can now, since you told git about the previous state of `hello`, ask
 `git-diff-files` command:
+$ git-diff-files
 Oops. That wasn't very readable. It just spit out its own internal
 differences as a patch, using the `-p` flag:
-git-diff-files -p
-which will spit out
+$ git-diff-files -p
 diff --git a/hello b/hello
 index 557db03..263414f 100644
 --- a/hello
 creating the equivalent of a git "directory" object:
+$ git-write-tree
 and this will just output the name of the resulting tree, in this case
 (if you have done exactly as I've described) it should be
-	8988da15d077d4829fc51d8544c097def6644dbb
 which is another incomprehensible object name. Again, if you want to,
 you can use `git-cat-file -t 8988d\...` to see that this time the object
 all with a sequence of simple shell commands:
-commit=$(echo 'Initial commit' | git-commit-tree $tree)
-git-update-ref HEAD $commit
+$ tree=$(git-write-tree)
+$ commit=$(echo 'Initial commit' | git-commit-tree $tree)
+$ git-update-ref HEAD $commit
 which will say:
-	Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb
+Committing initial tree 8988da15d077d4829fc51d8544c097def6644dbb
 just to warn you about the fact that it created a totally new commit
 that is not related to anything else. Normally you do this only *once*
 But now we can do
-	git-diff-index -p HEAD
+$ git-diff-index -p HEAD
 (where `-p` has the same meaning as it did in `git-diff-files`), and it
 will show us the same difference, but for a totally different reason. 
 Again, because this is a common operation, you can also just shorthand
 it with
-	git diff HEAD
+$ git diff HEAD
 which ends up doing the above for you.
 update the index cache:
-git-update-index hello
+$ git-update-index hello
 (note how we didn't need the `\--add` flag this time, since git knew
 already, so let's just use the helpful script this time:
-git commit
+$ git commit
 which starts an editor for you to write the commit message and tells you
 of that commit itself, and show the difference directly. Thus, to get
 the same diff that we've already seen several times, we can now do
-	git-diff-tree -p HEAD
+$ git-diff-tree -p HEAD
 (again, `-p` means to show the difference as a human-readable patch),
 and it will show what the last commit (in `HEAD`) actually changed.
 To see the whole history of our pitiful little git-tutorial project, you
 can do
-	git log
+$ git log
 which shows just the log messages, or if we want to see the log together
 with the associated patches use the more complex (and much more
-	git-whatchanged -p --root
+$ git-whatchanged -p --root
 and you will see exactly what has changed in the repository over its
 short history. 
 So the simplest form of tag involves nothing more than
-git tag my-first-tag
+$ git tag my-first-tag
 which just writes the current `HEAD` into the `.git/refs/tags/my-first-tag`
 file, after which point you can then use this symbolic name for that
 particular state. You can, for example, do
-	git diff my-first-tag
+$ git diff my-first-tag
 to diff your current state against that tag (which at this point will
 obviously be an empty diff, but if you continue to develop and commit
 that tag. You create these annotated tags with either the `-a` or
 `-s` flag to `git tag`:
-	git tag -s <tagname>
+$ git tag -s <tagname>
 which will sign the current `HEAD` (but you can also give it another
 argument that specifies the thing to tag, ie you could have tagged the
 Copying repositories
-git repositories are normally totally self-sufficient, and it's worth noting
-that unlike CVS, for example, there is no separate notion of
+git repositories are normally totally self-sufficient and relocatable
+Unlike CVS, for example, there is no separate notion of
 "repository" and "working tree". A git repository normally *is* the
 working tree, with the local git information hidden in the `.git`
 subdirectory. There is nothing else. What you see is what you got.
  - if you grow bored with the tutorial repository you created (or you've
    made a mistake and want to start all over), you can just do simple
-	rm -rf git-tutorial
+$ rm -rf git-tutorial
 and it will be gone. There's no external repository, and there's no
 history outside the project you created.
 file (which caches various information, notably some of the "stat"
 information for the files involved) will likely need to be refreshed.
 So after you do a `cp -a` to create a new copy, you'll want to do
-	git-update-index --refresh
+$ git-update-index --refresh
 in the new repository to make sure that the index file is up-to-date.
 known state (you don't know *what* they've done and not yet checked in),
 so usually you'll precede the `git-update-index` with a
-	git-read-tree --reset HEAD
-	git-update-index --refresh
+$ git-read-tree --reset HEAD
+$ git-update-index --refresh
 which will force a total index re-build from the tree pointed to by `HEAD`.
 It resets the index contents to `HEAD`, and then the `git-update-index`
 The above can also be written as simply
-	git reset
+$ git reset
 and in fact a lot of the common git command combinations can be scripted
 with the `git xyz` interfaces.  You can learn things by just looking
 raw repository contents into the `.git` directory. For example, to
 create your own copy of the git repository, you'd do the following
-	mkdir my-git
-	cd my-git
-	rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
+$ mkdir my-git
+$ cd my-git
+$ rsync -rL rsync://rsync.kernel.org/pub/scm/git/git.git/ .git
 followed by 
-	git-read-tree HEAD
+$ git-read-tree HEAD
 to populate the index. However, now you have populated the index, and
 you have all the git internal files, but you will notice that you don't
 actually have any of the working tree files to work on. To get
 those, you'd check them out with
-	git-checkout-index -u -a
+$ git-checkout-index -u -a
 where the `-u` flag means that you want the checkout to keep the index
 up-to-date (so that you don't have to refresh it afterward), and the
 Again, this can all be simplified with
-	git clone rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git
-	cd my-git
-	git checkout
+$ git clone rsync://rsync.kernel.org/pub/scm/git/git.git/ my-git
+$ cd my-git
+$ git checkout
 which will end up doing all of the above for you.
 saying that you want to check out a new branch:
-git checkout -b mybranch
+$ git checkout -b mybranch
 will create a new branch based at the current `HEAD` position, and switch
 In other words, if you have an earlier tag or branch, you'd just do
-git checkout -b mybranch earlier-commit
+$ git checkout -b mybranch earlier-commit
 and it would create the new branch `mybranch` at the earlier commit,
 You can always just jump back to your original `master` branch by doing
-git checkout master
+$ git checkout master
 (or any other branch-name, for that matter) and if you forget which
 branch you happen to be on, a simple
-ls -l .git/HEAD
+$ ls -l .git/HEAD
 will tell you where it's pointing (Note that on platforms with bad or no
 symlink support, you have to execute
-cat .git/HEAD
+$ cat .git/HEAD
 instead). To get the list of branches you have, you can say
-git branch
+$ git branch
 which is nothing more than a simple script around `ls .git/refs/heads`.
 checking it out and switching to it. If so, just use the command
-git branch <branchname> [startingpoint]
+$ git branch <branchname> [startingpoint]
 which will simply _create_ the branch, but will not do anything further. 
 that branch, and do some work there.
-git checkout mybranch
-echo "Work, work, work" >>hello
-git commit -m 'Some work.' hello
+$ git checkout mybranch
+$ echo "Work, work, work" >>hello
+$ git commit -m 'Some work.' hello
 Here, we just added another line to `hello`, and we used a shorthand for
 to the master branch, and editing the same file differently there:
-git checkout master
+$ git checkout master
 Here, take a moment to look at the contents of `hello`, and notice how they
 hasn't happened in the `master` branch at all. Then do
-echo "Play, play, play" >>hello
-echo "Lots of fun" >>example
-git commit -m 'Some fun.' hello example
+$ echo "Play, play, play" >>hello
+$ echo "Lots of fun" >>example
+$ git commit -m 'Some fun.' hello example
 since the master branch is obviously in a much better mood.
 work done. Before we do that, let's introduce a cool graphical tool that
 helps you view what's going on:
-	gitk --all
+$ gitk --all
 will show you graphically both of your branches (that's what the `\--all`
 means: normally it will just show you your current `HEAD`) and their
 to resolve and what the merge is all about:
-git merge "Merge work in mybranch" HEAD mybranch
+$ git merge "Merge work in mybranch" HEAD mybranch
 where the first argument is going to be used as the commit message if
 of it as it can automatically (which in this case is just merge the `example`
 file, which had no differences in the `mybranch` branch), and say:
 	Trying really trivial in-index merge...
 	fatal: Merge requires file-level merging
 	ERROR: Merge conflict in hello.
 	fatal: merge program failed
 	Automatic merge failed/prevented; fix up by hand
 which is way too verbose, but it basically tells you that it failed the
 really trivial merge ("Simple merge") and did an "Automatic merge"
 and once you're happy with your manual merge, just do a
-git commit hello
+$ git commit hello
 which will very loudly warn you that you're now committing a merge
 resolve to get the "upstream changes" back to your branch.
-git checkout mybranch
-git merge "Merge upstream changes." HEAD master
+$ git checkout mybranch
+$ git merge "Merge upstream changes." HEAD master
 This outputs something like this (the actual commit object names
 would be different)
-	Updating from ae3a2da... to a80b4aa....
-	 example |    1 +
-	 hello   |    1 +
-	 2 files changed, 2 insertions(+), 0 deletions(-)
+Updating from ae3a2da... to a80b4aa....
+ example |    1 +
+ hello   |    1 +
+ 2 files changed, 2 insertions(+), 0 deletions(-)
 Because your branch did not contain anything more than what are
 already merged into the `master` branch, the resolve operation did
 It's usually much more common that you merge with somebody else than
 merging with your own branches, so it's worth pointing out that git
 makes that very easy too, and in fact, it's not that different from
-doing a `git resolve`. In fact, a remote merge ends up being nothing
+doing a `git merge`. In fact, a remote merge ends up being nothing
 more than "fetch the work from a remote repository into a temporary tag"
-followed by a `git resolve`.
+followed by a `git merge`.
 Fetching from a remote repository is done by, unsurprisingly,
 `git fetch`:
-	git fetch <remote-repository>
+$ git fetch <remote-repository>
 One of the following transports can be used to name the
 repository to download from:
 transport, it finds out the set of objects the downstream side
 lacks and transfers (close to) minimum set of objects.
 HTTP and HTTPS transport are used only for downloading.  They
 immediately `resolve`, that it's called `git pull`, and you can
 simply do
-	git pull <remote-repository>
+$ git pull <remote-repository>
 and optionally give a branch-name for the remote end as a second
 directory, like this:
-mkdir -p .git/remotes/
-cat >.git/remotes/linus <<\EOF
+$ mkdir -p .git/remotes/
+$ cat >.git/remotes/linus <<\EOF
 URL: http://www.kernel.org/pub/scm/git/git.git/
 of a full URL, like this:
-cat >.git/remotes/jgarzik <<\EOF
+$ cat >.git/remotes/jgarzik <<\EOF
 URL: http://www.kernel.org/pub/scm/linux/git/jgarzik/
 files so only 'example' resulted in collapsing, but in real-life
 large projects, only small number of files change in one commit,
 and this 'collapsing' tends to trivially merge most of the paths
-fairly quickly, leaving only the real changes in non-zero stages.
+fairly quickly, leaving only a handful the real changes in non-zero
 To look at only non-zero stages, use `\--unmerged` flag:
 an empty directory:
-mkdir my-git.git
+$ mkdir my-git.git
 Then, make that directory into a git repository by running
 `.git`, we do things slightly differently:
-GIT_DIR=my-git.git git-init-db
+$ GIT_DIR=my-git.git git-init-db
 Make sure this directory is available for others you want your
 there, run this command:
-git push <public-host>:/path/to/my-git.git master
+$ git push <public-host>:/path/to/my-git.git master
 This synchronizes your public repository to match the named
 propagation to other publicly visible machines:
-git push master.kernel.org:/pub/scm/git/git.git/ 
+$ git push master.kernel.org:/pub/scm/git/git.git/ 
 storage by "packing them together". The command
-git repack
+$ git repack
 will do it for you. If you followed the tutorial examples, you
 unpacked objects that are contained in the pack file anymore.
-git prune-packed
+$ git prune-packed
 would remove them for you.
 'commit-fix' next, like this:
-$ git resolve master diff-fix 'Merge fix in diff-fix'
-$ git resolve master commit-fix 'Merge fix in commit-fix'
+$ git merge 'Merge fix in diff-fix' master diff-fix
+$ git merge 'Merge fix in commit-fix' master commit-fix
 Which would result in:
 You can make sure 'git show-branch' matches the state before
-those two 'git resolve' you just did.  Then, instead of running
-two 'git resolve' commands in a row, you would pull these two
+those two 'git merge' you just did.  Then, instead of running
+two 'git merge' commands in a row, you would pull these two
 branch heads (this is known as 'making an Octopus'):

File Makefile

View file
  • Ignore whitespace
 # Define USE_STDEV below if you want git to care about the underlying device
 # change being considered an inode change from the update-cache perspective.
-GIT_VERSION = 0.99.9e
+GIT_VERSION = 0.99.9f
 # CFLAGS is for the users to override from the command line.
 CFLAGS = -g -O2 -Wall

File debian/changelog

View file
  • Ignore whitespace
+git-core (0.99.9f-0) unstable; urgency=low
+  * GIT 0.99.9f
+ -- Junio C Hamano <junkio@cox.net>  Tue,  8 Nov 2005 01:21:52 -0800
 git-core (0.99.9e-0) unstable; urgency=low
   * GIT 0.99.9e
  -- Junio C Hamano <junkio@cox.net>  Sun, 30 Oct 2005 15:03:32 -0800
+git-core (0.99.9.GIT-1) unstable; urgency=low
+  * Do not scatter txt and html documentation into feature
+    subpackages.  Do place man pages into them.
+  * Capture more cvs stuff into git-cvs package.
+ -- Junio C Hamano <junkio@cox.net>  Tue,  8 Nov 2005 01:19:06 -0800
 git-core (0.99.9.GIT-0) unstable; urgency=low
   * Test Build.

File debian/git-arch.files

View file
  • Ignore whitespace

File debian/git-core.doc-base

View file
  • Ignore whitespace
 Format: HTML
 Index: /usr/share/doc/git-core/git.html
 Files: /usr/share/doc/git-core/*.html
+ /usr/share/doc/git-core/*/*.html
 Format: text
-Files: /usr/share/doc/git-core/git.txt*
+Files: /usr/share/doc/git-core/*.txt
+ /usr/share/doc/git-core/*/*.txt

File debian/git-cvs.files

View file
  • Ignore whitespace

File debian/git-doc.files

View file
  • Ignore whitespace

File debian/git-email.files

View file
  • Ignore whitespace

File debian/git-svn.files

View file
  • Ignore whitespace

File debian/git-tk.files

View file
  • Ignore whitespace

File git-am.sh

View file
  • Ignore whitespace
 		git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
-	resume=
 	GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
 	GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
 	GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
-	SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
+	SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
 	case "$keep_subject" in -k)  SUBJECT="[PATCH] $SUBJECT" ;; esac
-	if test '' != "$SIGNOFF"
-	then
+	case "$resume" in
+	'')
+	    if test '' != "$SIGNOFF"
+	    then
-			sed -ne '/^Signed-off-by: /p' "$dotest/msg-clean" |
-			tail -n 1
+		    sed -ne '/^Signed-off-by: /p' \
+		    "$dotest/msg-clean" |
+		    tail -n 1
+		    test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
 		    test '' = "$LAST_SIGNED_OFF_BY" && echo
 		    echo "$SIGNOFF"
-		})
-	else
+		}`
+	    else
-	fi
-	{
+	    fi
+	    {
 		echo "$SUBJECT"
 		if test -s "$dotest/msg-clean"
 			echo "$ADD_SIGNOFF"
-	} >"$dotest/final-commit"
+	    } >"$dotest/final-commit"
+	    ;;
+	esac
+	resume=
 	if test "$interactive" = t
 	    test -t 0 ||

File git-push.sh

View file
  • Ignore whitespace
 case "$remote" in
-http://* | https://* | git://*)
 	die "Cannot use READ-ONLY transport to push to $remote" ;;
         die "Pushing with rsync transport is deprecated" ;;
 test "$has_force" && set x "$has_force" "$@" && shift
 test "$has_exec" && set x "$has_exec" "$@" && shift
-exec git-send-pack "$@"
+case "$remote" in
+http://* | https://*)
+	exec git-http-push "$@";;
+	exec git-send-pack "$@";;

File ls-files.c

View file
  • Ignore whitespace
 	prefix = setup_git_directory();
 	if (prefix)
 		prefix_offset = strlen(prefix);
+	git_config(git_default_config);
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];

File read-tree.c

View file
  • Ignore whitespace
 	if (newfd < 0)
 		die("unable to create new cachefile");
+	git_config(git_default_config);
 	merge = 0;
 	reset = 0;
 	for (i = 1; i < argc; i++) {