scripts: use "git foo" not "git-foo"
We want to make sure that people who copy & paste code would see fewer instances of "git-foo". The use of these dashed forms have been discouraged since v1.6.0 days. Signed-off-by: Michael Forney <mforney@mforney.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Michael Forney committed
Aug 4, 2017 at 23:49 UTC
974ce8078c9a91190d798eaa65c9f173dd50c3f8
5 files changed
+10
-10
git-merge-octopus.sh
+1
-1
@@ -100,7 +100,7 @@ do
100
if test $? -ne 0
101
then
102
gettextln "Simple merge did not work, trying automatic merge."
103
- git-merge-index -o git-merge-one-file -a ||
103
+ git merge-index -o git-merge-one-file -a ||
104
OCTOPUS_FAILURE=1
105
next=$(git write-tree 2>/dev/null)
106
fi
git-merge-one-file.sh
+4
-4
@@ -115,16 +115,16 @@ case "${1:-.}${2:-.}${3:-.}" in
115
;;
116
esac
117
118
- src1=$(git-unpack-file $2)
119
- src2=$(git-unpack-file $3)
118
+ src1=$(git unpack-file $2)
119
+ src2=$(git unpack-file $3)
120
case "$1" in
121
'')
122
echo "Added $4 in both, but differently."
123
- orig=$(git-unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
123
+ orig=$(git unpack-file e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
124
;;
125
*)
126
echo "Auto-merging $4"
127
- orig=$(git-unpack-file $1)
127
+ orig=$(git unpack-file $1)
128
;;
129
esac
130
git-merge-resolve.sh
+1
-1
@@ -45,7 +45,7 @@ then
45
exit 0
46
else
47
echo "Simple merge failed, trying Automatic merge."
48
- if git-merge-index -o git-merge-one-file -a
48
+ if git merge-index -o git-merge-one-file -a
49
then
50
exit 0
51
else
git-stash.sh
+1
-1
@@ -573,7 +573,7 @@ apply_stash () {
573
574
if test -n "$u_tree"
575
then
576
- GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
576
+ GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&
577
GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
578
rm -f "$TMPindex" ||
579
die "$(gettext "Could not restore untracked files from stash entry")"
git-submodule.sh
+3
-3
@@ -864,7 +864,7 @@ cmd_summary() {
864
test $status != A && test $ignore_config = all && continue
865
fi
866
# Also show added or modified modules which are checked out
867
- GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 &&
867
+ GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&
868
printf '%s\n' "$sm_path"
869
done
870
)
@@ -898,11 +898,11 @@ cmd_summary() {
898
missing_dst=
899
900
test $mod_src = 160000 &&
901
- ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null &&
901
+ ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&
902
missing_src=t
903
904
test $mod_dst = 160000 &&
905
- ! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null &&
905
+ ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&
906
missing_dst=t
907
908
display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")