/
usr
/
lib
/
git-core
/
/usr/lib/git-core
mkdir
upload
Name
Size
Mode
Actions
mergetools/
-
0755
rm
git
3710360
0755
edit
dl
rm
git-add
3710360
0755
edit
dl
rm
git-add--interactive
47770
0755
edit
dl
rm
git-am
3710360
0755
edit
dl
rm
git-annotate
3710360
0755
edit
dl
rm
git-apply
3710360
0755
edit
dl
rm
git-archive
3710360
0755
edit
dl
rm
git-bisect
2137
0755
edit
dl
rm
git-bisect--helper
3710360
0755
edit
dl
rm
git-blame
3710360
0755
edit
dl
rm
git-branch
3710360
0755
edit
dl
rm
git-bugreport
3710360
0755
edit
dl
rm
git-bundle
3710360
0755
edit
dl
rm
git-cat-file
3710360
0755
edit
dl
rm
git-check-attr
3710360
0755
edit
dl
rm
git-check-ignore
3710360
0755
edit
dl
rm
git-check-mailmap
3710360
0755
edit
dl
rm
git-check-ref-format
3710360
0755
edit
dl
rm
git-checkout
3710360
0755
edit
dl
rm
git-checkout--worker
3710360
0755
edit
dl
rm
git-checkout-index
3710360
0755
edit
dl
rm
git-cherry
3710360
0755
edit
dl
rm
git-cherry-pick
3710360
0755
edit
dl
rm
git-clean
3710360
0755
edit
dl
rm
git-clone
3710360
0755
edit
dl
rm
git-column
3710360
0755
edit
dl
rm
git-commit
3710360
0755
edit
dl
rm
git-commit-graph
3710360
0755
edit
dl
rm
git-commit-tree
3710360
0755
edit
dl
rm
git-config
3710360
0755
edit
dl
rm
git-count-objects
3710360
0755
edit
dl
rm
git-credential
3710360
0755
edit
dl
rm
git-credential-cache
3710360
0755
edit
dl
rm
git-credential-cache--daemon
3710360
0755
edit
dl
rm
git-credential-store
3710360
0755
edit
dl
rm
git-daemon
594624
0755
edit
dl
rm
git-describe
3710360
0755
edit
dl
rm
git-diff
3710360
0755
edit
dl
rm
git-diff-files
3710360
0755
edit
dl
rm
git-diff-index
3710360
0755
edit
dl
rm
git-diff-tree
3710360
0755
edit
dl
rm
git-difftool
3710360
0755
edit
dl
rm
git-difftool--helper
2503
0755
edit
dl
rm
git-env--helper
3710360
0755
edit
dl
rm
git-fast-export
3710360
0755
edit
dl
rm
git-fast-import
3710360
0755
edit
dl
rm
git-fetch
3710360
0755
edit
dl
rm
git-fetch-pack
3710360
0755
edit
dl
rm
git-filter-branch
15862
0755
edit
dl
rm
git-fmt-merge-msg
3710360
0755
edit
dl
rm
git-for-each-ref
3710360
0755
edit
dl
rm
git-for-each-repo
3710360
0755
edit
dl
rm
git-format-patch
3710360
0755
edit
dl
rm
git-fsck
3710360
0755
edit
dl
rm
git-fsck-objects
3710360
0755
edit
dl
rm
git-gc
3710360
0755
edit
dl
rm
git-get-tar-commit-id
3710360
0755
edit
dl
rm
git-grep
3710360
0755
edit
dl
rm
git-hash-object
3710360
0755
edit
dl
rm
git-help
3710360
0755
edit
dl
rm
git-http-backend
594888
0755
edit
dl
rm
git-http-fetch
657376
0755
edit
dl
rm
git-http-push
1004000
0755
edit
dl
rm
git-imap-send
640744
0755
edit
dl
rm
git-index-pack
3710360
0755
edit
dl
rm
git-init
3710360
0755
edit
dl
rm
git-init-db
3710360
0755
edit
dl
rm
git-instaweb
22362
0755
edit
dl
rm
git-interpret-trailers
3710360
0755
edit
dl
rm
git-log
3710360
0755
edit
dl
rm
git-ls-files
3710360
0755
edit
dl
rm
git-ls-remote
3710360
0755
edit
dl
rm
git-ls-tree
3710360
0755
edit
dl
rm
git-mailinfo
3710360
0755
edit
dl
rm
git-mailsplit
3710360
0755
edit
dl
rm
git-maintenance
3710360
0755
edit
dl
rm
git-merge
3710360
0755
edit
dl
rm
git-merge-base
3710360
0755
edit
dl
rm
git-merge-file
3710360
0755
edit
dl
rm
git-merge-index
3710360
0755
edit
dl
rm
git-merge-octopus
2477
0755
edit
dl
rm
git-merge-one-file
3695
0755
edit
dl
rm
git-merge-ours
3710360
0755
edit
dl
rm
git-merge-recursive
3710360
0755
edit
dl
rm
git-merge-resolve
944
0755
edit
dl
rm
git-merge-subtree
3710360
0755
edit
dl
rm
git-merge-tree
3710360
0755
edit
dl
rm
git-mergetool
11564
0755
edit
dl
rm
git-mergetool--lib
9772
0644
edit
dl
rm
git-mktag
3710360
0755
edit
dl
rm
git-mktree
3710360
0755
edit
dl
rm
git-multi-pack-index
3710360
0755
edit
dl
rm
git-mv
3710360
0755
edit
dl
rm
git-name-rev
3710360
0755
edit
dl
rm
git-notes
3710360
0755
edit
dl
rm
git-pack-objects
3710360
0755
edit
dl
rm
git-pack-redundant
3710360
0755
edit
dl
rm
git-pack-refs
3710360
0755
edit
dl
rm
git-patch-id
3710360
0755
edit
dl
rm
git-prune
3710360
0755
edit
dl
rm
git-prune-packed
3710360
0755
edit
dl
rm
git-pull
3710360
0755
edit
dl
rm
git-push
3710360
0755
edit
dl
rm
git-quiltimport
3693
0755
edit
dl
rm
git-range-diff
3710360
0755
edit
dl
rm
git-read-tree
3710360
0755
edit
dl
rm
git-rebase
3710360
0755
edit
dl
rm
git-receive-pack
3710360
0755
edit
dl
rm
git-reflog
3710360
0755
edit
dl
rm
git-remote
3710360
0755
edit
dl
rm
git-remote-ext
3710360
0755
edit
dl
rm
git-remote-fd
3710360
0755
edit
dl
rm
git-remote-ftp
690544
0755
edit
dl
rm
git-remote-ftps
690544
0755
edit
dl
rm
git-remote-http
690544
0755
edit
dl
rm
git-remote-https
690544
0755
edit
dl
rm
git-repack
3710360
0755
edit
dl
rm
git-replace
3710360
0755
edit
dl
rm
git-request-pull
4130
0755
edit
dl
rm
git-rerere
3710360
0755
edit
dl
rm
git-reset
3710360
0755
edit
dl
rm
git-restore
3710360
0755
edit
dl
rm
git-rev-list
3710360
0755
edit
dl
rm
git-rev-parse
3710360
0755
edit
dl
rm
git-revert
3710360
0755
edit
dl
rm
git-rm
3710360
0755
edit
dl
rm
git-send-pack
3710360
0755
edit
dl
rm
git-sh-i18n
1683
0644
edit
dl
rm
git-sh-i18n--envsubst
565696
0755
edit
dl
rm
git-sh-prompt
17781
0644
edit
dl
rm
git-sh-setup
8877
0644
edit
dl
rm
git-shell
565840
0755
edit
dl
rm
git-shortlog
3710360
0755
edit
dl
rm
git-show
3710360
0755
edit
dl
rm
git-show-branch
3710360
0755
edit
dl
rm
git-show-index
3710360
0755
edit
dl
rm
git-show-ref
3710360
0755
edit
dl
rm
git-sparse-checkout
3710360
0755
edit
dl
rm
git-stage
3710360
0755
edit
dl
rm
git-stash
3710360
0755
edit
dl
rm
git-status
3710360
0755
edit
dl
rm
git-stripspace
3710360
0755
edit
dl
rm
git-submodule
14102
0755
edit
dl
rm
git-submodule--helper
3710360
0755
edit
dl
rm
git-subtree
23570
0755
edit
dl
rm
git-switch
3710360
0755
edit
dl
rm
git-symbolic-ref
3710360
0755
edit
dl
rm
git-tag
3710360
0755
edit
dl
rm
git-unpack-file
3710360
0755
edit
dl
rm
git-unpack-objects
3710360
0755
edit
dl
rm
git-update-index
3710360
0755
edit
dl
rm
git-update-ref
3710360
0755
edit
dl
rm
git-update-server-info
3710360
0755
edit
dl
rm
git-upload-archive
3710360
0755
edit
dl
rm
git-upload-pack
3710360
0755
edit
dl
rm
git-var
3710360
0755
edit
dl
rm
git-verify-commit
3710360
0755
edit
dl
rm
git-verify-pack
3710360
0755
edit
dl
rm
git-verify-tag
3710360
0755
edit
dl
rm
git-web--browse
4401
0755
edit
dl
rm
git-whatchanged
3710360
0755
edit
dl
rm
git-worktree
3710360
0755
edit
dl
rm
git-write-tree
3710360
0755
edit
dl
rm
Edit:
/usr/lib/git-core/git-merge-one-file
(3695B)
#!/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." SUBDIRECTORY_OK=Yes . git-sh-setup cd_to_toplevel require_work_tree if test $# != 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 { test -z "$6" && test "$5" != "$7"; } || { test -z "$7" && test "$5" != "$6"; } then echo "ERROR: File $4 deleted on one branch but had its" >&2 echo "ERROR: permissions changed on the other." >&2 exit 1 fi if test -n "$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." >&2 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 test "$6" != "$7" then echo "ERROR: File $4 added identically in both branches," >&2 echo "ERROR: but permissions conflict $6->$7." >&2 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." >&2 exit 1 ;; *,160000,*) echo "ERROR: $4: Not merging conflicting submodule changes." >&2 exit 1 ;; esac src1=$(git unpack-file $2) src2=$(git unpack-file $3) case "$1" in '') echo "Added $4 in both, but differently." orig=$(git unpack-file $(git hash-object /dev/null)) ;; *) echo "Auto-merging $4" orig=$(git unpack-file $1) ;; esac git merge-file "$src1" "$orig" "$src2" ret=$? msg= if test $ret != 0 || test -z "$1" then msg='content conflict' ret=1 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" || exit 1 rm -f -- "$orig" "$src1" "$src2" if test "$6" != "$7" then if test -n "$msg" then msg="$msg, " fi msg="${msg}permissions conflict: $5->$6,$7" ret=1 fi if test $ret != 0 then echo "ERROR: $msg in $4" >&2 exit 1 fi exec git update-index -- "$4" ;; *) echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2 ;; esac exit 1
Save
cmd:
run