* user-manual updates.
From: J. Bruce Fields @ 2007-05-07 5:12 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Some miscellaneous user-manual updates, also available from
git://linux-nfs.org/~bfields/git.git maint
--b.
^ permalink raw reply
* user-manual updates
From: J. Bruce Fields @ 2007-05-07 5:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Some miscellaneous user-manual updates, also available from
git://linux-nfs.org/~bfields/git.git maint
(Sorry for any duplicates; I made a slight mistake with the
git-send-email commandline....)
--b.
^ permalink raw reply
* [PATCH 1/6] user-manual: more discussion of detached heads, fix typos
From: J. Bruce Fields @ 2007-05-07 5:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, J. Bruce Fields, Nicolas Pitre
In-Reply-To: <11785148422793-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
Nicolas Pitre pointed out a couple typos and some room for improvement
in the discussion of detached heads.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
Cc: Nicolas Pitre <nico@cam.org>
---
Documentation/user-manual.txt | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index dff438f..54fd413 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -527,17 +527,16 @@ and git branch shows that you are no longer on a branch:
------------------------------------------------
$ cat .git/HEAD
427abfa28afedffadfca9dd8b067eb6d36bac53f
-git branch
+$ git branch
* (no branch)
master
------------------------------------------------
In this case we say that the HEAD is "detached".
-This can be an easy way to check out a particular version without having
-to make up a name for a new branch. However, keep in mind that when you
-switch away from the (for example, by checking out something else), you
-can lose track of what the HEAD used to point to.
+This is an easy way to check out a particular version without having to
+make up a name for the new branch. You can still create a new branch
+(or tag) for this version later if you decide to.
Examining branches from a remote repository
-------------------------------------------
@@ -1560,8 +1559,19 @@ $ git show master@{2} # See where the branch pointed 2,
$ git show master@{3} # 3, ... changes ago.
$ gitk master@{yesterday} # See where it pointed yesterday,
$ gitk master@{"1 week ago"} # ... or last week
+$ git log --walk-reflogs master # show reflog entries for master
+-------------------------------------------------
+
+A separate reflog is kept for the HEAD, so
+
+-------------------------------------------------
+$ git show HEAD@{"1 week ago"}
-------------------------------------------------
+will show what HEAD pointed to one week ago, not what the current branch
+pointed to one week ago. This allows you to see the history of what
+you've checked out.
+
The reflogs are kept by default for 30 days, after which they may be
pruned. See gitlink:git-reflog[1] and gitlink:git-gc[1] to learn
how to control this pruning, and see the "SPECIFYING REVISIONS"
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH 2/6] user-manual: add section ID's
From: J. Bruce Fields @ 2007-05-07 5:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, J. Bruce Fields
In-Reply-To: <11785148433801-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
Any section lacking an id gets an annoying warning when you build
the manual. More seriously, the table of contents then generates
volatile id's which change with every build, with the effect that
we get URL's that change all the time.
The ID's are manually generated and sometimes inconsistent, but
that's OK.
XXX: what to do about the preface?
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
Documentation/user-manual.txt | 84 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 54fd413..d353d08 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -23,12 +23,14 @@ pages. For a command such as "git clone", just use
$ man git-clone
------------------------------------------------
+[[git-quick-start]]
Git Quick Start
===============
This is a quick summary of the major commands; the following chapters
will explain how these work in more detail.
+[[quick-creating-a-new-repository]]
Creating a new repository
-------------------------
@@ -50,6 +52,7 @@ $ git clone git://example.com/pub/project.git
$ cd project
-----------------------------------------------
+[[managing-branches]]
Managing branches
-----------------
@@ -112,6 +115,7 @@ $ git branch -r # list all remote branches
-----------------------------------------------
+[[exploring-history]]
Exploring history
-----------------
@@ -147,6 +151,7 @@ $ git bisect bad # if this revision is bad.
# repeat until done.
-----------------------------------------------
+[[making-changes]]
Making changes
--------------
@@ -177,6 +182,7 @@ $ git commit d.txt # use latest content only of d.txt
$ git commit -a # use latest content of all tracked files
-----------------------------------------------
+[[merging]]
Merging
-------
@@ -187,6 +193,7 @@ $ git pull git://example.com/project.git master
$ git pull . test # equivalent to git merge test
-----------------------------------------------
+[[sharing-your-changes]]
Sharing your changes
--------------------
@@ -232,6 +239,7 @@ $ git remote add example ssh://example.com/project.git
$ git push example test
-----------------------------------------------
+[[repository-maintenance]]
Repository maintenance
----------------------
@@ -247,9 +255,11 @@ Recompress, remove unused cruft:
$ git gc
-----------------------------------------------
+[[repositories-and-branches]]
Repositories and Branches
=========================
+[[how-to-get-a-git-repository]]
How to get a git repository
---------------------------
@@ -280,6 +290,7 @@ contains all the information about the history of the project.
In most of the following, examples will be taken from one of the two
repositories above.
+[[how-to-check-out]]
How to check out a different version of a project
-------------------------------------------------
@@ -352,6 +363,7 @@ particular point in history, then resetting that branch may leave you
with no way to find the history it used to point to; so use this command
carefully.
+[[understanding-commits]]
Understanding History: Commits
------------------------------
@@ -407,6 +419,7 @@ In fact, in <<git-internals>> we shall see that everything stored in git
history, including file data and directory contents, is stored in an object
with a name that is a hash of its contents.
+[[understanding-reachability]]
Understanding history: commits, parents, and reachability
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -431,6 +444,7 @@ if commit X is an ancestor of commit Y. Equivalently, you could say
that Y is a descendent of X, or that there is a chain of parents
leading from commit Y to commit X.
+[[history-diagrams]]
Understanding history: History diagrams
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -450,6 +464,7 @@ lines drawn with - / and \. Time goes left to right:
If we need to talk about a particular commit, the character "o" may
be replaced with another letter or number.
+[[what-is-a-branch]]
Understanding history: What is a branch?
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -463,6 +478,7 @@ the line of three commits leading up to that point as all being part of
However, when no confusion will result, we often just use the term
"branch" both for branches and for branch heads.
+[[manipulating-branches]]
Manipulating branches
---------------------
@@ -538,6 +554,7 @@ This is an easy way to check out a particular version without having to
make up a name for the new branch. You can still create a new branch
(or tag) for this version later if you decide to.
+[[examining-remote-branches]]
Examining branches from a remote repository
-------------------------------------------
@@ -611,6 +628,7 @@ remote-tracking branches to the latest version found in her
repository. It will not touch any of your own branches--not even the
"master" branch that was created for you on clone.
+[[fetching-branches]]
Fetching branches from other repositories
-----------------------------------------
@@ -653,6 +671,7 @@ or delete these configuration options by editing .git/config with a
text editor. (See the "CONFIGURATION FILE" section of
gitlink:git-config[1] for details.)
+[[exploring-git-history]]
Exploring git history
=====================
@@ -667,6 +686,7 @@ history of a project.
We start with one specialized tool that is useful for finding the
commit that introduced a bug into a project.
+[[using-bisect]]
How to use bisect to find a regression
--------------------------------------
@@ -734,6 +754,7 @@ $ git reset --hard fb47ddb2db...
then test, run "bisect good" or "bisect bad" as appropriate, and
continue.
+[[naming-commits]]
Naming commits
--------------
@@ -798,6 +819,7 @@ $ git rev-parse origin
e05db0fd4f31dde7005f075a84f96b360d05984b
-------------------------------------------------
+[[creating-tags]]
Creating tags
-------------
@@ -815,6 +837,7 @@ share with others, and possibly sign cryptographically, then you
should create a tag object instead; see the gitlink:git-tag[1] man
page for details.
+[[browsing-revisions]]
Browsing revisions
------------------
@@ -856,6 +879,7 @@ backwards through the parents; however, since git history can contain
multiple independent lines of development, the particular order that
commits are listed in may be somewhat arbitrary.
+[[generating-diffs]]
Generating diffs
----------------
@@ -877,6 +901,7 @@ but not from master. Note that if master also has commits which are
not reachable from test, then the combined result of these patches
will not be the same as the diff produced by the git-diff example.
+[[viewing-old-file-versions]]
Viewing old file versions
-------------------------
@@ -892,9 +917,11 @@ $ git show v2.5:fs/locks.c
Before the colon may be anything that names a commit, and after it
may be any path to a file tracked by git.
+[[history-examples]]
Examples
--------
+[[checking-for-equal-branches]]
Check whether two branches point at the same history
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -927,6 +954,7 @@ $ git log origin...master
will return no commits when the two branches are equal.
+[[finding-tagged-descendants]]
Find first tagged version including a given fix
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1012,9 +1040,11 @@ Which shows that e05db0fd is reachable from itself, from v1.5.0-rc1, and
from v1.5.0-rc2, but not from v1.5.0-rc0.
+[[Developing-with-git]]
Developing with git
===================
+[[telling-git-your-name]]
Telling git your name
---------------------
@@ -1033,6 +1063,7 @@ EOF
details on the configuration file.)
+[[creating-a-new-repository]]
Creating a new repository
-------------------------
@@ -1149,6 +1180,7 @@ $ git diff # difference between the index file and your
$ git status # a brief per-file summary of the above.
-------------------------------------------------
+[[creating-good-commit-messages]]
Creating good commit messages
-----------------------------
@@ -1159,6 +1191,7 @@ description. Tools that turn commits into email, for example, use
the first line on the Subject line and the rest of the commit in the
body.
+[[how-to-merge]]
How to merge
------------
@@ -1236,6 +1269,7 @@ your own if desired.
The above is all you need to know to resolve a simple merge. But git
also provides more information to help resolve conflicts:
+[[conflict-resolution]]
Getting conflict-resolution help during a merge
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1359,6 +1393,7 @@ throw away a commit you have already committed if that commit may
itself have been merged into another branch, as doing so may confuse
further merges.
+[[fast-forwards]]
Fast-forward merges
-------------------
@@ -1374,6 +1409,7 @@ already contained in the other--then git just performs a
moved forward to point at the head of the merged-in branch, without
any new commits being created.
+[[fixing-mistakes]]
Fixing mistakes
---------------
@@ -1398,6 +1434,7 @@ fundamentally different ways to fix the problem:
change, and cannot correctly perform repeated merges from
a branch that has had its history changed.
+[[reverting-a-commit]]
Fixing a mistake with a new commit
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1452,6 +1489,7 @@ It is also possible to edit commits further back in the history, but
this is an advanced topic to be left for
<<cleaning-up-history,another chapter>>.
+[[checkout-of-path]]
Checking out an old version of a file
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1478,6 +1516,7 @@ $ git show HEAD^:path/to/file
which will display the given version of the file.
+[[ensuring-good-performance]]
Ensuring good performance
-------------------------
@@ -1494,9 +1533,12 @@ $ git gc
to recompress the archive. This can be very time-consuming, so
you may prefer to run git-gc when you are not doing other work.
+
+[[ensuring-reliability]]
Ensuring reliability
--------------------
+[[checking-for-corruption]]
Checking the repository for corruption
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1532,9 +1574,11 @@ other git operations are in progress in the same repository.
For more about dangling objects, see <<dangling-objects>>.
+[[recovering-lost-changes]]
Recovering lost changes
~~~~~~~~~~~~~~~~~~~~~~~
+[[reflogs]]
Reflogs
^^^^^^^
@@ -1582,6 +1626,7 @@ While normal history is shared by every repository that works on the
same project, the reflog history is not shared: it tells you only about
how the branches in your local repository have changed over time.
+[[dangling-objects]]
Examining dangling objects
^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -1623,6 +1668,7 @@ $ git branch recovered-branch 7281251ddd
------------------------------------------------
+[[sharing-development]]
Sharing development with others
===============================
@@ -1682,6 +1728,7 @@ $ git merge branch
are roughly equivalent. The former is actually very commonly used.
+[[submitting-patches]]
Submitting patches to a project
-------------------------------
@@ -1703,6 +1750,7 @@ use the gitlink:git-send-email[1] script to automate the process.
Consult the mailing list for your project first to determine how they
prefer such patches be handled.
+[[importing-patches]]
Importing patches to a project
------------------------------
@@ -1898,6 +1946,7 @@ See the explanations of the remote.<name>.url, branch.<name>.remote,
and remote.<name>.push options in gitlink:git-config[1] for
details.
+[[setting-up-a-shared-repository]]
Setting up a shared repository
------------------------------
@@ -1907,6 +1956,7 @@ all push to and pull from a single shared repository. See
link:cvs-migration.txt[git for CVS users] for instructions on how to
set this up.
+[[setting-up-gitweb]]
Allow web browsing of a repository
----------------------------------
@@ -1914,6 +1964,7 @@ The gitweb cgi script provides users an easy way to browse your
project's files and history without having to install git; see the file
gitweb/INSTALL in the git source tree for instructions on setting it up.
+[[sharing-development-examples]]
Examples
--------
@@ -1931,6 +1982,7 @@ cause git's merge machinery (for example) to do the wrong thing.
However, there is a situation in which it can be useful to violate this
assumption.
+[[patch-series]]
Creating the perfect patch series
---------------------------------
@@ -1963,6 +2015,7 @@ We will introduce some tools that can help you do this, explain how to
use them, and then explain some of the problems that can arise because
you are rewriting history.
+[[using-git-rebase]]
Keeping a patch series up to date using git-rebase
--------------------------------------------------
@@ -2044,6 +2097,7 @@ return mywork to the state it had before you started the rebase:
$ git rebase --abort
-------------------------------------------------
+[[modifying-one-commit]]
Modifying a single commit
-------------------------
@@ -2089,6 +2143,7 @@ Note that the immutable nature of git history means that you haven't really
"modified" existing commits; instead, you have replaced the old commits with
new commits having new object names.
+[[reordering-patch-series]]
Reordering or selecting from a patch series
-------------------------------------------
@@ -2118,6 +2173,7 @@ $ git reset --hard origin
Then modify, reorder, or eliminate patches as preferred before applying
them again with gitlink:git-am[1].
+[[patch-series-tools]]
Other tools
-----------
@@ -2125,6 +2181,7 @@ There are numerous other tools, such as stgit, which exist for the
purpose of maintaining a patch series. These are outside of the scope of
this manual.
+[[problems-with-rewriting-history]]
Problems with rewriting history
-------------------------------
@@ -2173,9 +2230,11 @@ branches into their own work.
For true distributed development that supports proper merging,
published branches should never be rewritten.
+[[advanced-branch-management]]
Advanced branch management
==========================
+[[fetching-individual-branches]]
Fetching individual branches
----------------------------
@@ -2204,7 +2263,7 @@ already have a branch named example-master, it will attempt to
"fast-forward" to the commit given by example.com's master branch. So
next we explain what a fast-forward is:
-[[fast-forwards]]
+[[fast-forwards-2]]
Understanding git history: fast-forwards
----------------------------------------
@@ -2242,6 +2301,7 @@ situation above this may mean losing the commits labeled "a" and "b",
unless you've already created a reference of your own pointing to
them.
+[[forcing-fetch]]
Forcing git fetch to do non-fast-forward updates
------------------------------------------------
@@ -2256,6 +2316,7 @@ Note the addition of the "+" sign. Be aware that commits that the
old version of example/master pointed at may be lost, as we saw in
the previous section.
+[[remote-branch-configuration]]
Configuring remote branches
---------------------------
@@ -2329,6 +2390,7 @@ Git internals
Git depends on two fundamental abstractions: the "object database", and
the "current directory cache" aka "index".
+[[the-object-database]]
The Object Database
-------------------
@@ -2398,6 +2460,7 @@ to just verifying their superficial consistency through the hash).
The object types in some more detail:
+[[blob-object]]
Blob Object
-----------
@@ -2419,6 +2482,7 @@ file is associated with in any way.
A blob is typically created when gitlink:git-update-index[1]
is run, and its data can be accessed by gitlink:git-cat-file[1].
+[[tree-object]]
Tree Object
-----------
@@ -2460,6 +2524,7 @@ A tree is created with gitlink:git-write-tree[1] and
its data can be accessed by gitlink:git-ls-tree[1].
Two trees can be compared with gitlink:git-diff-tree[1].
+[[commit-object]]
Commit Object
-------------
@@ -2486,6 +2551,7 @@ file manager.
A commit is created with gitlink:git-commit-tree[1] and
its data can be accessed by gitlink:git-cat-file[1].
+[[trust]]
Trust
-----
@@ -2515,6 +2581,7 @@ like GPG/PGP.
To assist in this, git also provides the tag object...
+[[tag-object]]
Tag Object
----------
@@ -2537,6 +2604,7 @@ and the signature can be verified by
gitlink:git-verify-tag[1].
+[[the-index]]
The "index" aka "Current Directory Cache"
-----------------------------------------
@@ -2591,6 +2659,7 @@ been written back to the backing store.
+[[the-workflow]]
The Workflow
------------
@@ -2600,6 +2669,7 @@ index), but most operations move data to and from the index file. Either
from the database or from the working directory. Thus there are four
main combinations:
+[[working-directory-to-index]]
working directory -> index
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2633,6 +2703,7 @@ stat information. It will 'not' update the object status itself, and
it will only update the fields that are used to quickly test whether
an object still matches its old backing store object.
+[[index-to-object-database]]
index -> object database
~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2648,6 +2719,7 @@ and it will return the name of the resulting top-level tree. You can
use that tree to re-generate the index at any time by going in the
other direction:
+[[object-database-to-index]]
object database -> index
~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2664,6 +2736,7 @@ and your index file will now be equivalent to the tree that you saved
earlier. However, that is only your 'index' file: your working
directory contents have not been modified.
+[[index-to-working-directory]]
index -> working directory
~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2693,6 +2766,7 @@ need to use the "-f" flag ('before' the "-a" flag or the filename) to
Finally, there are a few odds and ends which are not purely moving
from one representation to the other:
+[[tying-it-all-together]]
Tying it all together
~~~~~~~~~~~~~~~~~~~~~
@@ -2768,6 +2842,7 @@ various pieces fit together.
------------
+[[examining-the-data]]
Examining the data
------------------
@@ -2803,6 +2878,7 @@ $ git-cat-file commit HEAD
to see what the top commit was.
+[[merging-multiple-trees]]
Merging multiple trees
----------------------
@@ -2854,6 +2930,7 @@ index file, and you can just write the result out with
`git-write-tree`.
+[[merging-multiple-trees-2]]
Merging multiple trees, continued
---------------------------------
@@ -2924,6 +3001,7 @@ $ git-merge-index git-merge-one-file hello.c
and that is what higher level `git merge -s resolve` is implemented with.
+[[pack-files]]
How git stores objects efficiently: pack files
----------------------------------------------
@@ -2984,7 +3062,7 @@ objects will work exactly as they did before.
The gitlink:git-gc[1] command performs packing, pruning, and more for
you, so is normally the only high-level command you need.
-[[dangling-objects]]
+[[dangling-objects-2]]
Dangling objects
----------------
@@ -3065,8 +3143,10 @@ confusing and scary messages, but it won't actually do anything bad. In
contrast, running "git prune" while somebody is actively changing the
repository is a *BAD* idea).
+[[glossary]]
include::glossary.txt[]
+[[todo]]
Notes and todo list for this manual
===================================
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH 3/6] user-manual: clean up fast-forward and dangling-objects sections
From: J. Bruce Fields @ 2007-05-07 5:13 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
In-Reply-To: <11785148442263-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
The previous commit calls attention to the fact that we have two
sections each devoted to fast-forwards and to dangling objects. Revise
and attempt to differentiate them a bit. Some more reorganization may
be required later....
Signed-off-by: J. Bruce Fields
---
Documentation/user-manual.txt | 73 ++++++++++++++++++++++------------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index d353d08..03206c5 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1402,12 +1402,11 @@ differently. Normally, a merge results in a merge commit, with two
parents, one pointing at each of the two lines of development that
were merged.
-However, if one of the two lines of development is completely
-contained within the other--so every commit present in the one is
-already contained in the other--then git just performs a
-<<fast-forwards,fast forward>>; the head of the current branch is
-moved forward to point at the head of the merged-in branch, without
-any new commits being created.
+However, if the current branch is a descendant of the other--so every
+commit present in the one is already contained in the other--then git
+just performs a "fast forward"; the head of the current branch is moved
+forward to point at the head of the merged-in branch, without any new
+commits being created.
[[fixing-mistakes]]
Fixing mistakes
@@ -1559,8 +1558,10 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f
...
-------------------------------------------------
-Dangling objects are objects that are harmless, but also unnecessary;
-you can remove them at any time with gitlink:git-prune[1] or the --prune
+Dangling objects are not a problem. At worst they may take up a little
+extra disk space. They can sometimes provide a last-resort method of
+recovery lost work--see <<dangling-objects>> for details. However, if
+you want, you may remove them with gitlink:git-prune[1] or the --prune
option to gitlink:git-gc[1]:
-------------------------------------------------
@@ -1571,9 +1572,6 @@ This may be time-consuming. Unlike most other git operations (including
git-gc when run without any options), it is not safe to prune while
other git operations are in progress in the same repository.
-For more about dangling objects, see <<dangling-objects>>.
-
-
[[recovering-lost-changes]]
Recovering lost changes
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1626,16 +1624,16 @@ While normal history is shared by every repository that works on the
same project, the reflog history is not shared: it tells you only about
how the branches in your local repository have changed over time.
-[[dangling-objects]]
+[[dangling-object-recovery]]
Examining dangling objects
^^^^^^^^^^^^^^^^^^^^^^^^^^
-In some situations the reflog may not be able to save you. For
-example, suppose you delete a branch, then realize you need the history
-it contained. The reflog is also deleted; however, if you have not
-yet pruned the repository, then you may still be able to find
-the lost commits; run git-fsck and watch for output that mentions
-"dangling commits":
+In some situations the reflog may not be able to save you. For example,
+suppose you delete a branch, then realize you need the history it
+contained. The reflog is also deleted; however, if you have not yet
+pruned the repository, then you may still be able to find the lost
+commits in the dangling objects that git-fsck reports. See
+<<dangling-objects>> for the details.
-------------------------------------------------
$ git fsck
@@ -1667,6 +1665,9 @@ reference pointing to it, for example, a new branch:
$ git branch recovered-branch 7281251ddd
------------------------------------------------
+Other types of dangling objects (blobs and trees) are also possible, and
+dangling objects can arise in other situations.
+
[[sharing-development]]
Sharing development with others
@@ -2260,18 +2261,18 @@ $ git fetch git://example.com/proj.git master:example-master
will create a new branch named "example-master" and store in it the
branch named "master" from the repository at the given URL. If you
already have a branch named example-master, it will attempt to
-"fast-forward" to the commit given by example.com's master branch. So
-next we explain what a fast-forward is:
+<<fast-forwards,fast-forward>> to the commit given by example.com's
+master branch. In more detail:
-[[fast-forwards-2]]
-Understanding git history: fast-forwards
-----------------------------------------
+[[fetch-fast-forwards]]
+git fetch and fast-forwards
+---------------------------
In the previous example, when updating an existing branch, "git
fetch" checks to make sure that the most recent commit on the remote
branch is a descendant of the most recent commit on your copy of the
branch before updating your copy of the branch to point at the new
-commit. Git calls this process a "fast forward".
+commit. Git calls this process a <<fast-forwards,fast forward>>.
A fast forward looks something like this:
@@ -3062,7 +3063,7 @@ objects will work exactly as they did before.
The gitlink:git-gc[1] command performs packing, pruning, and more for
you, so is normally the only high-level command you need.
-[[dangling-objects-2]]
+[[dangling-objects]]
Dangling objects
----------------
@@ -3072,11 +3073,10 @@ objects. They are not a problem.
The most common cause of dangling objects is that you've rebased a
branch, or you have pulled from somebody else who rebased a branch--see
<<cleaning-up-history>>. In that case, the old head of the original
-branch still exists, as does obviously everything it pointed to. The
-branch pointer itself just doesn't, since you replaced it with another
-one.
+branch still exists, as does everything it pointed to. The branch
+pointer itself just doesn't, since you replaced it with another one.
-There are also other situations too that cause dangling objects. For
+There are also other situations that cause dangling objects. For
example, a "dangling blob" may arise because you did a "git add" of a
file, but then, before you actually committed it and made it part of the
bigger picture, you changed something else in that file and committed
@@ -3098,15 +3098,22 @@ be how you recover your old tree (say, you did a rebase, and realized
that you really didn't want to - you can look at what dangling objects
you have, and decide to reset your head to some old dangling state).
-For commits, the most useful thing to do with dangling objects tends to
-be to do a simple
+For commits, you can just use:
------------------------------------------------
$ gitk <dangling-commit-sha-goes-here> --not --all
------------------------------------------------
-For blobs and trees, you can't do the same, but you can examine them.
-You can just do
+This asks for all the history reachable from the given commit but not
+from any branch, tag, or other reference. If you decide it's something
+you want, you can always create a new reference to it, e.g.,
+
+------------------------------------------------
+$ git branch recovered-branch <dangling-commit-sha-goes-here>
+------------------------------------------------
+
+For blobs and trees, you can't do the same, but you can still examine
+them. You can just do
------------------------------------------------
$ git show <dangling-blob/tree-sha-goes-here>
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH 4/6] user-manual: fix .gitconfig editing examples
From: J. Bruce Fields @ 2007-05-07 5:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, J. Bruce Fields
In-Reply-To: <1178514845119-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
Santi Béjar points out that when telling people how to "introduce
themselves" to git we're advising them to replace their entire
.gitconfig file. Fix that.
Cc: "Santi Béjar <sbejar@gmail.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
Documentation/user-manual.txt | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 03206c5..c292b4d 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -158,7 +158,7 @@ Making changes
Make sure git knows who to blame:
------------------------------------------------
-$ cat >~/.gitconfig <<\EOF
+$ cat >>~/.gitconfig <<\EOF
[user]
name = Your Name Comes Here
email = you@yourdomain.example.com
@@ -1049,14 +1049,13 @@ Telling git your name
---------------------
Before creating any commits, you should introduce yourself to git. The
-easiest way to do so is:
+easiest way to do so is to make sure the following lines appear in a
+file named .gitconfig in your home directory:
------------------------------------------------
-$ cat >~/.gitconfig <<\EOF
[user]
name = Your Name Comes Here
email = you@yourdomain.example.com
-EOF
------------------------------------------------
(See the "CONFIGURATION FILE" section of gitlink:git-config[1] for
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH 5/6] user-manual: miscellaneous editing
From: J. Bruce Fields @ 2007-05-07 5:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, J. Bruce Fields
In-Reply-To: <11785148452962-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
I cherry-picked some additional miscellaneous fixes from those suggested
by Santi Béjar, including fixes to:
- correct discussion of repository/HEAD->repository shortcut
- add mention of git-mergetool
- add mention of --track
- mention "-f" as well as "+" for fetch
Cc: Santi Béjar <sbejar@gmail.com>
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
Documentation/user-manual.txt | 82 +++++++++++++++++++++++-----------------
1 files changed, 47 insertions(+), 35 deletions(-)
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index c292b4d..67f5b9b 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -57,7 +57,7 @@ Managing branches
-----------------
-----------------------------------------------
-$ git branch # list all branches in this repo
+$ git branch # list all local branches in this repo
$ git checkout test # switch working directory to branch "test"
$ git branch new # create branch "new" starting at current HEAD
$ git branch -d new # delete branch "new"
@@ -496,8 +496,8 @@ git branch <branch> <start-point>::
including using a branch name or a tag name
git branch -d <branch>::
delete the branch <branch>; if the branch you are deleting
- points to a commit which is not reachable from this branch,
- this command will fail with a warning.
+ points to a commit which is not reachable from the current
+ branch, this command will fail with a warning.
git branch -D <branch>::
even if the branch points to a commit not reachable
from the current branch, you may know that that commit
@@ -602,13 +602,9 @@ shorthand:
The full name is occasionally useful if, for example, there ever
exists a tag and a branch with the same name.
-As another useful shortcut, if the repository "origin" posesses only
-a single branch, you can refer to that branch as just "origin".
-
-More generally, if you have defined a remote repository named
-"example", you can refer to the branch in that repository as
-"example". And for a repository with multiple branches, this will
-refer to the branch designated as the "HEAD" branch.
+As another useful shortcut, the "HEAD" of a repository can be referred
+to just using the name of that repository. So, for example, "origin"
+is usually a shortcut for the HEAD branch in the repository "origin".
For the complete list of paths which git checks for references, and
the order it uses to decide which to choose when there are multiple
@@ -832,10 +828,10 @@ $ git tag stable-1 1b2e1d63ff
You can use stable-1 to refer to the commit 1b2e1d63ff.
-This creates a "lightweight" tag. If the tag is a tag you wish to
-share with others, and possibly sign cryptographically, then you
-should create a tag object instead; see the gitlink:git-tag[1] man
-page for details.
+This creates a "lightweight" tag. If you would also like to include a
+comment with the tag, and possibly sign it cryptographically, then you
+should create a tag object instead; see the gitlink:git-tag[1] man page
+for details.
[[browsing-revisions]]
Browsing revisions
@@ -1176,6 +1172,8 @@ $ git diff --cached # difference between HEAD and the index; what
$ git diff # difference between the index file and your
# working directory; changes that would not
# be included if you ran "commit" now.
+$ git diff HEAD # difference between HEAD and working tree; what
+ # would be committed if you ran "commit -a" now.
$ git status # a brief per-file summary of the above.
-------------------------------------------------
@@ -1223,8 +1221,6 @@ If you examine the resulting commit using gitk, you will see that it
has two parents, one pointing to the top of the current branch, and
one to the top of the other branch.
-In more detail:
-
[[resolving-a-merge]]
Resolving a merge
-----------------
@@ -1361,6 +1357,9 @@ $ gitk --merge
These will display all commits which exist only on HEAD or on
MERGE_HEAD, and which touch an unmerged file.
+You may also use gitlink:git-mergetool, which lets you merge the
+unmerged files using external tools such as emacs or kdiff3.
+
Each time you resolve the conflicts in a file and update the index:
-------------------------------------------------
@@ -1705,9 +1704,16 @@ so often you can accomplish the above with just
$ git pull
-------------------------------------------------
-See the descriptions of the branch.<name>.remote and
-branch.<name>.merge options in gitlink:git-config[1] to learn
-how to control these defaults depending on the current branch.
+See the descriptions of the branch.<name>.remote and branch.<name>.merge
+options in gitlink:git-config[1] to learn how to control these defaults
+depending on the current branch. Also note that the --track option to
+gitlink:git-branch[1] and gitlink:git-checkout[1] can be used to
+automatically set the default remote branch to pull from at the time
+that a branch is created:
+
+-------------------------------------------------
+$ git checkout --track -b origin/maint maint
+-------------------------------------------------
In addition to saving you keystrokes, "git pull" also helps you by
producing a default commit message documenting the branch and
@@ -1830,14 +1836,14 @@ Now, assume your personal repository is in the directory ~/proj. We
first create a new clone of the repository:
-------------------------------------------------
-$ git clone --bare proj-clone.git
+$ git clone --bare proj.git
-------------------------------------------------
-The resulting directory proj-clone.git will contains a "bare" git
+The resulting directory proj.git will contains a "bare" git
repository--it is just the contents of the ".git" directory, without
a checked-out copy of a working directory.
-Next, copy proj-clone.git to the server where you plan to host the
+Next, copy proj.git to the server where you plan to host the
public repository. You can use scp, rsync, or whatever is most
convenient.
@@ -1863,7 +1869,7 @@ adjustments to give web clients some extra information they need:
-------------------------------------------------
$ mv proj.git /home/you/public_html/proj.git
$ cd proj.git
-$ git update-server-info
+$ git --bare update-server-info
$ chmod a+x hooks/post-update
-------------------------------------------------
@@ -1930,7 +1936,7 @@ As with git-fetch, you may also set up configuration options to
save typing; so, for example, after
-------------------------------------------------
-$ cat >.git/config <<EOF
+$ cat >>.git/config <<EOF
[remote "public-repo"]
url = ssh://yourserver.com/~you/proj.git
EOF
@@ -2312,9 +2318,15 @@ descendant of the old head, you may force the update with:
$ git fetch git://example.com/proj.git +master:refs/remotes/example/master
-------------------------------------------------
-Note the addition of the "+" sign. Be aware that commits that the
-old version of example/master pointed at may be lost, as we saw in
-the previous section.
+Note the addition of the "+" sign. Alternatively, you can use the "-f"
+flag to force updates of all the fetched branches, as in:
+
+-------------------------------------------------
+$ git fetch -f origin
+-------------------------------------------------
+
+Be aware that commits that the old version of example/master pointed at
+may be lost, as we saw in the previous section.
[[remote-branch-configuration]]
Configuring remote branches
@@ -2400,7 +2412,7 @@ approximated by the SHA1 hash of the object itself. Objects may refer
to other objects (by referencing their SHA1 hash), and so you can
build up a hierarchy of objects.
-All objects have a statically determined "type" aka "tag", which is
+All objects have a statically determined "type" which is
determined at object creation time, and which identifies the format of
the object (i.e. how it is used, and how it can refer to other
objects). There are currently four different object types: "blob",
@@ -2423,7 +2435,7 @@ the time of the commit). In addition, a "commit" refers to one or more
that directory hierarchy.
As a special case, a commit object with no parents is called the "root"
-object, and is the point of an initial project commit. Each project
+commit, and is the point of an initial project commit. Each project
must have at least one root, and while you can tie several different
root objects together into one project by creating a commit object which
has two or more separate roots as its ultimate parents, that's probably
@@ -2542,7 +2554,7 @@ that the tree is "good" or that the merge information makes sense.
The parents do not have to actually have any relationship with the
result, for example.
-Note on commits: unlike real SCM's, commits do not contain
+Note on commits: unlike some SCM's, commits do not contain
rename information or file mode change information. All of that is
implicit in the trees involved (the result tree, and the result trees
of the parents), and describing that makes no sense in this idiotic
@@ -2609,7 +2621,7 @@ The "index" aka "Current Directory Cache"
-----------------------------------------
The index is a simple binary file, which contains an efficient
-representation of a virtual directory content at some random time. It
+representation of the contents of a virtual directory. It
does so by a simple array that associates a set of names, dates,
permissions and content (aka "blob") objects together. The cache is
always kept ordered by name, and names are unique (with a few very
@@ -2912,7 +2924,7 @@ since the tree object information is always the first line in a commit
object.
Once you know the three trees you are going to merge (the one "original"
-tree, aka the common case, and the two "result" trees, aka the branches
+tree, aka the common tree, and the two "result" trees, aka the branches
you want to merge), you do a "merge" read into the index. This will
complain if it has to throw away your old index contents, so you should
make sure that you've committed those - in fact you would normally
@@ -2966,14 +2978,14 @@ obviously the final outcome is what is in `HEAD`. What the
above example shows is that file `hello.c` was changed from
`$orig` to `HEAD` and `$orig` to `$target` in a different way.
You could resolve this by running your favorite 3-way merge
-program, e.g. `diff3` or `merge`, on the blob objects from
-these three stages yourself, like this:
+program, e.g. `diff3`, `merge`, or git's own merge-file, on
+the blob objects from these three stages yourself, like this:
------------------------------------------------
$ git-cat-file blob 263414f... >hello.c~1
$ git-cat-file blob 06fa6a2... >hello.c~2
$ git-cat-file blob cc44c73... >hello.c~3
-$ merge hello.c~2 hello.c~1 hello.c~3
+$ git merge-file hello.c~2 hello.c~1 hello.c~3
------------------------------------------------
This would leave the merge result in `hello.c~2` file, along
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH 6/6] user-manual: stop deprecating the manual
From: J. Bruce Fields @ 2007-05-07 5:14 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, J. Bruce Fields
In-Reply-To: <11785148461307-git-send-email->
From: J. Bruce Fields <bfields@citi.umich.edu>
It's just as much a work-in-progress, but at least now it's gotten
enough technical review to shake out most of the really bad lies, so
hopefully it doesn't do any actual damage. And if we encourage people
to read it, they'll be more likely to whine about it, which will help
get it fixed faster.
Signed-off-by: "J. Bruce Fields" <bfields@citi.umich.edu>
---
Documentation/git.txt | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/git.txt b/Documentation/git.txt
index aa65802..c2b7f3f 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -21,10 +21,9 @@ and full access to internals.
See this link:tutorial.html[tutorial] to get started, then see
link:everyday.html[Everyday Git] for a useful minimum set of commands, and
"man git-commandname" for documentation of each command. CVS users may
-also want to read link:cvs-migration.html[CVS migration].
-link:user-manual.html[Git User's Manual] is still work in
-progress, but when finished hopefully it will guide a new user
-in a coherent way to git enlightenment ;-).
+also want to read link:cvs-migration.html[CVS migration]. See
+link:user-manual.html[Git User's Manual] for a more in-depth
+introduction.
The COMMAND is either a name of a Git command (see below) or an alias
as defined in the configuration file (see gitlink:git-config[1]).
--
1.5.1.1.98.gedb4f
^ permalink raw reply related
* [PATCH] Documentation: don't reference non-existent 'git-cvsapplycommit'
From: Jeff King @ 2007-05-07 5:28 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
Signed-off-by: Jeff King <peff@peff.net>
---
Documentation/git-cvsexportcommit.txt | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt
index 555b823..fd7f540 100644
--- a/Documentation/git-cvsexportcommit.txt
+++ b/Documentation/git-cvsexportcommit.txt
@@ -25,7 +25,7 @@ by default.
Supports file additions, removals, and commits that affect binary files.
-If the commit is a merge commit, you must tell git-cvsapplycommit what parent
+If the commit is a merge commit, you must tell git-cvsexportcommit what parent
should the changeset be done against.
OPTIONS
--
1.5.2.rc2.694.g2202
^ permalink raw reply related
* Re: [FAQ?] Rationale for git's way to manage the index
From: Karl Hasselström @ 2007-05-07 6:35 UTC (permalink / raw)
To: Julian Phillips; +Cc: Matthieu Moy, git
In-Reply-To: <Pine.LNX.4.64.0705062344230.29485@reaper.quantumfyre.co.uk>
On 2007-05-06 23:53:13 +0100, Julian Phillips wrote:
> On Sun, 6 May 2007, Matthieu Moy wrote:
>
> > The reason why I'm posting this is that I was wondering whether
> > "commit -a" not being the default was supposed to be a message
> > like "you shouln't use it too often".
>
> Well, personally I practically never use it, I find that having a
> separation between what the current state of my tree is and what
> will be comitted to be one of the really "oh wow, why doens't
> everything else do this?" features. However, i tend to be working on
> more than one thing at once, and switch between them - so I commit
> work on A while work on B is still unfinished, then start C, finish
> B some point later and commit it, and then I can finish C. Git is
> the first VCS that supports a butterfly mind :P.
git-gui is really handy for adding/committing a subset of the changes
in your working tree. Especially for those of us with goldfish memory,
since it's so easy to see exactly what's happening: what's going to be
committed and what not.
> "git add -i" - this is a feature I have wanted since I started using
> version control ...
I thought "git add -i" was the best thing since sliced bread -- until
I found the same feature in git-gui, but with a _much_ better
interface. Just right-click on a hunk in a diff, and you have the
option of staging/unstaging that hunk. Pure magic.
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: [PATCH] git-parse-remote: fix ambiguous shell bug in expand_refs_wildcard
From: Jeff King @ 2007-05-07 6:36 UTC (permalink / raw)
To: Herbert Xu; +Cc: Junio C Hamano, git
In-Reply-To: <20070505080313.GA12170@gondor.apana.org.au>
On Sat, May 05, 2007 at 06:03:13PM +1000, Herbert Xu wrote:
> In fact the rationale (C.2.2.3) in the POSIX document explicitly
> disallows the aformentioned usage as it violates the rule that an
> even number of single quotes if any can occur in an ${...} expression
> enclosed by double quotes.
Yes, there's not much room for interpretation; the old git code was
clearly bogus (we are working around it by using sed instead). Thanks
for tracking this down, Herbert.
It looks like bash is actually broken in POSIXLY_CORRECT mode, then:
$ echo $BASH_VERSION
3.1.17(1)-release
$ POSIXLY_CORRECT=1
$ foo=bar}
$ echo "${foo%'}'}"
bar
My interpretation of the correct behavior is that it should remove a
single quote from the end of foo, and then print '} literally (that is,
single quote and brace).
-Peff
^ permalink raw reply
* Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples
From: Karl Hasselström @ 2007-05-07 6:42 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: Junio C Hamano, git
On 2007-05-07 01:14:00 -0400, J. Bruce Fields wrote:
> Santi Béjar points out that
You seem to have broken his name in this and at least one other patch.
(By the looks of it, you seem to have interpreted a utf8 byte sequence
as latin1.)
--
Karl Hasselström, kha@treskal.com
www.treskal.com/kalle
^ permalink raw reply
* Re: Anyone running GIT on native Windows
From: Johannes Sixt @ 2007-05-07 7:02 UTC (permalink / raw)
To: git
In-Reply-To: <2b7f01c78fb1$be4dc6a0$0200a8c0@AMD2500>
Aaron Gray wrote:
> What I want is to be able to work in Windows CMD and envoke .sh scripts by
> association (unfortunately you have to add the .sh on the command name
> though).
I run the mingw port exclusively from CMD without a .sh association. So
exclusively that I don't even know whether any other way of using the
tools even works. Of course, you have to get used to
git status
git fetch
git commit
git rebase
etc. instead of
git-status
git-fetch
git-commit
git-rebase
and I also use CMD's tab completion frequently, with leaves \ instead of
/ in the paths. I also quite often do
git clone p:\public\repos\foo.git
and
git clone p:/public/repos/foo.git
without a hitch.
Sure, you need a set of Posix tools (sed, grep, cat, wc, sort, ...)
including a Bourne shell that knows how to invoke other scripts by
parsing the interpreter from the first line (#!/bin/sh). (But the perl
scripts (git-remote) will probably work only with MinGW's perl.)
-- Hannes
^ permalink raw reply
* Re: [PATCH 5/6] user-manual: miscellaneous editing
From: Santi Béjar @ 2007-05-07 7:27 UTC (permalink / raw)
To: J. Bruce Fields; +Cc: Junio C Hamano, git
In-Reply-To: <-1060540797535999820@unknownmsgid>
On 5/7/07, J. Bruce Fields <bfields@citi.umich.edu> wrote:
> From: J. Bruce Fields <bfields@citi.umich.edu>
>
> I cherry-picked some additional miscellaneous fixes from those suggested
> by Santi Béjar, including fixes to:
>
> - correct discussion of repository/HEAD->repository shortcut
> - add mention of git-mergetool
> - add mention of --track
> - mention "-f" as well as "+" for fetch
>
> Cc: Santi Béjar <sbejar@gmail.com>
You forgot to CC: the e-mail to me :-)
> diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
> index c292b4d..67f5b9b 100644
> --- a/Documentation/user-manual.txt
> +++ b/Documentation/user-manual.txt
[...]
> @@ -1830,14 +1836,14 @@ Now, assume your personal repository is in the directory ~/proj. We
> first create a new clone of the repository:
>
> -------------------------------------------------
> -$ git clone --bare proj-clone.git
> +$ git clone --bare proj.git
> -------------------------------------------------
You missed the ~/proj as in:
$ git clone --bare ~/proj proj.git
What do you think about the rest of my changes, in particular:
@@ -2374,7 +2388,6 @@ then the following commands will all do the same thing:
-------------------------------------------------
$ git fetch git://example.com/proj.git master:ref/remotes/example/master
$ git fetch example master:ref/remotes/example/master
-$ git fetch example example/master
$ git fetch example
-------------------------------------------------
Santi
^ permalink raw reply
* Re: [PATCH 4/6] user-manual: fix .gitconfig editing examples
From: Santi Béjar @ 2007-05-07 7:29 UTC (permalink / raw)
To: Karl Hasselström; +Cc: J. Bruce Fields, Junio C Hamano, git
In-Reply-To: <20070507064257.GB31269@diana.vm.bytemark.co.uk>
On 5/7/07, Karl Hasselström <kha@treskal.com> wrote:
> On 2007-05-07 01:14:00 -0400, J. Bruce Fields wrote:
>
> > Santi BÃ(c)jar points out that
>
> You seem to have broken his name in this and at least one other patch.
> (By the looks of it, you seem to have interpreted a utf8 byte sequence
> as latin1.)
I see it OK. Both in the mail and in the repo.
Santi
>
> --
> Karl Hasselström, kha@treskal.com
> www.treskal.com/kalle
^ permalink raw reply
* Re: 'upstream' branches.
From: Junio C Hamano @ 2007-05-07 7:40 UTC (permalink / raw)
To: Alex Riesen; +Cc: David Woodhouse, git, Linus Torvalds
In-Reply-To: <20070506092129.GA2434@steel.home>
Alex Riesen <raa.lkml@gmail.com> writes:
> Junio C Hamano, Sun, May 06, 2007 10:00:25 +0200:
>>
>> > Is that possible? I'm fairly sure it used to be.
>>
>> I doubt we had that bug. If you allowed overwriting with +, it
>> would not have prevented a rewind (i.e. pull from Linus and then
>> pull from somebody who pulled from Linus earlier than you did).
>> If you didn't, then it would have failed the fetch.
>>
>
> Maybe we should not fail in the case the remote repo is older then
> local, but just to try to fast-forward local reference after a fetch
> and fail only if the fast-forward fails?
> Or introduce a new syntax for the strict reference succession and make
> fetch+fast-forward the default?
> Or the other way around, use something like "-from:to" to ignore
> fast-forwards failed because the "from" already has all the "to" has,
> which has precedents: make and its "-include", which ignores errors
> from non-existing files.
I think the whole issue would disappear if David stops using the
same 'linus' tracking branch to track origins from *different*
repositories (see my other message on the thread), and I think
it makes the above suggestions fall somewhat in "solutions
looking for a problem" category. If this is a common enough
misconfiguration, we might want to add a sanity check to catch
Pull: lines in different remotes/ files and remote.*.fetch
configurations for different remotes cause the same tracking
branch to be updated, but I personally do not think it is even
worth it.
Having said that, I suspect that making the default <src>:<dst>
(without 'force') to ignore pure rewind (not rewind+rebuild)
might make sense without having much downside. If the remote
repository owner rewinds its tip, current code catches it as a
possible mistake of the remote side, but until it starts
building a different history on top of that rewound head, there
really is no harm done.
One common case that can be helped with such a behaviour change
is when your remote.*.url points at a single URL that actually
is backed by more than one mirrors --- think of www.kernel.org
which resolves to two actual hosts via DNS round robin. If you
fetch from one server, and then fetch again from the other
server that was behind (maybe rsync cron job got stuck for some
unspecified reason), you would observe that the tip was rewound.
Something like this untested patch should be sufficient if we
want to go this route, but I am not convinced yet that this is
the right thing to do. For one thing, it is not clear to me
what should happen if --force is in effect. Should this honor
the "wish" of the remote repository owner to rewind this ref, or
should we assume that it was two servers with mirroring
inconsistency fluke and ignore the rewind, hoping that the next
round will straighten the situation out? What does --force
instructs us to do in such a case?
diff --git a/builtin-fetch--tool.c b/builtin-fetch--tool.c
index 2065466..29d7fe1 100644
--- a/builtin-fetch--tool.c
+++ b/builtin-fetch--tool.c
@@ -119,6 +119,12 @@ static int update_local_ref(const char *name,
return update_ref("fast forward", name, sha1_new, sha1_old);
}
if (!force) {
+ if (in_merge_bases(updated, ¤t, 1)) {
+ fprintf(stderr, "* %s: ignoring straight rewind %s\n",
+ name, note);
+ fprintf(stderr, " old..new: %s..%s\n", oldh, newh);
+ return 0;
+ }
fprintf(stderr,
"* %s: not updating to non-fast forward %s\n",
name, note);
^ permalink raw reply related
* Re: [PATCH] Have git-revert, git-cherry-pick cleanup ./.msg upon successful completion.
From: Gerrit Pape @ 2007-05-07 7:46 UTC (permalink / raw)
To: git
In-Reply-To: <20070505034615.GE16538@spearce.org>
On Fri, May 04, 2007 at 11:46:15PM -0400, Shawn O. Pearce wrote:
> Gerrit Pape <pape@smarden.org> wrote:
> > git-revert and git-cherry-pick left behind the commit message file ./.msg,
> > have them use the -f option to git-commit to properly cleanup the
> > automatically created file.
>
> I'm actually sort of against changing the behavior of git-commit
> -f to mean "delete the file". We never did that before. Users
> might get surprised when their file goes away!
-f never was documented AFAICS, only -F, and even though the file is
gone, the commit message is available through git show then. I
personally would like to have such an option to git commit regardless of
revert and cherry-pick.
I concur with Alex that the teporary file should be in the git directory
and not working directory.
Regards, Gerrit.
^ permalink raw reply
* Re: [PATCH] connect: display connection progress
From: Alex Riesen @ 2007-05-07 7:51 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: Junio C Hamano, git
In-Reply-To: <20070507045451.GE30339@mellanox.co.il>
On 5/7/07, Michael S. Tsirkin <mst@dev.mellanox.co.il> wrote:
> My manual says:
> The inet_ntoa() function shall convert the Internet host address
> specified by in to a string in the Internet standard dot notation.
>
> does it work for IPv6?
does it have to if NO_IPV6 is set?
^ permalink raw reply
* "git reset --hard" not cleaning up working copy?
From: Johan Herland @ 2007-05-07 7:51 UTC (permalink / raw)
To: git
[-- Attachment #1: Type: text/plain, Size: 306 bytes --]
Hi,
When I "git reset --hard HEAD" to purge all my non-committed changes, it
seems that files I created after the last commit (but not part of the
index) are left lying around my working copy. Is this intended?
Have fun!
...Johan
--
Johan Herland, <johan@herland.net>
www.herland.net
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply
* Re: [PATCH] git-parse-remote: fix ambiguous shell bug in expand_refs_wildcard
From: Herbert Xu @ 2007-05-07 8:01 UTC (permalink / raw)
To: Jeff King; +Cc: Junio C Hamano, git
In-Reply-To: <20070507063621.GB31445@coredump.intra.peff.net>
On Mon, May 07, 2007 at 02:36:22AM -0400, Jeff King wrote:
>
> It looks like bash is actually broken in POSIXLY_CORRECT mode, then:
>
> $ echo $BASH_VERSION
> 3.1.17(1)-release
> $ POSIXLY_CORRECT=1
> $ foo=bar}
> $ echo "${foo%'}'}"
> bar
>
> My interpretation of the correct behavior is that it should remove a
> single quote from the end of foo, and then print '} literally (that is,
> single quote and brace).
Well strictly speaking this is allowed by the standard as this usage
contains an odd number of single quotes inside an ${...} expression
enclosed by double quotes, which behaves in an implementation-specific
manner.
Cheers,
--
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply
* Re: [FAQ?] Rationale for git's way to manage the index
From: Matthieu Moy @ 2007-05-07 8:02 UTC (permalink / raw)
To: git
In-Reply-To: <Pine.LNX.4.64.0705070146140.4167@racer.site>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Just another reason to hate CVS. Because it trained people to do that. If
> it was not for the training by CVS, I would have strongly opposed to the
> introduction of the "-m" switch to commit. It _encourages_ bad commit
> messages.
Well, this really depends on the use-case, size of commit, ...
I often use a version control system for very low importance stuff. I
don't want to type a 3-lines long message to describe a 2-lines long
change in my ~/.emacs.el for example. I also work with people using
(sorry) svn to work collaboratively, but they don't even provide a log
message: the version control system here is just a replacement for
unison/NFS/whatever other way to have people edit files from different
machines.
For sure, in a context where code quality and review is important,
-m "xxx" isn't the way (except if you prefer your shell's line editor
to your actual editor).
--
Matthieu
^ permalink raw reply
* Re: Git benchmarks at OpenOffice.org wiki
From: Junio C Hamano @ 2007-05-07 8:05 UTC (permalink / raw)
To: Linus Torvalds
Cc: Jakub Narebski, Johannes Schindelin, git, dev, Jan Holesovsky
In-Reply-To: <alpine.LFD.0.98.0705042049330.3819@woody.linux-foundation.org>
Linus Torvalds <torvalds@linux-foundation.org> writes:
> A trivial patch is to just do
>
> git pack-refs --all --prune
>
> in the "git-clone.sh" script rather than force people to do it themselves,
> but we really probably shouldn't have ever even unpacked them in the first
> place. That is kind of stupid, but especially since that thing is written
> in shell, it's hard to do anything smarter.
It is not just being in shell.
Although I do agree that the initial clone is special, I would
rather make clone just a thin wrapper to fetch that also happens
to perform necessary initial setup.
Keeping fetched and updated refs in core and write a packed refs
out in one go in git-fetch--tool (and later, git-fetch all in C)
would be much simpler if we do not have to worry about existing
refs (aka "git clone" special case); I am not sure if packing
refs is desirable in general for incremental "git-fetch".
^ permalink raw reply
* Re: [PATCH] Document "commit --only".
From: Matthieu Moy @ 2007-05-07 8:16 UTC (permalink / raw)
To: git
In-Reply-To: <alpine.LFD.0.99.0705061908430.24220@xanadu.home>
Nicolas Pitre <nico@cam.org> writes:
> This looks really confusing. This is the default _only_ if files are
> specified on the command line.
>
> IMHO I'd rather remove the option from the synopsis and flag it as
> scheduled for removal in the source instead.
I'm fine with this proposal. Next email will be a patch to do that
(I'm not sure about the standard way to deprecate things in git, so I
just added a warning when -o is used, feel free to improve it).
--
Matthieu
^ permalink raw reply
* Re: [PATCH] Document the fact that commit -a is the way to go for simple operations
From: Matthieu Moy @ 2007-05-07 8:21 UTC (permalink / raw)
To: git
In-Reply-To: <alpine.LFD.0.99.0705061904050.24220@xanadu.home>
Nicolas Pitre <nico@cam.org> writes:
>> --- a/Documentation/git-commit.txt
>> +++ b/Documentation/git-commit.txt
>> @@ -54,7 +54,8 @@ OPTIONS
>> -a|--all::
>> Tell the command to automatically stage files that have
>> been modified and deleted, but new files you have not
>> - told git about are not affected.
>> + told git about are not affected. You should use it for most
>> + trivial operations.
>
> I don't think this patch is worth it. If anything it might create more
> confusion.
>
> There are many ways to commit without -a which still could be considered
> amongst "most trivial operations".
My proposal is not perfect, and I'm sure we can do better.
But the problem with most of git's manpages for beginners is that the
documentation is mostly technical and factual. That is, it tells you
what git will do if you provide such or such option, but not _why_ and
_when_ you should use it.
Probably just a "gitlink:" to the place in the user manual which talks
about the index would be OK here.
--
Matthieu
^ permalink raw reply
* [PATCH] Remove mention of -o|--only in SYNOPSYS of git-commit.
From: Matthieu Moy @ 2007-05-07 8:21 UTC (permalink / raw)
To: git; +Cc: Matthieu Moy
This flag is actually useless since it is the default behavior, and
was mentionned in the SYNOPSYS, but not actually documented. Better
just deprecate it.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
Documentation/git-commit.txt | 4 ++--
git-commit.sh | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 53a7bb0..4324ca0 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -11,7 +11,7 @@ SYNOPSIS
'git-commit' [-a | --interactive] [-s] [-v]
[(-c | -C) <commit> | -F <file> | -m <msg> | --amend]
[--no-verify] [-e] [--author <author>]
- [--] [[-i | -o ]<file>...]
+ [--] [[-i] <files>...]
DESCRIPTION
-----------
@@ -91,7 +91,7 @@ OPTIONS
Used to amend the tip of the current branch. Prepare the tree
object you would want to replace the latest commit as usual
- (this includes the usual -i/-o and explicit paths), and the
+ (this includes the usual -i and explicit paths), and the
commit log editor is seeded with the commit message from the
tip of the current branch. The commit you create replaces the
current tip -- if it was a merge, it will have the parents of
diff --git a/git-commit.sh b/git-commit.sh
index f28fc24..3913097 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -3,7 +3,7 @@
# Copyright (c) 2005 Linus Torvalds
# Copyright (c) 2006 Junio C Hamano
-USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [[-i | -o] <path>...]'
+USAGE='[-a | --interactive] [-s] [-v] [--no-verify] [-m <message> | -F <logfile> | (-C|-c) <commit> | --amend] [-u] [-e] [--author <author>] [[-i] <path>...]'
SUBDIRECTORY_OK=Yes
. git-sh-setup
require_work_tree
@@ -138,6 +138,8 @@ do
shift
;;
-o|--o|--on|--onl|--only)
+ echo >&2 "Warning: --only option is now the default."
+ echo >&2 "It will be removed in a future version of git."
only=t
shift
;;
--
1.5.1.1
^ permalink raw reply related
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox