-
Notifications
You must be signed in to change notification settings - Fork 0
/
shears-script
executable file
·401 lines (345 loc) · 17.8 KB
/
shears-script
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
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
start_merging_rebase master
mark onto
### The upstream status is denoted by an "#####U:" comment *below* the pick command.
# First, already accepted patches:
bud
pick 784f4b6 Update SVN.pm
pick cbc60b6 git tag --contains : avoid stack overflow
pick a08e803 MSVC: link dynamically to the CRT
pick 76e7c8a Sleep 1 millisecond in poll() to avoid busy wait
pick 0170a3c Revert "submodules: fix ambiguous absolute paths under Windows"
pick f7febbe git grep -O -i: if the pager is 'less', pass the '-I' option
mark junio/master
# also in master
# Branch: send-email
bud
#pick 22d3fab send-email: accept absolute path even on Windows
#pick 31180f8 send-email: handle Windows paths for display just like we do for processing
pick cb005c1
pick f24ecf5
mark send-email
bud
pick ccfb5bd wincred: add install target
pick 248b68f wincred: avoid overwriting configured variables
pick 6f5fc10 Windows: Allow using UNC path for git repository
b93e6e3 t5000, t5003: do not use test_cmp to compare binary files
mark junio/next
bud
pick 71bbe59 Win32: move main macro to a function
pick de25062 mingw: avoid const warning
mark junio/pu/sk/mingw-main
pick 69f0747 Support Unicode console output on Windows
pick 4ba31a2 Detect console streams more reliably on Windows
pick 65602fc Warn if the Windows console font doesn't support Unicode
pick aa71a59 Win32: add Unicode conversion functions
pick 25d366b Win32: Thread-safe windows console output
pick d3124b0 Win32: fix broken pipe detection
mark junio/pu/sk/mingw-uni-console
bud
pick 1d94c40 Win32 dirent: remove unused dirent.d_ino member
pick b0601e6 Win32 dirent: remove unused dirent.d_reclen member
pick fa9abe9 Win32 dirent: change FILENAME_MAX to MAX_PATH
pick a8248f4 Win32 dirent: clarify #include directives
pick d8890ce Win32 dirent: improve dirent implementation
mark junio/pu/sk/mingw-dirent
#bud
#pick fb4f2e2 Win32: simplify internal mingw_spawn* APIs
#pick cf0cd42 Win32: fix potential multi-threading issue
#pick cca6498 MinGW: disable CRT command line globbing
#pick 020f167 Win32: Unicode arguments (outgoing)
#pick 867e81c Win32: Unicode arguments (incoming)
#mark junio/pu/sk/mingw-unicode-spawn-args
#bud 2a) below
#bud submit-up/win-tests-1
#bud submit-up/unicode-3-v2
# .. incl. the fixup from Karsten
# (Only one remains from unicode branch: gitk/git-gui patch.)
bud
pick db40d88 Makefile: do not depend on curl-config
#####U: junio is going to merge early in 2.1: http://article.gmane.org/gmane.comp.version-control.msysgit/20130
mark junio/notyet
### dropped:
#pick 31f5ab1 grep -I: do not bother to read known-binary files
#####U: drop: http://article.gmane.org/gmane.comp.version-control.msysgit/20225
#####--------
#pick c34e9ff git stash: make sure that .git/logs/refs/ exists
# originally e751046, then branch stash-reflog
# should be moved to store_stash, just after "# Make sure the reflog"
# beware latest change in junio/pu: 7b5c6dd8 git-stash: avoid hardcoding $GIT_DIR/logs/....
#####U: drop, Dscho agreed. (could not reproduce)
# Karsten Blees writes:
# The unicode patches almost exclusively change Windows-only code, except:
# - changes to git-gui and gitk that unconditionally assume all files are utf-8 encoded
# The rest of the patch series is _mostly_ interdependent small changes, i.e. order really matters.
# Things that could probably be cleaned up for upstream:
# - Some patches fix bugs that were introduced earlier, these could be squashed into the earlier commit.
# E.g. "Unicode console: fix font warning on Vista and Win7", "MSVC: fix winansi.c compile errors"
# or "Win32: fix segfault in WriteConsoleW when debugging in gdb". [all three done]
# Other fixes have sufficient gotchas/complexity that they should probably remain separate,
# e.g. "Win32: fix broken pipe detection".
# - In "Enable color output in Windows cmd.exe", simulating "TERM=winansi"
# (i.e. escape sequences groked by compat/winansi.c) should probably be changed to "msys" or "cygwin".
# With "Win32: patch Windows environment on startup", these environment changes are visible to child
# processes, and as /etc/termcap typically has no "winansi", this causes problems e.g. in less.
# Currently, this is adressed in Git for Windows by setting TERM in both bash and the cmd wrapper.
# That's all I can think of right now...
# /Karsten Blees writes:
#### OK, I started mass mailing
# -1) main() macro + const-fix 0/2
# 0) 2014-06-06 MASS dirent 0/5
# 1) 2014-06-06 MASS unicode 0/5
# 1v2) 2014-06-06 MASS unicode v2 0/6
# 2) collection of details:
#1696d8d(dscho), fb4f2e2
#cf0cd42
#cca6498, 020f167, 867e81c
#dded4f2
# --> accepted, except for dded4f2 - see Junio's answer
# 2a)
#pick a4f9318 Win32: Unicode file name support (except dirent)
#squash 91db148 Win32: fix detection of empty directories in is_dir_empty
#pick 916cb22 Win32: Unicode file name support (dirent)
#plus "tests: do not pass iso8859-1 encoded parameter"
# -- as a response to Hannes' complaint
# 3) plan: all the env things...
# 9e573d9, d4f5975, etc.
## eliminated: f967550, 290bf81
# 4) - remaining things from unicode branch:
#pick 2755618 Enable color output in Windows cmd.exe
#####U: rename term to "msys" or "cygwin" -- see Karsten's hints above
#pick dded4f2 Unicode file name support (gitk and git-gui)
#####U: submit both parts independently to appropriate people -- see mail from Junio
# Branch: unicode
rewind junio/pu/sk/mingw-dirent
merge refs/rewritten/junio/pu/sk/mingw-uni-console
pick cf0cd42 Win32: fix potential multi-threading issue
#####U: easy, self contained, SUBMIT
pick cca6498 MinGW: disable CRT command line globbing
#####U: easy, self contained, SUBMIT
pick 9e573d9 Revert "Windows: teach getenv to do a case-sensitive search"
#####U: well advocated and could be submitted now, submit together with the next one
pick f967550 Revert "mingw.c: move definition of mingw_getenv down"
#####U: I cannot see any reason for this; if the following patches apply, ignore this.
pick 2755618 Enable color output in Windows cmd.exe
#####U: rename term to "msys" or "cygwin" -- see Karsten's hints above
# CONFLICT - use the one from build-verify
pick a4f9318 Win32: Unicode file name support (except dirent)
squash 91db148 Win32: fix detection of empty directories in is_dir_empty
#####U: submited on 2014-07-16, part of unicode-2a
pick 916cb22 Win32: Unicode file name support (dirent)
#####U: submited on 2014-07-16, part of unicode-2a
pick dded4f2 Unicode file name support (gitk and git-gui)
#####U: submit independently to let it be discussed...?
pick 020f167 Win32: Unicode arguments (outgoing)
pick 867e81c Win32: Unicode arguments (incoming)
pick d4f5975 Win32: Unicode environment (outgoing)
pick 54fd715 Win32: Unicode environment (incoming)
pick cc014c3 Win32: fix environment memory leaks
pick a34d9c2 Win32: unify environment case-sensitivity
pick 1696d8d Let mingw_execve() return an int
#####U: easy one, closely related...
pick fb4f2e2 Win32: simplify internal mingw_spawn* APIs
#####U: .. to this one, try to submit them independently.
pick 290bf81 Win32: move environment functions
#####U: make this a fixup for the above patches,
# - so that lookup_env+env_setenv (then renamed to lookupenv+do_putenv)
# get before make_environment_block (factored out from mingw_spawnve_fd)
### alternatively, continue, adding a few fwd declarations...
pick d876d6f Win32: unify environment function names
pick 87ce73b Win32: factor out environment block creation
pick 6c7a47c Win32: don't copy the environment twice when spawning child processes
pick b2a0b39 Win32: reduce environment array reallocations
#####U: beware, when rebasing, I screwed this --> fixup f9b41e9
pick 8c452ca Win32: use low-level memory allocation during initialization
pick c614600 Win32: keep the environment sorted
pick 84b7969 Win32: patch Windows environment on startup
mark unicode
# Branch: hide-dotgit
rewind unicode # Win32: fix segfault in WriteConsoleW when debugging in gdb
pick eb7b263 core.hidedotfiles: hide '.git' dir by default
pick 329fc17 When initializing .git/, record the current setting of core.hideDotFiles
pick 0a40f59 mingw: add tests for the hidden attribute on the git directory
mark hide-dotgit
rewind hide-dotgit # mingw: add tests for the hidden attribute on the git directory
pick 4fd0166 Add a Windows-specific fallback to getenv("HOME");
#####U: submitted on 2014-06-04, resubmitted 2014-06-05 --> latest is [PATCH v3]
#####U: will probably be rejected, which is not bad, as it interferes with 9e573d9 Revert "Windows: teach getenv to do a case-sensitive search"
# CONFLICT - use the one from build-verify
mark home
# Branch: am-submodules
bud
pick 027bba5 git am: ignore dirty submodules
mark am-submodules
# Branch: criss-cross-merge
bud
pick da60874 criss cross rename failure workaround
mark criss-cross-merge
# Branch: deny-current-branch
bud
pick a8f8e59 Add a few more values for receive.denyCurrentBranch
#####U: note: there is a fixup in build-verify branch
pick 58a7344 Let deny.currentBranch=updateInstead ignore submodules
mark deny-current-branch
# Branch: git-gui
bud
pick 4788bbe Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"
pick 5a9b118 git-gui: provide question helper for retry fallback on Windows
pick 23b4798 git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
mark git-gui
# Branch: gitk
bud
pick 81e4f9f Work around the command line limit on Windows
pick a7fb259 Fix another invocation of git from gitk with an overly long command-line
pick 2de8b38 gitk: Use an external icon file on Windows
mark gitk
# Branch: gitweb-syntax
bud
pick 98ddb56 gitweb: Allow line number toggling with Javascript
pick e2c6495 Gitweb: make line number toggling work for Firefox and Safari
pick 3062d41 Gitweb: add support for Alex Gorbatchev's SyntaxHighlighter in Javascript
pick 92b7b0a Only switch on the line number toggle when highlighting is activated
pick 160b063 gitweb (SyntaxHighlighter): interpret #l<line-number>
mark gitweb-syntax
# Branch: jberezanski/wincred-sso-r2
bud
pick 122aa24 t0302: check helper can handle empty credentials
pick 074bbc2 wincred: handle empty username/password correctly
mark jberezanski/wincred-sso-r2
# Branch: pull-rebase-interactive
bud
pick 31693eb Teach 'git pull' to handle --rebase=interactive
pick b29f215 Handle the branch.<name>.rebase value 'interactive'
pick 11cce70 Teach 'git remote' that the config var branch.*.rebase can be 'interactive'
mark pull-rebase-interactive
# Branch: some-CR-fixes
bud
pick bbfce9b submodule: Fix t7400, t7405, t7406 for msysGit
pick 9be964c am: Use cat instead of echo to avoid DOS line-endings (fixes t4150)
pick 6cdf307 Windows: make sure that merge-octopus only outputs LF line endings
pick 221b3c5 Push the NATIVE_CRLF Makefile variable to C and added a test for native.
pick be5eaf8 MinGW: Update tests to handle a native eol of crlf
mark some-CR-fixes
# Branch: win-tests-fixes
bud
pick 73fa916 work around misdetection of stdin attached to a tty
pick 86145eb Handle new t1501 test case properly with MinGW
pick b9c78b0 MinGW: Skip test redirecting to fd 4
#####U: submited on 2014-07-17, submit-up/win-tests-1
pick bfc7b91 t3102: Windows filesystems may not use a literal asterisk in filenames.
pick a9813b6 t9350: point out that refs are not updated correctly
# CONFLICT - use the one from build-verify
pick 44baaf9 MinGW: disable legacy encoding tests
#####U: submited on 2014-07-17, submit-up/win-tests-1
pick 7bfdba4 t1050: Fix invalid call to dd(1)
pick 43660bc Work around a problem identified by BuildHive
pick 8d5bf41 t0008: avoid absolute path on Windows as colon is used in the tests
pick 2c6d702 t4210: skip command-line encoding tests on mingw
#####U: submited on 2014-07-17, submit-up/win-tests-1
pick 92e324a t800[12]: work around MSys limitation
#####U: submited on 2014-07-17, submit-up/win-tests-1, rewritten
pick a0c3e15 t9902: mingw-specific fix for gitfile link files
#####U: submited on 2014-07-17, submit-up/win-tests-1
pick 986d2d4 Disable t0110's high-bit test on Windows
#####U: submited on 2014-07-17, submit-up/win-tests-1
pick ef4a733 tests: do not pass iso8859-1 encoded parameter
# CONFLICT - use the one from build-verify
#####U: submited on 2014-07-16, part of unicode-2a
mark win-tests-fixes
# Branch: remote-hg-prerequisites
bud
pick 12480d0 fast-export: do not refer to non-existing marks
pick 5e40ceb transport-helper: add trailing --
#####U: tried to sumbit on 2014-05-15, resubmit updated version later, when Peff's patch is in:
# http://article.gmane.org/gmane.comp.version-control.msysgit/20238
pick 3071f23 remote-helper: check helper status after import/export # was 11b6018, conflict resolved
pick fe9aab2 Always auto-gc after calling a fast-import transport
#####U: Tried to submit/RFC on 2014-05-15
mark remote-hg-prerequisites
# Branch: http-msys-paths
bud
pick 57c8e5c Handle http.* config variables pointing to files gracefully on Windows
mark http-msys-paths
# Branch: fix-externals
rewind unicode # Win32: fix segfault in WriteConsoleW when debugging in gdb
pick ad1e2f0 Fixed wrong path delimiter in exe finding
pick ecb9eff Fix launching of externals from Unicode paths
pick c1c634b Make non-.exe externals work again
mark fix-externals
# Branch: fix-is-exe
bud
pick 6692716 help: correct behavior for is_executable on Windows
mark fix-is-exe
# Branch: msysgit/tip4commit
bud
pick c70bf30 Add a README.md
#####U: do not upstream
mark msysgit/tip4commit
# Branch: t-b/sideband-bug
bud
pick b6e7fcf Config option to disable side-band-64k for transport
#####U: "Yes I will try to bring it upstream myself, or at least make them aware of the work around ;)" t-b in priv mail, around 2014-05-10
##problem reported and analyzed here http://article.gmane.org/gmane.comp.version-control.msysgit/15263
mark t-b/sideband-bug
# Branch: kasal/tests-no-posix
bud
pick d928d33 Revert "test: fix t7001 cp to use POSIX options"
#####U: do not upstream; drop when cp -P exits with exitcode 0
mark kasal/tests-no-posix
# Branch: kblees/kb/fscache-v4-tentative-1.8.5
rewind unicode # Win32: fix segfault in WriteConsoleW when debugging in gdb
pick e43d7f7 Win32: make FILETIME conversion functions public
pick 659686e Win32: dirent.c: Move opendir down
pick 3d76202 Win32: Make the dirent implementation pluggable
pick bbb3151 Win32: make the lstat implementation pluggable
merge refs/rewritten/home -C 177f20e # Merge 'home' into HEAD
#####U: when home is accepted, merge hide-dotgit?
pick 658d848 add infrastructure for read-only file system level caches
pick 738ce02 Win32: add a cache below mingw's lstat and dirent implementations
# CONFLICT - use the one from build-verify
mark kblees/kb/fscache-v4-tentative-1.8.5
# Branch: kblees/kb/long-paths-v2
rewind kblees/kb/fscache-v4-tentative-1.8.5 # Win32: add a cache below mingw's lstat and dirent implementations
pick aad2ca9 Add a test demonstrating a problem with long submodule paths
pick 104d4e8 Win32: support long paths
squash a15723c Win32: support long paths
#####U: -> squashed version a0e78a5
# conflicting test numbers t2025 t7410 -> rename (+1 is enough)
# use the fixup from build-verify
mark kblees/kb/long-paths-v2
bud
merge refs/rewritten/junio/master
merge refs/rewritten/send-email -C ab62c69 # Merge 'send-email' into HEAD
merge refs/rewritten/junio/next
merge refs/rewritten/junio/notyet
merge refs/rewritten/unicode -C 547db2e # Merge 'unicode' into HEAD
merge refs/rewritten/hide-dotgit -C 16180e4 # Merge 'hide-dotgit' into HEAD
merge refs/rewritten/home -C a565692 # Merge 'home' into HEAD
# there were conflicts merging home and hide-dotgit; improve for the next round...
merge refs/rewritten/am-submodules -C be6b605 # Merge 'am-submodules' into HEAD
merge refs/rewritten/criss-cross-merge -C 7536fcf # Merge 'criss-cross-merge' into HEAD
merge refs/rewritten/deny-current-branch -C 9a1e8b5 # Merge 'deny-current-branch' into HEAD
merge refs/rewritten/git-gui -C 790f423 # Merge 'git-gui' into HEAD
merge refs/rewritten/gitk -C 48e6355 # Merge 'gitk' into HEAD
merge refs/rewritten/gitweb-syntax -C 6635333 # Merge 'gitweb-syntax' into HEAD
merge refs/rewritten/jberezanski/wincred-sso-r2 -C 2398365 # Merge 'jberezanski/wincred-sso-r2' into HEAD
merge refs/rewritten/pull-rebase-interactive -C 5322eac # Merge 'pull-rebase-interactive' into HEAD
merge refs/rewritten/some-CR-fixes -C cbdee02 # Merge branch 'some-CR-fixes'
merge refs/rewritten/win-tests-fixes -C acdd2fc # Merge 'win-tests-fixes' into HEAD
merge refs/rewritten/remote-hg-prerequisites -C b7593f8 # Merge 'remote-hg-prerequisites' into HEAD
merge refs/rewritten/http-msys-paths -C 7abda7a # Merge 'http-msys-paths' into HEAD
merge refs/rewritten/fix-externals -C 4af426c # Merge 'fix-externals' into HEAD
merge refs/rewritten/fix-is-exe -C 618f814 # Merge 'fix-is-exe' into HEAD
merge refs/rewritten/msysgit/tip4commit -C 8947aba # Merge pull request #115 from msysgit/tip4commit
merge refs/rewritten/t-b/sideband-bug -C 9860bbb # Merge remote-tracking branch 't-b/sideband-bug'
merge refs/rewritten/kasal/tests-no-posix -C 70d7fea # Merge pull request #181 from kasal/tests-no-posix
merge refs/rewritten/kblees/kb/fscache-v4-tentative-1.8.5 -C 231f538 # Merge remote-tracking branch 'kblees/kb/fscache-v4-tentative-1.8.5' into thicket-1.8.5.2
merge refs/rewritten/kblees/kb/long-paths-v2 -C af30131 # Merge pull request #122 from kblees/kb/long-paths-v2
pick 4e64cd8 tests: turn off git-daemon tests if FIFOs are not available
#####U: submitted immediately, 2014-05-29
cleanup unicode hide-dotgit home am-submodules criss-cross-merge deny-current-branch git-gui gitk gitweb-syntax jberezanski/wincred-sso-r2 send-email pull-rebase-interactive some-CR-fixes win-tests-fixes remote-hg-prerequisites http-msys-paths fix-externals fix-is-exe msysgit/tip4commit kblees/kb/fscache-v4-tentative-1.8.5 kblees/kb/long-paths-v2 t-b/sideband-bug kasal/tests-no-posix junio/master junio/next junio/notyet junio/pu/sk/mingw-dirent junio/pu/sk/mingw-main junio/pu/sk/mingw-uni-console
# TODO:
# priv thread subj "submitting msysgit patches upstream"
# Other patches:
#Subject: [PATCH v2] mingw: redefine the wrapper macro after the corresponding function
#Date: Fri, 6 Jun 2014 10:41:22 +0200
### discussed, rejected