![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Jonathan Nieder <jrnieder@gmail.com> | |
| Sun, 20 Feb 2011 04:12:26 +0000 (23:12 -0500) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 22 Feb 2011 06:57:38 +0000 (22:57 -0800) | ||
| commit | 2161da103950704a92993702696c9b573dcbccae | |
| tree | 8cc3a5666653fe33fe15033598facc24b1099af1 | tree | snapshot |
| parent | 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 | commit | diff |
t3507: introduce pristine-detach helper
All the tests in t3507 (cherry-pick with conflicts) begin with the
same checkout + read-tree + clean incantation to ensure a predictable
starting point. Factor out a function for that so the interesting
part of the tests is easier to read.
The "update-index --refresh" and "diff-index --exit-code HEAD" are not
necessary as the point of this testsuite is not about testing
"read-tree --reset".
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
All the tests in t3507 (cherry-pick with conflicts) begin with the
same checkout + read-tree + clean incantation to ensure a predictable
starting point. Factor out a function for that so the interesting
part of the tests is easier to read.
The "update-index --refresh" and "diff-index --exit-code HEAD" are not
necessary as the point of this testsuite is not about testing
"read-tree --reset".
Improved-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3507-cherry-pick-conflict.sh | diff | blob | history |