From 237fe933713ea3d86ed8fbdb86819797b770405b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 15 Feb 2018 19:29:00 +0000 Subject: git-debrebase: do not add -i in default invocation Signed-off-by: Ian Jackson --- tests/tests/gdr-edits | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'tests/tests/gdr-edits') diff --git a/tests/tests/gdr-edits b/tests/tests/gdr-edits index f5ca2a4..1d74da3 100755 --- a/tests/tests/gdr-edits +++ b/tests/tests/gdr-edits @@ -11,6 +11,17 @@ cd $p t-git-debrebase analyse |tee ../anal.1 cat ../anal.1 -: xxx +echo >>debian/zorkmid '// debian' +git add debian/zorkmid +git commit -m 'DEBIAN add zorkmid' + +echo >>src.c '// upstream' +git commit -a -m 'UPSTREAM edit src.c' + +for f in debian/zorkmid src.c; do + echo '// both!' >>$f + git add $f +done +git commit -m 'MIXED add boths' t-ok -- cgit v1.2.3