1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
|
command = "git"
[[match_err]]
pattern = [
"is not a git command"
]
suggest = [
'''
#[err_contains(the most similar command is)]
{{command[0]}} {{err::(?:the most similar command is )(\S+)}} {{command[2:]}}''',
'''
#[!err_contains(the most similar command is)]
{{command[0]}} {{typo[1](
add,
am,
archive,
bisect,
branch,
bundle,
checkout,
cherry-pick,
citool,
clean,
clone,
commit,
describe,
diff,
fetch,
format-patch,
gc,
gitk,
grep,
gui,
init,
log,
maintenance,
merge,
mv,
notes,
pull,
push,
range-diff,
rebase,
reset,
restore,
revert,
rm,
scalar,
shortlog,
show,
sparse-checkout,
stash,
status,
submodule,
switch,
tag,
worktree,
config,
fast-export,
fast-import,
filter-branch,
mergetool,
pack-refs,
prune,
reflog,
remote,
repack,
replace,
)}} {{command[2:]}}'''
]
[[match_err]]
pattern = [
"did not match any file"
]
suggest = [
'''
#[cmd_contains(checkout)]
git checkout {{typo[2]({{shell(git branch | sed 's/^*//')}})}} ''',
'''
#[cmd_contains(checkout)]
git checkout -b {{command[2]}} '''
]
[[match_err]]
pattern = [
"has no upstream branch",
"No configured push destination.",
]
suggest = [
'''
#[cmd_contains(push)]
git push --set-upstream {{select({{shell(git remote)}})}} {{shell(git rev-parse --abbrev-ref HEAD)}} ''',
]
[[match_err]]
pattern = [
"no tracking information for the current branch"
]
suggest = [
'''
#[cmd_contains(pull)]
git pull --set-upstream {{select({{shell(git remote)}})}} {{shell(git rev-parse --abbrev-ref HEAD)}} '''
]
[[match_err]]
pattern = [
"a branch named"
]
suggest = [
'''
#[cmd_contains(branch)]
git checkout {{command[2]}} '''
]
[[match_err]]
pattern = [
"updates were rejected"
]
suggest = [
'''
#[cmd_contains(push)]
git pull &&
{{command}} ''',
'''
#[cmd_contains(push)]
{{command}} --force '''
]
[[match_err]]
pattern = [
"you have unstaged changes",
"stash them"
]
suggest = [
'''
#[cmd_contains(pull)]
{{command}} --rebase --autostash ''',
'''
git stash &&
{{command}} &&
git stash pop '''
]
[[match_err]]
pattern = [
"you have divergent branches and need to specify how to reconcile them"
]
suggest = [
'''
#[cmd_contains(pull)]
{{command}} --rebase ''',
'''
#[cmd_contains(pull)]
{{command}} --no-rebase '''
]
[[match_err]]
pattern = [
"is not fully merged"
]
suggest = [
'''
#[cmd_contains(branch -d)]
{{command[:1]}} -D {{command[3:]}} ''',
]
|
