mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-24 05:34:35 +02:00
Code
Git Source Code Mirror. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
55,010 Commits 6 Branches 953 Tags 303 MiB
C 50.3%
Shell 38.6%
Perl 5.2%
Tcl 3.3%
Python 0.8%
Other 1.6%
6eff409e8a
Go to file
Nguyễn Thái Ngọc Duy 6eff409e8a checkout: prevent losing staged changes with --merge 
When --merge is specified, we may need to do a real merge (instead of
three-way tree unpacking), the steps are best seen in git-checkout.sh
version before it's removed:

    # Match the index to the working tree, and do a three-way.
    git diff-files --name-only | git update-index --remove --stdin &&
    work=`git write-tree` &&
    git read-tree $v --reset -u $new || exit

    git merge-recursive $old -- $new $work

    # Do not register the cleanly merged paths in the index yet.
    # this is not a real merge before committing, but just carrying
    # the working tree changes along.
    unmerged=`git ls-files -u`
    git read-tree $v --reset $new
    case "$unmerged" in
    '')     ;;
    *)
            (
                    z40=0000000000000000000000000000000000000000
                    echo "$unmerged" |
                    sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /"
                    echo "$unmerged"
            ) | git update-index --index-info
            ;;
    esac

Notice the last 'read-tree --reset' step. We restore worktree back to
'new' tree after worktree's messed up by merge-recursive. If there are
staged changes before this whole command sequence is executed, they
are lost because they are unlikely part of the 'new' tree to be
restored.

There is no easy way to fix this. Elijah may have something up his
sleeves [1], but until then, check if there are staged changes and
refuse to run and lose them. The user would need to do "git reset" to
continue in this case.

A note about the test update. 'checkout -m' in that test will fail
because a deletion is staged. This 'checkout -m' was previously needed
to verify quietness behavior of unpack-trees. But a different check
has been put in place in the last patch. We can safely drop
'checkout -m' now.

[1] CABPp-BFoL_U=bzON4SEMaQSKU2TKwnOgNqjt5MUaOejTKGUJxw@mail.gmail.com

Reported-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2019-03-24 21:35:34 +09:00
.github
block-sha1
builtin checkout: prevent losing staged changes with --merge 2019-03-24 21:35:34 +09:00
ci travis: remove the hack to build the Windows job on Azure Pipelines 2019-03-01 08:21:26 +09:00
compat Merge branch 'jk/guard-bswap-header' 2019-03-11 16:16:25 +09:00
contrib Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
Documentation read-tree: add --quiet 2019-03-24 21:35:34 +09:00
ewah
git-gui
gitk-git Merge git://ozlabs.org/~paulus/gitk 2019-03-18 11:18:49 +09:00
gitweb
mergetools
negotiator
perl
po gitk: Update Bulgarian translation (317t) 2019-03-14 20:16:17 +11:00
ppc
refs
sha1collisiondetection@232357eb2e
sha1dc
sha256
t checkout: prevent losing staged changes with --merge 2019-03-24 21:35:34 +09:00
templates
trace2 trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
vcs-svn
xdiff
.clang-format trace2: add for_each macros to clang-format 2019-02-22 15:28:22 -08:00
.editorconfig
.gitattributes
.gitignore
.gitmodules
.mailmap
.travis.yml travis: remove the hack to build the Windows job on Azure Pipelines 2019-03-01 08:21:26 +09:00
.tsan-suppressions
abspath.c
aclocal.m4
advice.c
advice.h
alias.c
alias.h
alloc.c
alloc.h
apply.c
apply.h
archive-tar.c
archive-zip.c
archive.c
archive.h
argv-array.c
argv-array.h
attr.c Merge branch 'rd/attr.c-comment-typofix' 2019-03-11 16:16:24 +09:00
attr.h
azure-pipelines.yml
banned.h
base85.c
bisect.c bisect: make diff-tree output prettier 2019-03-01 07:31:38 +09:00
bisect.h
blame.c Merge branch 'wh/author-committer-ident-config' 2019-03-07 09:59:53 +09:00
blame.h
blob.c
blob.h
branch.c
branch.h
builtin.h
bulk-checkin.c
bulk-checkin.h
bundle.c
bundle.h
cache-tree.c
cache-tree.h
cache.h Merge branch 'ma/clear-repository-format' 2019-03-20 15:16:07 +09:00
chdir-notify.c
chdir-notify.h
check_bindir
check-builtins.sh
checkout.c
checkout.h
color.c
color.h
column.c
column.h
combine-diff.c Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
command-list.txt
commit-graph.c
commit-graph.h
commit-reach.c
commit-reach.h
commit-slab-decl.h
commit-slab-impl.h
commit-slab.h
commit.c
commit.h
common-main.c trace2: collect Windows-specific process information 2019-02-22 15:27:59 -08:00
config.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
config.h
config.mak.dev Makefile: allow for combining DEVELOPER=1 and CFLAGS="..." 2019-02-24 07:35:07 -08:00
config.mak.in
config.mak.uname Sync with maint 2019-03-11 16:16:34 +09:00
configure.ac
connect.c trace2:data: add trace2 transport child classification 2019-02-22 15:28:14 -08:00
connect.h
connected.c
connected.h
convert.c
convert.h
copy.c
COPYING
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-islands.c
delta-islands.h
delta.h
detect-compiler
diff-delta.c
diff-lib.c
diff-no-index.c diff: reuse diff setup for --no-index case 2019-02-24 07:08:34 -08:00
diff.c Merge branch 'nd/diff-parseopt-2' 2019-03-07 09:59:58 +09:00
diff.h Merge branch 'jk/diff-no-index-initialize' 2019-03-07 09:59:59 +09:00
diffcore-break.c
diffcore-delta.c
diffcore-order.c
diffcore-pickaxe.c
diffcore-rename.c
diffcore.h
dir-iterator.c
dir-iterator.h
dir.c
dir.h
editor.c trace2:data: add editor/pager child classification 2019-02-22 15:27:59 -08:00
entry.c Merge branch 'tg/checkout-no-overlay' 2019-03-07 09:59:51 +09:00
environment.c
exec-cmd.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
exec-cmd.h
fast-import.c
fetch-negotiator.c
fetch-negotiator.h
fetch-object.c
fetch-object.h
fetch-pack.c Merge branch 'jk/no-sigpipe-during-network-transport' 2019-03-20 15:16:06 +09:00
fetch-pack.h
fmt-merge-msg.h
fsck.c
fsck.h
fsmonitor.c
fsmonitor.h
fuzz-commit-graph.c
fuzz-pack-headers.c
fuzz-pack-idx.c
generate-cmdlist.sh
gettext.c
gettext.h
git-add--interactive.perl
git-archimport.perl
git-bisect.sh
git-compat-util.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
git-cvsexportcommit.perl
git-cvsimport.perl
git-cvsserver.perl
git-difftool--helper.sh
git-filter-branch.sh
git-instaweb.sh
git-legacy-rebase.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-quiltimport.sh
git-rebase--am.sh
git-rebase--common.sh
git-rebase--preserve-merges.sh
git-remote-testgit.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-VERSION-GEN Start 2.22 cycle 2019-03-07 11:59:54 +09:00
git-web--browse.sh
git.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
git.rc
gpg-interface.c
gpg-interface.h
graph.c
graph.h
grep.c
grep.h
hash.h
hashmap.c
hashmap.h
help.c
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
INSTALL
interdiff.c
interdiff.h
iterator.h
json-writer.c
json-writer.h
khash.h
kwset.c
kwset.h
levenshtein.c
levenshtein.h
LGPL-2.1
line-log.c
line-log.h
line-range.c
line-range.h
linear-assignment.c
linear-assignment.h
list-objects-filter-options.c
list-objects-filter-options.h
list-objects-filter.c
list-objects-filter.h
list-objects.c
list-objects.h
list.h
ll-merge.c
ll-merge.h
lockfile.c
lockfile.h
log-tree.c Merge branch 'wh/author-committer-ident-config' 2019-03-07 09:59:53 +09:00
log-tree.h
ls-refs.c
ls-refs.h
mailinfo.c
mailinfo.h
mailmap.c
mailmap.h
Makefile Merge branch 'ab/makefile-help-devs-more' 2019-03-20 15:16:04 +09:00
match-trees.c
mem-pool.c
mem-pool.h
merge-blobs.c
merge-blobs.h
merge-recursive.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
merge-recursive.h
merge.c
mergesort.c
mergesort.h
midx.c
midx.h
name-hash.c
notes-cache.c
notes-cache.h
notes-merge.c
notes-merge.h
notes-utils.c
notes-utils.h
notes.c
notes.h
object-store.h
object.c
object.h
oidmap.c
oidmap.h
oidset.c
oidset.h
pack-bitmap-write.c
pack-bitmap.c
pack-bitmap.h
pack-check.c
pack-objects.c
pack-objects.h
pack-revindex.c
pack-revindex.h
pack-write.c
pack.h
packfile.c
packfile.h
pager.c trace2:data: add editor/pager child classification 2019-02-22 15:27:59 -08:00
parse-options-cb.c
parse-options.c
parse-options.h Merge branch 'br/commit-tree-parseopt' 2019-03-20 15:16:08 +09:00
patch-delta.c
patch-ids.c
patch-ids.h
path.c
path.h
pathspec.c
pathspec.h
pkt-line.c Merge branch 'jk/no-sigpipe-during-network-transport' 2019-03-20 15:16:06 +09:00
pkt-line.h remote-curl: use post_rpc() for protocol v2 also 2019-03-03 19:00:42 +09:00
preload-index.c
pretty.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
pretty.h
prio-queue.c
prio-queue.h
progress.c
progress.h
prompt.c
prompt.h
protocol.c
protocol.h
quote.c
quote.h
range-diff.c
range-diff.h
reachable.c
reachable.h
read-cache.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
README.md README: adjust for final Azure Pipeline ID 2019-02-23 21:27:04 -08:00
rebase-interactive.c
rebase-interactive.h
ref-filter.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
ref-filter.h
reflog-walk.c
reflog-walk.h
refs.c
refs.h
refspec.c
refspec.h
RelNotes Start 2.22 cycle 2019-03-07 11:59:54 +09:00
remote-curl.c Merge branch 'jt/http-auth-proto-v2-fix' 2019-03-07 10:00:00 +09:00
remote-testsvn.c
remote.c
remote.h
replace-object.c
replace-object.h
repository.c Merge branch 'ma/clear-repository-format' 2019-03-20 15:16:07 +09:00
repository.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
rerere.c
rerere.h
resolve-undo.c
resolve-undo.h
revision.c Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
revision.h Merge branch 'en/combined-all-paths' 2019-03-07 09:59:54 +09:00
run-command.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
run-command.h trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
send-pack.c
send-pack.h
sequencer.c Merge branch 'jh/trace2' 2019-03-07 09:59:56 +09:00
sequencer.h
serve.c
serve.h
server-info.c
setup.c Merge branch 'ma/clear-repository-format' 2019-03-20 15:16:07 +09:00
sh-i18n--envsubst.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
sha1-array.c
sha1-array.h
sha1-file.c
sha1-lookup.c
sha1-lookup.h
sha1-name.c
sha1dc_git.c
sha1dc_git.h
shallow.c
shell.c
shortlog.h
sideband.c
sideband.h
sigchain.c
sigchain.h
split-index.c Merge branch 'nd/split-index-null-base-fix' 2019-03-07 09:59:56 +09:00
split-index.h
strbuf.c
strbuf.h
streaming.c
streaming.h
string-list.c
string-list.h
sub-process.c trace2:data: add trace2 sub-process classification 2019-02-22 15:28:12 -08:00
sub-process.h
submodule-config.c
submodule-config.h
submodule.c Merge branch 'nd/completion-more-parameters' 2019-03-07 09:59:58 +09:00
submodule.h
symlinks.c
tag.c
tag.h
tar.h
tempfile.c
tempfile.h
thread-utils.c
thread-utils.h
tmp-objdir.c
tmp-objdir.h
trace2.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
trace2.h trace2: collect Windows-specific process information 2019-02-22 15:27:59 -08:00
trace.c
trace.h
trailer.c
trailer.h
transport-helper.c trace2:data: add trace2 transport child classification 2019-02-22 15:28:14 -08:00
transport-internal.h
transport.c trace2:data: add trace2 hook classification 2019-02-22 15:28:21 -08:00
transport.h
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
tree.h
unicode-width.h
unimplemented.sh
unix-socket.c
unix-socket.h
unpack-trees.c unpack-trees: rename "gently" flag to "quiet" 2019-03-24 21:35:34 +09:00
unpack-trees.h unpack-trees: rename "gently" flag to "quiet" 2019-03-24 21:35:34 +09:00
upload-pack.c
upload-pack.h
url.c
url.h
urlmatch.c
urlmatch.h
usage.c trace2: create new combined trace facility 2019-02-22 15:27:59 -08:00
userdiff.c
userdiff.h
utf8.c
utf8.h
varint.c
varint.h
version.c
version.h
versioncmp.c
walker.c
walker.h
wildmatch.c
wildmatch.h
worktree.c setup: fix memory leaks with struct repository_format 2019-03-01 08:52:00 +09:00
worktree.h
wrap-for-bin.sh
wrapper.c
write-or-die.c
ws.c
wt-status.c trace2:data: add trace2 regions to wt-status 2019-02-22 15:27:59 -08:00
wt-status.h
xdiff-interface.c
xdiff-interface.h
zlib.c

README.md

Build Status

Git - fast, scalable, distributed revision control system

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.

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

See Documentation/gittutorial.txt to get started, then see Documentation/giteveryday.txt for a useful minimum set of commands, and Documentation/git-.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).

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 https://public-inbox.org/git/, http://marc.info/?l=git and other archival sites.

Issues which are security relevant should be disclosed privately to the Git Security mailing list git-security@googlegroups.com.

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.

The name "git" was given by Linus Torvalds when he wrote the very first version. He described the tool as "the stupid content tracker" and the name as (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