/
usr
/
libexec
/
git-core
/
/usr/libexec/git-core
mkdir
upload
Name
Size
Mode
Actions
git
1139544
0755
edit
dl
rm
git-add
1139544
0755
edit
dl
rm
git-add--interactive
35716
0755
edit
dl
rm
git-am
19036
0755
edit
dl
rm
git-annotate
1139544
0755
edit
dl
rm
git-apply
1139544
0755
edit
dl
rm
git-archive
1139544
0755
edit
dl
rm
git-bisect
10021
0755
edit
dl
rm
git-bisect--helper
1139544
0755
edit
dl
rm
git-blame
1139544
0755
edit
dl
rm
git-branch
1139544
0755
edit
dl
rm
git-bundle
1139544
0755
edit
dl
rm
git-cat-file
1139544
0755
edit
dl
rm
git-check-attr
1139544
0755
edit
dl
rm
git-check-ref-format
1139544
0755
edit
dl
rm
git-checkout
1139544
0755
edit
dl
rm
git-checkout-index
1139544
0755
edit
dl
rm
git-cherry
1139544
0755
edit
dl
rm
git-cherry-pick
1139544
0755
edit
dl
rm
git-clean
1139544
0755
edit
dl
rm
git-clone
1139544
0755
edit
dl
rm
git-commit
1139544
0755
edit
dl
rm
git-commit-tree
1139544
0755
edit
dl
rm
git-config
1139544
0755
edit
dl
rm
git-count-objects
1139544
0755
edit
dl
rm
git-describe
1139544
0755
edit
dl
rm
git-diff
1139544
0755
edit
dl
rm
git-diff-files
1139544
0755
edit
dl
rm
git-diff-index
1139544
0755
edit
dl
rm
git-diff-tree
1139544
0755
edit
dl
rm
git-difftool
2696
0755
edit
dl
rm
git-difftool--helper
1745
0755
edit
dl
rm
git-fast-export
1139544
0755
edit
dl
rm
git-fast-import
501632
0755
edit
dl
rm
git-fetch
1139544
0755
edit
dl
rm
git-fetch-pack
1139544
0755
edit
dl
rm
git-filter-branch
12172
0755
edit
dl
rm
git-fmt-merge-msg
1139544
0755
edit
dl
rm
git-for-each-ref
1139544
0755
edit
dl
rm
git-format-patch
1139544
0755
edit
dl
rm
git-fsck
1139544
0755
edit
dl
rm
git-fsck-objects
1139544
0755
edit
dl
rm
git-gc
1139544
0755
edit
dl
rm
git-get-tar-commit-id
1139544
0755
edit
dl
rm
git-grep
1139544
0755
edit
dl
rm
git-hash-object
1139544
0755
edit
dl
rm
git-help
1139544
0755
edit
dl
rm
git-http-backend
469088
0755
edit
dl
rm
git-http-fetch
490432
0755
edit
dl
rm
git-http-push
506560
0755
edit
dl
rm
git-imap-send
486656
0755
edit
dl
rm
git-index-pack
1139544
0755
edit
dl
rm
git-init
1139544
0755
edit
dl
rm
git-init-db
1139544
0755
edit
dl
rm
git-instaweb
248389
0755
edit
dl
rm
git-log
1139544
0755
edit
dl
rm
git-lost-found
554
0755
edit
dl
rm
git-ls-files
1139544
0755
edit
dl
rm
git-ls-remote
1139544
0755
edit
dl
rm
git-ls-tree
1139544
0755
edit
dl
rm
git-mailinfo
1139544
0755
edit
dl
rm
git-mailsplit
1139544
0755
edit
dl
rm
git-merge
1139544
0755
edit
dl
rm
git-merge-base
1139544
0755
edit
dl
rm
git-merge-file
1139544
0755
edit
dl
rm
git-merge-index
1139544
0755
edit
dl
rm
git-merge-octopus
2068
0755
edit
dl
rm
git-merge-one-file
3814
0755
edit
dl
rm
git-merge-ours
1139544
0755
edit
dl
rm
git-merge-recursive
1139544
0755
edit
dl
rm
git-merge-resolve
944
0755
edit
dl
rm
git-merge-subtree
1139544
0755
edit
dl
rm
git-merge-tree
1139544
0755
edit
dl
rm
git-mergetool
6099
0755
edit
dl
rm
git-mergetool--lib
9006
0644
edit
dl
rm
git-mktag
1139544
0755
edit
dl
rm
git-mktree
1139544
0755
edit
dl
rm
git-mv
1139544
0755
edit
dl
rm
git-name-rev
1139544
0755
edit
dl
rm
git-notes
1139544
0755
edit
dl
rm
git-pack-objects
1139544
0755
edit
dl
rm
git-pack-redundant
1139544
0755
edit
dl
rm
git-pack-refs
1139544
0755
edit
dl
rm
git-parse-remote
1941
0644
edit
dl
rm
git-patch-id
1139544
0755
edit
dl
rm
git-peek-remote
1139544
0755
edit
dl
rm
git-prune
1139544
0755
edit
dl
rm
git-prune-packed
1139544
0755
edit
dl
rm
git-pull
8027
0755
edit
dl
rm
git-push
1139544
0755
edit
dl
rm
git-quiltimport
3348
0755
edit
dl
rm
git-read-tree
1139544
0755
edit
dl
rm
git-rebase
14646
0755
edit
dl
rm
git-rebase--interactive
24915
0755
edit
dl
rm
git-receive-pack
1139544
0755
edit
dl
rm
git-reflog
1139544
0755
edit
dl
rm
git-relink
4201
0755
edit
dl
rm
git-remote
1139544
0755
edit
dl
rm
git-remote-ftp
499168
0755
edit
dl
rm
git-remote-ftps
499168
0755
edit
dl
rm
git-remote-http
499168
0755
edit
dl
rm
git-remote-https
499168
0755
edit
dl
rm
git-repack
4492
0755
edit
dl
rm
git-replace
1139544
0755
edit
dl
rm
git-repo-config
1139544
0755
edit
dl
rm
git-request-pull
1592
0755
edit
dl
rm
git-rerere
1139544
0755
edit
dl
rm
git-reset
1139544
0755
edit
dl
rm
git-rev-list
1139544
0755
edit
dl
rm
git-rev-parse
1139544
0755
edit
dl
rm
git-revert
1139544
0755
edit
dl
rm
git-rm
1139544
0755
edit
dl
rm
git-send-pack
1139544
0755
edit
dl
rm
git-sh-setup
4013
0644
edit
dl
rm
git-shell
461304
0755
edit
dl
rm
git-shortlog
1139544
0755
edit
dl
rm
git-show
1139544
0755
edit
dl
rm
git-show-branch
1139544
0755
edit
dl
rm
git-show-index
10872
0755
edit
dl
rm
git-show-ref
1139544
0755
edit
dl
rm
git-stage
1139544
0755
edit
dl
rm
git-stash
8838
0755
edit
dl
rm
git-status
1139544
0755
edit
dl
rm
git-stripspace
1139544
0755
edit
dl
rm
git-submodule
17784
0755
edit
dl
rm
git-symbolic-ref
1139544
0755
edit
dl
rm
git-tag
1139544
0755
edit
dl
rm
git-tar-tree
1139544
0755
edit
dl
rm
git-unpack-file
1139544
0755
edit
dl
rm
git-unpack-objects
1139544
0755
edit
dl
rm
git-update-index
1139544
0755
edit
dl
rm
git-update-ref
1139544
0755
edit
dl
rm
git-update-server-info
1139544
0755
edit
dl
rm
git-upload-archive
1139544
0755
edit
dl
rm
git-upload-pack
471216
0755
edit
dl
rm
git-var
1139544
0755
edit
dl
rm
git-verify-pack
1139544
0755
edit
dl
rm
git-verify-tag
1139544
0755
edit
dl
rm
git-web--browse
3961
0755
edit
dl
rm
git-whatchanged
1139544
0755
edit
dl
rm
git-write-tree
1139544
0755
edit
dl
rm
Edit:
/usr/libexec/git-core/git-merge-one-file
(3814B)
#!/bin/sh # # Copyright (c) Linus Torvalds, 2005 # # This is the git per-file merge script, called with # # $1 - original file SHA1 (or empty) # $2 - file in branch1 SHA1 (or empty) # $3 - file in branch2 SHA1 (or empty) # $4 - pathname in repository # $5 - original file mode (or empty) # $6 - file in branch1 mode (or empty) # $7 - file in branch2 mode (or empty) # # Handle some trivial cases.. The _really_ trivial cases have # been handled already by git read-tree, but that one doesn't # do any merges that might change the tree layout. USAGE='<orig blob> <our blob> <their blob> <path>' USAGE="$USAGE <orig mode> <our mode> <their mode>" LONG_USAGE="Usage: git merge-one-file $USAGE Blob ids and modes should be empty for missing files." if ! test "$#" -eq 7 then echo "$LONG_USAGE" exit 1 fi case "${1:-.}${2:-.}${3:-.}" in # # Deleted in both or deleted in one and unchanged in the other # "$1.." | "$1.$1" | "$1$1.") if [ "$2" ]; then echo "Removing $4" else # read-tree checked that index matches HEAD already, # so we know we do not have this path tracked. # there may be an unrelated working tree file here, # which we should just leave unmolested. Make sure # we do not have it in the index, though. exec git update-index --remove -- "$4" fi if test -f "$4"; then rm -f -- "$4" && rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || : fi && exec git update-index --remove -- "$4" ;; # # Added in one. # ".$2.") # the other side did not add and we added so there is nothing # to be done, except making the path merged. exec git update-index --add --cacheinfo "$6" "$2" "$4" ;; "..$3") echo "Adding $4" if test -f "$4" then echo "ERROR: untracked $4 is overwritten by the merge." exit 1 fi git update-index --add --cacheinfo "$7" "$3" "$4" && exec git checkout-index -u -f -- "$4" ;; # # Added in both, identically (check for same permissions). # ".$3$2") if [ "$6" != "$7" ]; then echo "ERROR: File $4 added identically in both branches," echo "ERROR: but permissions conflict $6->$7." exit 1 fi echo "Adding $4" git update-index --add --cacheinfo "$6" "$2" "$4" && exec git checkout-index -u -f -- "$4" ;; # # Modified in both, but differently. # "$1$2$3" | ".$2$3") case ",$6,$7," in *,120000,*) echo "ERROR: $4: Not merging symbolic link changes." exit 1 ;; *,160000,*) echo "ERROR: $4: Not merging conflicting submodule changes." exit 1 ;; esac src2=`git-unpack-file $3` case "$1" in '') echo "Added $4 in both, but differently." # This extracts OUR file in $orig, and uses git apply to # remove lines that are unique to ours. orig=`git-unpack-file $2` sz0=`wc -c <"$orig"` diff -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add sz1=`wc -c <"$orig"` # If we do not have enough common material, it is not # worth trying two-file merge using common subsections. expr "$sz0" \< "$sz1" \* 2 >/dev/null || : >$orig ;; *) echo "Auto-merging $4" orig=`git-unpack-file $1` ;; esac # Be careful for funny filename such as "-L" in "$4", which # would confuse "merge" greatly. src1=`git-unpack-file $2` git merge-file "$src1" "$orig" "$src2" ret=$? msg= if [ $ret -ne 0 ]; then msg='content conflict' fi # Create the working tree file, using "our tree" version from the # index, and then store the result of the merge. git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" rm -f -- "$orig" "$src1" "$src2" if [ "$6" != "$7" ]; then if [ -n "$msg" ]; then msg="$msg, " fi msg="${msg}permissions conflict: $5->$6,$7" ret=1 fi if [ "$1" = '' ]; then ret=1 fi if [ $ret -ne 0 ]; then echo "ERROR: $msg in $4" exit 1 fi exec git update-index -- "$4" ;; *) echo "ERROR: $4: Not handling case $1 -> $2 -> $3" ;; esac exit 1
Save
cmd:
run