undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mf/no-dashed-subcommands'

Browse Source 
Code clean-up.

* mf/no-dashed-subcommands:
  scripts: use "git foo" not "git-foo"
This commit is contained in:
Junio C Hamano 2017-08-22 10:29:03 -07:00
commit 5696eb3c09
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-merge-octopus.sh
View File

@ -100,7 +100,7 @@ do
if test $? -ne 0 if test $? -ne 0
then then
gettextln "Simple merge did not work, trying automatic merge." gettextln "Simple merge did not work, trying automatic merge."
git-merge-index -o git-merge-one-file -a || git merge-index -o git-merge-one-file -a ||
OCTOPUS_FAILURE=1 OCTOPUS_FAILURE=1
next=$(git write-tree 2>/dev/null) next=$(git write-tree 2>/dev/null)
fi fi

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

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

2
git-merge-resolve.sh
View File

@ -45,7 +45,7 @@ then
exit 0 exit 0
else else
echo "Simple merge failed, trying Automatic merge." echo "Simple merge failed, trying Automatic merge."
if git-merge-index -o git-merge-one-file -a if git merge-index -o git-merge-one-file -a
then then
exit 0 exit 0
else else

2
git-stash.sh
View File

@ -573,7 +573,7 @@ apply_stash () {
if test -n "$u_tree" if test -n "$u_tree"
then then
GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" && GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&
GIT_INDEX_FILE="$TMPindex" git checkout-index --all && GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
rm -f "$TMPindex" || rm -f "$TMPindex" ||
die "$(gettext "Could not restore untracked files from stash entry")" die "$(gettext "Could not restore untracked files from stash entry")"

6
git-submodule.sh
View File

@ -864,7 +864,7 @@ cmd_summary() {
test $status != A && test $ignore_config = all && continue test $status != A && test $ignore_config = all && continue
fi fi
# Also show added or modified modules which are checked out # Also show added or modified modules which are checked out
GIT_DIR="$sm_path/.git" git-rev-parse --git-dir >/dev/null 2>&1 && GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&
printf '%s\n' "$sm_path" printf '%s\n' "$sm_path"
done done
) )
@ -898,11 +898,11 @@ cmd_summary() {
missing_dst= missing_dst=
test $mod_src = 160000 && test $mod_src = 160000 &&
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_src^0 >/dev/null && ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&
missing_src=t missing_src=t
test $mod_dst = 160000 && test $mod_dst = 160000 &&
! GIT_DIR="$name/.git" git-rev-parse -q --verify $sha1_dst^0 >/dev/null && ! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&
missing_dst=t missing_dst=t
display_name=$(git submodule--helper relative-path "$name" "$wt_prefix") display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")