global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-23 09:01:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-one-file: avoid dashed invocation

Browse Source 
The original idea of deprecating invocations of Git subcommands via
their dashed form was to be able to ship without having to hard-link
each and every builtin to its dashed form.

We need to follow this plan ourselves, by patching our very own scripts
accordingly.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-11-29 23:34:18 +01:00
parent 1d3ade7e4f
commit dcbc74ecb9
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
git-merge-one-file.sh
View File

@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
;;
esac
src1=$(git-unpack-file $2)
src2=$(git-unpack-file $3)
src1=$(git unpack-file $2)
src2=$(git unpack-file $3)
case "$1" in
'')
echo "Added $4 in both, but differently."
orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
;;
*)
echo "Auto-merging $4"
orig=$(git-unpack-file $1)
orig=$(git unpack-file $1)
;;
esac