summaryrefslogtreecommitdiff
path: root/tests/tests/quilt-singlepatch
blob: 320a31c37b44521f7b4f7ca04fcbb0001021f76a (plain)
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
#!/bin/bash
set -e
. tests/lib

t-archive sunxi-tools 1.2-2.~~dgittest
t-git-none

t-dgit clone $p
cd $p
t-cloned-fetched-good

echo EXTRA-LINE-1 >>fel.c
echo EXTRA-LINE-2 >>fel.c
echo EXTRA-LINE-3 >>.gitignore

git add fel.c .gitignore

t-commit 'commit our stuff' 1.2-3

t-dgit -wgf quilt-fixup

t-refs-same-start
t-ref-head

t-dgit -wgf build-source

t-dgit push
t-pushed-good dgit/sid

diff <<END - debian/patches/series
debian-changes
END

diff <<END - <(ls debian/patches)
debian-changes
series
END

git apply --reverse debian/patches/debian-changes
git commit -a -m 'go back to plain upstream'

t-dgit -wgf build-source
t-dgit --damp-run push

t-ok