kernel/git - git - PowerEL Git System

Go to file

Jeff King 9f48f2bd9a pull: update unborn branch tip after index When commit `d09e79c` taught git to pull into an unborn branch, it first updated the unborn branch to point at the pulled commit, and then used read-tree to update the index and working tree. That ordering made sense, since any failure of the latter step would be due to filesystem errors, and one could then recover with "git reset --hard". Later, commit `4b3ffe5` added extra safety for existing files in the working tree by asking read-tree to bail out when it would overwrite such a file. This error mode is much less "your pull failed due to random errors" and more like "we reject this pull because it would lose data". In that case, it makes sense not to update the HEAD ref, just as a regular rejected merge would do. This patch reverses the order of the update-ref and read-tree calls, so that we do not touch the HEAD ref at all if a merge is rejected. This also means that we would not update HEAD in case of a transient filesystem error, but those are presumably less rare (and one can still recover by repeating the pull, or by accessing FETCH_HEAD directly). While we're reorganizing the code, we can drop the "exit 1" from the end of our command chain. We exit immediately either way, and just calling exit without an argument will use the exit code from the last command. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2013-06-20 15:51:25 -07:00
Documentation	trivial: Add missing period in documentation	2013-05-28 15:15:29 -07:00
block-sha1	…
builtin	Merge branch 'tr/remote-tighten-commandline-parsing' into maint	2013-05-03 15:12:38 -07:00
compat	precompose-utf8: fix spelling of "want" in error message	2013-04-12 12:24:04 -07:00
contrib	completion: zsh: don't override suffix on _detault	2013-05-03 15:10:05 -07:00
git-gui	…
git_remote_helpers	…
gitk-git	…
gitweb	gitweb/INSTALL: Simplify description of GITWEB_CONFIG_SYSTEM	2013-04-15 07:25:46 -07:00
mergetools	mergetools/kdiff3: do not use --auto when diffing	2013-05-09 11:59:39 -07:00
perl	Merge branch 'tr/perl-keep-stderr-open' into maint	2013-04-22 11:26:55 -07:00
po	doc: various spelling fixes	2013-04-12 12:00:52 -07:00
ppc	…
t	t0070 "mktemp to unwritable directory" needs SANITY	2013-06-11 14:23:31 -07:00
templates	pre-push.sample: Make the script executable	2013-06-11 11:22:00 -07:00
vcs-svn	…
xdiff	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
.gitattributes	…
.gitignore	…
.mailmap	mailmap: update Pasky's address	2013-04-04 13:03:34 -07:00
COPYING	…
GIT-VERSION-GEN	Git 1.8.2.3	2013-05-09 13:31:17 -07:00
INSTALL	Typo fix: replacing it's -> its	2013-04-11 17:39:05 -07:00
LGPL-2.1	…
Makefile	…
README	…
RelNotes	Git 1.8.2.3	2013-05-09 13:31:17 -07:00
abspath.c	…
aclocal.m4	…
advice.c	…
advice.h	…
alias.c	…
alloc.c	…
archive-tar.c	…
archive-zip.c	…
archive.c	…
archive.h	…
argv-array.c	…
argv-array.h	…
attr.c	Sync with 1.8.1.6	2013-04-07 13:17:50 -07:00
attr.h	…
base85.c	…
bisect.c	Merge branch 'jk/bisect-prn-unsigned' into maint	2013-04-12 13:41:46 -07:00
bisect.h	…
blob.c	…
blob.h	…
branch.c	…
branch.h	…
builtin.h	…
bulk-checkin.c	…
bulk-checkin.h	…
bundle.c	bundle: Accept prerequisites without commit messages	2013-04-07 14:45:56 -07:00
bundle.h	…
cache-tree.c	…
cache-tree.h	…
cache.h	Merge branch 'jk/alias-in-bare' into maint	2013-04-03 09:25:41 -07:00
check-builtins.sh	…
check-racy.c	…
check_bindir	…
color.c	…
color.h	…
column.c	…
column.h	…
combine-diff.c	…
command-list.txt	…
commit.c	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
commit.h	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
config.c	…
config.mak.in	…
config.mak.uname	…
configure.ac	…
connect.c	…
connected.c	…
connected.h	…
convert.c	…
convert.h	…
copy.c	…
credential-cache--daemon.c	…
credential-cache.c	…
credential-store.c	…
credential.c	…
credential.h	…
csum-file.c	…
csum-file.h	…
ctype.c	…
daemon.c	…
date.c	…
decorate.c	…
decorate.h	…
delta.h	…
diff-delta.c	…
diff-lib.c	…
diff-no-index.c	…
diff.c	Merge branch 'jk/diff-algo-finishing-touches' into maint	2013-04-24 16:19:42 -07:00
diff.h	…
diffcore-break.c	diffcore-break: don't divide by zero	2013-04-03 12:48:02 -07:00
diffcore-delta.c	…
diffcore-order.c	…
diffcore-pickaxe.c	diffcore-pickaxe: unify code for log -S/-G	2013-04-05 10:31:09 -07:00
diffcore-rename.c	…
diffcore.h	…
dir.c	Sync with 1.8.1.6	2013-04-07 13:17:50 -07:00
dir.h	…
editor.c	…
entry.c	Merge branch 'jk/checkout-attribute-lookup' into maint-1.8.1	2013-04-03 08:43:40 -07:00
environment.c	Merge branch 'jk/alias-in-bare' into maint	2013-04-03 09:25:41 -07:00
exec_cmd.c	…
exec_cmd.h	…
fast-import.c	…
fetch-pack.c	…
fetch-pack.h	…
fixup-builtins	…
fmt-merge-msg.h	…
fsck.c	…
fsck.h	…
generate-cmdlist.sh	…
gettext.c	…
gettext.h	…
git-add--interactive.perl	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
git-am.sh	…
git-archimport.perl	…
git-bisect.sh	…
git-compat-util.h	Merge branch 'jk/a-thread-only-dies-once' into maint	2013-04-26 11:25:59 -07:00
git-cvsexportcommit.perl	…
git-cvsimport.perl	…
git-cvsserver.perl	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
git-difftool--helper.sh	…
git-difftool.perl	…
git-filter-branch.sh	Merge branch 'jk/filter-branch-come-back-to-original' into maint	2013-04-22 11:26:55 -07:00
git-instaweb.sh	…
git-lost-found.sh	…
git-merge-octopus.sh	…
git-merge-one-file.sh	…
git-merge-resolve.sh	…
git-mergetool--lib.sh	…
git-mergetool.sh	…
git-p4.py	…
git-parse-remote.sh	…
git-pull.sh	pull: update unborn branch tip after index	2013-06-20 15:51:25 -07:00
git-quiltimport.sh	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
git-rebase--am.sh	…
git-rebase--interactive.sh	…
git-rebase--merge.sh	…
git-rebase.sh	…
git-relink.perl	…
git-remote-testgit	…
git-remote-testpy.py	…
git-repack.sh	…
git-request-pull.sh	…
git-send-email.perl	…
git-sh-i18n.sh	…
git-sh-setup.sh	…
git-stash.sh	…
git-submodule.sh	…
git-svn.perl	…
git-web--browse.sh	…
git.c	Merge branch 'jk/alias-in-bare' into maint	2013-04-03 09:25:41 -07:00
git.spec.in	…
gpg-interface.c	Merge branch 'mg/gpg-interface-using-status' into maint	2013-04-03 09:26:27 -07:00
gpg-interface.h	…
graph.c	…
graph.h	…
grep.c	…
grep.h	…
hash.c	…
hash.h	…
help.c	help.c: add a compatibility comment to cmd_version()	2013-04-16 15:01:30 -07:00
help.h	…
hex.c	…
http-backend.c	…
http-fetch.c	…
http-push.c	…
http-walker.c	…
http.c	…
http.h	…
ident.c	…
imap-send.c	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	2013-04-03 08:35:33 -07:00
kwset.c	kwset: fix spelling in comments	2013-04-12 12:25:08 -07:00
kwset.h	…
levenshtein.c	…
levenshtein.h	…
list-objects.c	…
list-objects.h	…
ll-merge.c	…
ll-merge.h	…
lockfile.c	…
log-tree.c	Merge branch 'mg/gpg-interface-using-status' into maint	2013-04-03 09:26:27 -07:00
log-tree.h	…
mailmap.c	…
mailmap.h	…
match-trees.c	…
merge-blobs.c	…
merge-blobs.h	…
merge-recursive.c	…
merge-recursive.h	…
merge.c	…
mergesort.c	…
mergesort.h	…
name-hash.c	Sync with 1.8.1 maintenance track	2013-04-03 09:18:01 -07:00
notes-cache.c	…
notes-cache.h	…
notes-merge.c	…
notes-merge.h	…
notes.c	…
notes.h	…
object.c	…
object.h	…
pack-check.c	…
pack-refs.c	…
pack-refs.h	…
pack-revindex.c	…
pack-revindex.h	…
pack-write.c	…
pack.h	…
pager.c	…
parse-options-cb.c	…
parse-options.c	…
parse-options.h	…
patch-delta.c	…
patch-ids.c	…
patch-ids.h	…
path.c	…
pathspec.c	…
pathspec.h	…
pkt-line.c	…
pkt-line.h	…
preload-index.c	…
pretty.c	pretty: handle broken commit headers gracefully	2013-04-17 14:50:36 -07:00
progress.c	…
progress.h	…
prompt.c	…
prompt.h	…
quote.c	…
quote.h	…
reachable.c	…
reachable.h	…
read-cache.c	Sync with 1.8.1 maintenance track	2013-04-03 09:18:01 -07:00
reflog-walk.c	…
reflog-walk.h	…
refs.c	Sync with 1.8.1 maintenance track	2013-04-03 09:18:01 -07:00
refs.h	…
remote-curl.c	…
remote-testsvn.c	…
remote.c	…
remote.h	…
replace_object.c	…
rerere.c	rerere forget: do not segfault if not all stages are present	2013-04-04 12:27:28 -07:00
rerere.h	…
resolve-undo.c	…
resolve-undo.h	…
revision.c	Merge branch 'tr/copy-revisions-from-stdin' into maint	2013-05-09 12:42:17 -07:00
revision.h	…
run-command.c	Merge branch 'jk/a-thread-only-dies-once' into maint	2013-04-26 11:25:59 -07:00
run-command.h	…
send-pack.c	…
send-pack.h	…
sequencer.c	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
sequencer.h	…
server-info.c	…
setup.c	Merge branch 'jk/alias-in-bare' into maint	2013-04-03 09:25:41 -07:00
sh-i18n--envsubst.c	…
sha1-array.c	…
sha1-array.h	…
sha1-lookup.c	…
sha1-lookup.h	…
sha1_file.c	…
sha1_name.c	…
shallow.c	…
shell.c	…
shortlog.h	…
show-index.c	…
sideband.c	…
sideband.h	…
sigchain.c	…
sigchain.h	…
strbuf.c	…
strbuf.h	…
streaming.c	…
streaming.h	…
string-list.c	…
string-list.h	…
submodule.c	…
submodule.h	…
symlinks.c	…
tag.c	…
tag.h	…
tar.h	…
test-chmtime.c	…
test-ctype.c	…
test-date.c	…
test-delta.c	…
test-dump-cache-tree.c	…
test-genrandom.c	…
test-index-version.c	…
test-line-buffer.c	…
test-match-trees.c	…
test-mergesort.c	…
test-mktemp.c	…
test-parse-options.c	…
test-path-utils.c	…
test-regex.c	…
test-revision-walking.c	…
test-run-command.c	…
test-scrap-cache-tree.c	…
test-sha1.c	…
test-sha1.sh	…
test-sigchain.c	…
test-string-list.c	…
test-subprocess.c	…
test-svn-fe.c	…
test-wildmatch.c	…
thread-utils.c	…
thread-utils.h	…
trace.c	…
transport-helper.c	transport-helper: trivial style cleanup	2013-05-09 11:33:01 -07:00
transport.c	…
transport.h	Correct common spelling mistakes in comments and tests	2013-04-12 13:38:40 -07:00
tree-diff.c	…
tree-walk.c	…
tree-walk.h	…
tree.c	…
tree.h	…
unimplemented.sh	…
unix-socket.c	…
unix-socket.h	…
unpack-trees.c	…
unpack-trees.h	…
upload-pack.c	Merge branch 'jk/peel-ref' into maint	2013-04-04 12:59:55 -07:00
url.c	…
url.h	…
usage.c	Merge branch 'jk/a-thread-only-dies-once' into maint	2013-04-26 11:25:59 -07:00
userdiff.c	…
userdiff.h	…
utf8.c	Merge branch 'ks/rfc2047-one-char-at-a-time' into maint	2013-04-03 09:25:29 -07:00
utf8.h	Merge branch 'ks/rfc2047-one-char-at-a-time' into maint	2013-04-03 09:25:29 -07:00
varint.c	…
varint.h	…
version.c	…
version.h	…
walker.c	…
walker.h	…
wildmatch.c	…
wildmatch.h	…
wrap-for-bin.sh	…
wrapper.c	…
write_or_die.c	…
ws.c	…
wt-status.c	Merge branch 'tb/document-status-u-tradeoff' into maint	2013-04-12 08:12:47 -07:00
wt-status.h	…
xdiff-interface.c	…
xdiff-interface.h	…
zlib.c	…

README

////////////////////////////////////////////////////////////////

	Git - the stupid content tracker

////////////////////////////////////////////////////////////////

"git" can mean anything, depending on your mood.

 - random three-letter combination that is pronounceable, and not
   actually used by any common UNIX command.  The fact that it is a
   mispronunciation of "get" may or may not be relevant.
 - stupid. contemptible and despicable. simple. Take your pick from the
   dictionary of slang.
 - "global information tracker": you're in a good mood, and it actually
   works for you. Angels sing, and a light suddenly fills the room.
 - "goddamn idiotic truckload of sh*t": when it breaks

Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.

Git is an Open Source project covered by the GNU General Public
License version 2 (some parts of it are under different licenses,
compatible with the GPLv2). It was originally written by Linus
Torvalds with help of a group of hackers around the net.

Please read the file INSTALL for installation instructions.

See Documentation/gittutorial.txt to get started, then see
Documentation/everyday.txt for a useful minimum set of commands, and
Documentation/git-commandname.txt for documentation of each command.
If git has been correctly installed, then the tutorial can also be
read with "man gittutorial" or "git help tutorial", and the
documentation of each command with "man git-commandname" or "git help
commandname".

CVS users may also want to read Documentation/gitcvs-migration.txt
("man gitcvs-migration" or "git help cvs-migration" if git is
installed).

Many Git online resources are accessible from http://git-scm.com/
including full documentation and Git related tools.

The user discussion and development of Git take place on the Git
mailing list -- everyone is welcome to post bug reports, feature
requests, comments and patches to git@vger.kernel.org (read
Documentation/SubmittingPatches for instructions on patch submission).
To subscribe to the list, send an email with just "subscribe git" in
the body to majordomo@vger.kernel.org. The mailing list archives are
available at http://news.gmane.org/gmane.comp.version-control.git/,
http://marc.info/?l=git and other archival sites.

The maintainer frequently sends the "What's cooking" reports that
list the current status of various development topics to the mailing
list.  The discussion following them give a good reference for
project status, development direction and remaining tasks.