Artifact
67f0bc66e11d664acc44b67bd45c4302045b07fb:
Attachment "no-empty-stash.patch" to
ticket [58290cd297]
added by
anonymous
2011-03-15 04:20:30.
0000: 49 6e 64 65 78 3a 20 73 72 63 2f 73 74 61 73 68 Index: src/stash
0010: 2e 63 0a 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d .c.=============
0020: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0030: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0040: 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d 3d ================
0050: 3d 3d 3d 3d 3d 3d 0a 2d 2d 2d 20 73 72 63 2f 73 ======.--- src/s
0060: 74 61 73 68 2e 63 0a 2b 2b 2b 20 73 72 63 2f 73 tash.c.+++ src/s
0070: 74 61 73 68 2e 63 0a 40 40 20 2d 33 37 39 2c 31 tash.c.@@ -379,1
0080: 31 20 2b 33 37 39 2c 31 31 20 40 40 0a 20 20 20 1 +379,11 @@.
0090: 7d 0a 20 20 20 6e 43 6d 64 20 3d 20 73 74 72 6c }. nCmd = strl
00a0: 65 6e 28 7a 43 6d 64 29 3b 0a 20 20 20 69 66 28 en(zCmd);. if(
00b0: 20 6d 65 6d 63 6d 70 28 7a 43 6d 64 2c 20 22 73 memcmp(zCmd, "s
00c0: 61 76 65 22 2c 20 6e 43 6d 64 29 3d 3d 30 20 29 ave", nCmd)==0 )
00d0: 7b 0a 20 20 20 20 20 73 74 61 73 68 69 64 20 3d {. stashid =
00e0: 20 73 74 61 73 68 5f 63 72 65 61 74 65 28 29 3b stash_create();
00f0: 0a 20 20 20 20 20 75 6e 64 6f 5f 64 69 73 61 62 . undo_disab
0100: 6c 65 28 29 3b 0a 2d 20 20 20 20 69 66 28 20 67 le();.- if( g
0110: 2e 61 72 67 63 3e 3d 33 20 29 7b 0a 2b 20 20 20 .argc>=3 ){.+
0120: 20 69 66 28 20 67 2e 61 72 67 63 3e 3d 32 20 29 if( g.argc>=2 )
0130: 7b 0a 20 20 20 20 20 20 20 69 6e 74 20 6e 46 69 {. int nFi
0140: 6c 65 20 3d 20 64 62 5f 69 6e 74 28 30 2c 20 22 le = db_int(0, "
0150: 53 45 4c 45 43 54 20 63 6f 75 6e 74 28 2a 29 20 SELECT count(*)
0160: 46 52 4f 4d 20 73 74 61 73 68 66 69 6c 65 20 57 FROM stashfile W
0170: 48 45 52 45 20 73 74 61 73 68 69 64 3d 25 64 22 HERE stashid=%d"
0180: 2c 0a 20 20 20 20 20 20 20 20 20 20 20 20 20 20 ,.
0190: 20 20 20 20 20 20 20 20 20 20 20 20 73 74 61 73 stas
01a0: 68 69 64 29 3b 0a 20 20 20 20 20 20 20 63 68 61 hid);. cha
01b0: 72 20 2a 2a 6e 65 77 41 72 67 76 20 3d 20 66 6f r **newArgv = fo
01c0: 73 73 69 6c 5f 6d 61 6c 6c 6f 63 28 20 73 69 7a ssil_malloc( siz
01d0: 65 6f 66 28 63 68 61 72 2a 29 2a 28 6e 46 69 6c eof(char*)*(nFil
01e0: 65 2b 32 29 20 29 3b 0a 20 20 20 20 20 20 20 69 e+2) );. i
01f0: 6e 74 20 69 20 3d 20 32 3b 0a 20 20 20 20 20 20 nt i = 2;.
0200: 20 53 74 6d 74 20 71 3b 0a 0a Stmt q;..