Commit Graph

1032 Commits (b0e38937928bb980b30cd7289eb2accdfa6ef47a)

Author SHA1 Message Date
Junio C Hamano b0e3893792 What's cooking (2012/07 #09) 2012-07-29 20:06:19 -07:00
Junio C Hamano 98c759ddd0 What's cooking (2012/07 #08) 2012-07-26 22:47:00 -07:00
Junio C Hamano 4058b834e7 What's cooking (2012/07 #07) 2012-07-23 22:09:55 -07:00
Junio C Hamano 1901a58e9f What's cooking (2012/07 #06) 2012-07-22 13:42:27 -07:00
Junio C Hamano ad241d9861 Meta/Reintegrate: force invoking the editor when merging
As "git merge" is clever not to default to --edit behaviour when its
standard input and output streams are not connected to the same
terminal (i.e. indicating an interactive tty session), we would need
to explicitly ask for "--edit" while exporting "EDITOR=:" one-shot,
so that commit log cleaner still is triggered.

In the longer term, the interactions among pull, fmt-merge-msg,
merge and the editor need to be redesigned, but it is a large task,
so for now this workaround should suffice.
2012-07-16 16:06:27 -07:00
Junio C Hamano 0b30d5504a What's cooking (2012/07 #05) 2012-07-15 22:32:41 -07:00
Junio C Hamano f913e9982d What's cooking (2012/07 #04) 2012-07-13 16:33:43 -07:00
Junio C Hamano dbf298f6ff What's cooking (2012/07 #03) 2012-07-11 15:12:54 -07:00
Junio C Hamano 28cd4f629a What's cooking (2012/07 #02) 2012-07-09 13:12:11 -07:00
Junio C Hamano f479eb6714 Meta/cook --havedone to help updating RelNotes 2012-07-09 11:11:36 -07:00
Junio C Hamano 82f5aa1676 What's cooking (2012/07 #01) 2012-07-03 16:16:09 -07:00
Junio C Hamano bc1ab8649a What's cooking (2012/06 #08) 2012-06-28 16:32:00 -07:00
Junio C Hamano a5873c4d69 Meta/Reintegrate: work around minor --no-edit breakage
For --no-edit to be true replacement of one-shot export of EDITOR=:,
it should trigger stripspace() to remove comments, but currently it
doesn't.  Avoid using it for now.
2012-06-27 21:17:09 -07:00
Junio C Hamano 7c519cf70b What's cooking (2012/06 #07) 2012-06-25 13:07:35 -07:00
Junio C Hamano c36e19f6cf What's cooking (2012/06 #06) 2012-06-21 15:52:18 -07:00
Junio C Hamano 90d1b3f183 Meta/MaintNotes: post 1.7.11 update 2012-06-21 14:19:01 -07:00
Junio C Hamano 9c67e8da79 What's cooking (2012/06 #05) 2012-06-19 16:39:34 -07:00
Junio C Hamano 33ac7d2250 Meta/CheckPush: minor versions could have more than one digit
Add compare_dotted_version helper and use it

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-06-19 15:19:51 -07:00
Junio C Hamano f0745af245 What's cooking (2012/06 #04) 2012-06-15 16:08:00 -07:00
Junio C Hamano 8ea53dfe59 What's cooking (2012/06 #03) 2012-06-13 16:00:41 -07:00
Junio C Hamano d51465793e What's cooking (2012/06 #02) 2012-06-06 14:50:47 -07:00
Junio C Hamano 67600125e4 Meta/Dothem: do not chdir to something you haven't created yet 2012-06-06 13:55:20 -07:00
Junio C Hamano 4bd203416a Meta/cook: remove stray duplicates
Besides, not cascading this as "if ... elsif ..." was totally wrong
and pushed an undef $topic into %what{} hash
2012-06-06 13:12:34 -07:00
Junio C Hamano a109a1a56f Meta/Dothem: honor --force
Disable "A version with the same tree already is installed
somewhere" optimization when the script is run with --force.

Also be careful when crafting "--root=/dev/shm/testpen" option to
the test scripts; on Ubuntu, /dev/shm may be a symbolic link that
points at /run/shm, and "$TRASH_DIRECTORY" and $(pwd) may not match,
causing poorly written tests to fail.
2012-06-03 19:08:02 -07:00
Junio C Hamano 5321cb29c8 What's cooking (2012/06 #01) 2012-06-03 17:22:28 -07:00
Junio C Hamano aff55f9d93 Meta/ML: handle branches that were indirectly merged a bit better 2012-06-03 17:21:54 -07:00
Junio C Hamano df72e6ec0e Meta/Announce: automate even more 2012-06-03 17:20:19 -07:00
Junio C Hamano aa4b9301c9 What's cooking (2012/05 #07) 2012-05-31 16:01:41 -07:00
Junio C Hamano 3ac151e3bd Meta/CheckPush: mark "diff next..jch" output as such 2012-05-23 15:18:50 -07:00
Junio C Hamano b683d55d46 What's cooking (2012/05 #06) 2012-05-23 15:18:47 -07:00
Junio C Hamano be1bd0874e What's cooking (2012/05 #05) 2012-05-20 22:20:18 -07:00
Junio C Hamano 88989e2f15 What's cooking (2012/05 #04) 2012-05-11 14:55:38 -07:00
Junio C Hamano 588f4bea89 What's cooking (2012/05 #03) 2012-05-08 12:16:23 -07:00
Junio C Hamano 3ca5cbcc1d What's cooking (2012/05 #02) 2012-05-04 16:04:47 -07:00
Junio C Hamano 81fb448557 What's cooking (2012/05 #01) 2012-05-02 15:05:39 -07:00
Junio C Hamano 10c7888368 Meta/dodoc: assign default values 2012-04-29 18:34:42 -07:00
Junio C Hamano 007cb03102 Meta/Make: allow --noprove to decline use of prove in tests 2012-04-29 18:32:55 -07:00
Junio C Hamano d1b3a6c23a What's cooking (2012/04 #11) 2012-04-29 18:31:52 -07:00
Junio C Hamano 0768d27d1d Meta/Reintegrate: stop at a cut ### line 2012-04-27 13:41:00 -07:00
Junio C Hamano 7c87d39f77 Meta/SR: check maintenance tracks 2012-04-26 13:37:12 -07:00
Junio C Hamano dc46bbfa76 Meta/RelUpload: add the missing half of the tarball Release script set 2012-04-26 13:36:31 -07:00
Junio C Hamano 6fd92054d1 Meta/ML: fix bogus 'gone' check 2012-04-26 13:36:01 -07:00
Junio C Hamano 6361615559 What's cooking (2012/04 #10) 2012-04-26 13:34:44 -07:00
Junio C Hamano b47529bd75 What's cooking (2012/04 #09) 2012-04-23 15:03:57 -07:00
Junio C Hamano 8dd9a93e05 Meta/dodoc.sh: make it easier to relocate the build areas 2012-04-20 23:33:57 -07:00
Junio C Hamano 25f444da4b What's cooking (2012/04 #08) 2012-04-20 16:59:05 -07:00
Junio C Hamano 199448518c What's cooking (2012/04 #07) 2012-04-18 16:38:14 -07:00
Junio C Hamano d58f31818c What's cooking (2012/04 #06) 2012-04-15 23:36:26 -07:00
Junio C Hamano 21723c4f50 Meta/CheckPush: jch private edition could be more advanced than next 2012-04-12 15:41:06 -07:00
Junio C Hamano 016bdeca29 Meta/ML: allow target other than maint 2012-04-12 15:41:06 -07:00