← Back to branch summary

~ubuntu-branches/debian/sid/git/sid

« back to all changes in this revision

Viewing changes to t/t3510-cherry-pick-sequence.sh

  • Committer: Package Import Robot
  • Author(s): Jonathan Nieder
  • Date: 2013-06-12 07:50:53 UTC
  • mfrom: (1.2.19) (2.1.31 experimental)
  • Revision ID: package-import@ubuntu.com-20130612075053-uue9xe0dq0rvm44y
Tags: 1:1.8.3.1-1
* merge branch debian-experimental
* new upstream point release (see RelNotes/1.8.3.1.txt).
* debian/watch: use xz-compressed tarballs from kernel.org.

Show diffs side-by-side

added added

removed removed

Lines of Context:
t/t3510-cherry-pick-sequence.sh
24
24
        git clean -d -f -f -q -x
25
25
}
26
26
 
27
 
test_cmp_rev () {
28
 
        git rev-parse --verify "$1" >expect.rev &&
29
 
        git rev-parse --verify "$2" >actual.rev &&
30
 
        test_cmp expect.rev actual.rev
31
 
}
32
 
 
33
27
test_expect_success setup '
34
 
        git config advice.detachedhead false
 
28
        git config advice.detachedhead false &&
35
29
        echo unrelated >unrelated &&
36
30
        git add unrelated &&
37
31
        test_commit initial foo a &&
410
404
        grep "cherry picked from.*$picked" msg
411
405
'
412
406
 
413
 
test_expect_success '--signoff is not automatically propagated to resolved conflict' '
 
407
test_expect_failure '--signoff is automatically propagated to resolved conflict' '
414
408
        pristine_detach initial &&
415
409
        test_expect_code 1 git cherry-pick --signoff base..anotherpick &&
416
410
        echo "c" >foo &&
428
422
        grep "Signed-off-by:" anotherpick_msg
429
423
'
430
424
 
431
 
test_expect_success '--signoff dropped for implicit commit of resolution, multi-pick case' '
 
425
test_expect_failure '--signoff dropped for implicit commit of resolution, multi-pick case' '
432
426
        pristine_detach initial &&
433
427
        test_must_fail git cherry-pick -s picked anotherpick &&
434
428
        echo c >foo &&
441
435
        ! grep Signed-off-by: msg
442
436
'
443
437
 
444
 
test_expect_success 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' '
 
438
test_expect_failure 'sign-off needs to be reaffirmed after conflict resolution, single-pick case' '
445
439
        pristine_detach initial &&
446
440
        test_must_fail git cherry-pick -s picked &&
447
441
        echo c >foo &&