@ai-ecoverse/wasm-git 2.55.0-3 → 2.55.0-4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/libexec/git-core/git-difftool--helper +125 -0
- package/libexec/git-core/git-filter-branch +665 -0
- package/libexec/git-core/git-merge-octopus +112 -0
- package/libexec/git-core/git-merge-one-file +167 -0
- package/libexec/git-core/git-merge-resolve +64 -0
- package/libexec/git-core/git-mergetool +579 -0
- package/libexec/git-core/git-mergetool--lib +549 -0
- package/libexec/git-core/git-quiltimport +155 -0
- package/libexec/git-core/git-request-pull +178 -0
- package/libexec/git-core/git-sh-i18n +79 -0
- package/libexec/git-core/git-sh-setup +357 -0
- package/libexec/git-core/git-submodule +671 -0
- package/libexec/git-core/git-web--browse +196 -0
- package/package.json +1 -1
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
#!/bin/sh
|
|
2
|
+
# git-difftool--helper is a GIT_EXTERNAL_DIFF-compatible diff tool launcher.
|
|
3
|
+
# This script is typically launched by using the 'git difftool'
|
|
4
|
+
# convenience command.
|
|
5
|
+
#
|
|
6
|
+
# Copyright (c) 2009, 2010 David Aguilar
|
|
7
|
+
|
|
8
|
+
TOOL_MODE=diff
|
|
9
|
+
. git-mergetool--lib
|
|
10
|
+
|
|
11
|
+
# difftool.prompt controls the default prompt/no-prompt behavior
|
|
12
|
+
# and is overridden with $GIT_DIFFTOOL*_PROMPT.
|
|
13
|
+
should_prompt () {
|
|
14
|
+
prompt_merge=$(git config --bool mergetool.prompt || echo true)
|
|
15
|
+
prompt=$(git config --bool difftool.prompt || echo $prompt_merge)
|
|
16
|
+
if test "$prompt" = true
|
|
17
|
+
then
|
|
18
|
+
test -z "$GIT_DIFFTOOL_NO_PROMPT"
|
|
19
|
+
else
|
|
20
|
+
test -n "$GIT_DIFFTOOL_PROMPT"
|
|
21
|
+
fi
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
# Indicates that --extcmd=... was specified
|
|
25
|
+
use_ext_cmd () {
|
|
26
|
+
test -n "$GIT_DIFFTOOL_EXTCMD"
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
launch_merge_tool () {
|
|
30
|
+
# Merged is the filename as it appears in the work tree
|
|
31
|
+
# Local is the contents of a/filename
|
|
32
|
+
# Remote is the contents of b/filename
|
|
33
|
+
# Custom merge tool commands might use $BASE so we provide it
|
|
34
|
+
MERGED="$1"
|
|
35
|
+
LOCAL="$2"
|
|
36
|
+
REMOTE="$3"
|
|
37
|
+
BASE="$1"
|
|
38
|
+
|
|
39
|
+
# $LOCAL and $REMOTE are temporary files so prompt
|
|
40
|
+
# the user with the real $MERGED name before launching $merge_tool.
|
|
41
|
+
if should_prompt
|
|
42
|
+
then
|
|
43
|
+
printf "\nViewing (%s/%s): '%s'\n" "$GIT_DIFF_PATH_COUNTER" \
|
|
44
|
+
"$GIT_DIFF_PATH_TOTAL" "$MERGED"
|
|
45
|
+
if use_ext_cmd
|
|
46
|
+
then
|
|
47
|
+
printf "Launch '%s' [Y/n]? " \
|
|
48
|
+
"$GIT_DIFFTOOL_EXTCMD"
|
|
49
|
+
else
|
|
50
|
+
printf "Launch '%s' [Y/n]? " "$merge_tool"
|
|
51
|
+
fi
|
|
52
|
+
read ans || return
|
|
53
|
+
if test "$ans" = n
|
|
54
|
+
then
|
|
55
|
+
return
|
|
56
|
+
fi
|
|
57
|
+
fi
|
|
58
|
+
|
|
59
|
+
if use_ext_cmd
|
|
60
|
+
then
|
|
61
|
+
export BASE
|
|
62
|
+
eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
|
|
63
|
+
else
|
|
64
|
+
initialize_merge_tool "$merge_tool" || exit 1
|
|
65
|
+
run_merge_tool "$merge_tool"
|
|
66
|
+
fi
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
if ! use_ext_cmd
|
|
70
|
+
then
|
|
71
|
+
if test -n "$GIT_DIFF_TOOL"
|
|
72
|
+
then
|
|
73
|
+
merge_tool="$GIT_DIFF_TOOL"
|
|
74
|
+
else
|
|
75
|
+
merge_tool="$(get_merge_tool)"
|
|
76
|
+
subshell_exit_status=$?
|
|
77
|
+
if test $subshell_exit_status -gt 1
|
|
78
|
+
then
|
|
79
|
+
exit $subshell_exit_status
|
|
80
|
+
fi
|
|
81
|
+
fi
|
|
82
|
+
fi
|
|
83
|
+
|
|
84
|
+
if test -n "$GIT_DIFFTOOL_DIRDIFF"
|
|
85
|
+
then
|
|
86
|
+
LOCAL="$1"
|
|
87
|
+
REMOTE="$2"
|
|
88
|
+
initialize_merge_tool "$merge_tool" || exit 1
|
|
89
|
+
run_merge_tool "$merge_tool" false
|
|
90
|
+
|
|
91
|
+
status=$?
|
|
92
|
+
if test $status -ge 126
|
|
93
|
+
then
|
|
94
|
+
# Command not found (127), not executable (126) or
|
|
95
|
+
# exited via a signal (>= 128).
|
|
96
|
+
exit $status
|
|
97
|
+
fi
|
|
98
|
+
|
|
99
|
+
if test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
|
|
100
|
+
then
|
|
101
|
+
exit $status
|
|
102
|
+
fi
|
|
103
|
+
else
|
|
104
|
+
# Launch the merge tool on each path provided by 'git diff'
|
|
105
|
+
while test $# -gt 6
|
|
106
|
+
do
|
|
107
|
+
launch_merge_tool "$1" "$2" "$5"
|
|
108
|
+
status=$?
|
|
109
|
+
if test $status -ge 126
|
|
110
|
+
then
|
|
111
|
+
# Command not found (127), not executable (126) or
|
|
112
|
+
# exited via a signal (>= 128).
|
|
113
|
+
exit $status
|
|
114
|
+
fi
|
|
115
|
+
|
|
116
|
+
if test "$status" != 0 &&
|
|
117
|
+
test "$GIT_DIFFTOOL_TRUST_EXIT_CODE" = true
|
|
118
|
+
then
|
|
119
|
+
exit $status
|
|
120
|
+
fi
|
|
121
|
+
shift 7
|
|
122
|
+
done
|
|
123
|
+
fi
|
|
124
|
+
|
|
125
|
+
exit 0
|