Hi Ansgar,
On Sat, Aug 30, 2008 at 11:46:07AM +0200, Ansgar Burchardt wrote:
> Hi,
>
> I stumbled over this problem as well and was wondering why the
> `configure' script would not be imported.
>
> If you do not want to add the --force option to `git add' calls by
> default, it would be nice if there was an option to make git-import-orig
> do this.
Could you confirm the attached patch does what you want.
-- Guido
>From 91aee1c45910671d8738bbff6a1f1b6e7863f009 Mon Sep 17 00:00:00 2001
From: Guido Guenther <[EMAIL PROTECTED]>
Date: Sat, 30 Aug 2008 13:54:27 +0200
Subject: [PATCH] Don't honor .gitignore during replace_source_tree
this only leads to missing files during git-import-orig
---
gbp/git_utils.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/gbp/git_utils.py b/gbp/git_utils.py
index 13845d5..f04beca 100644
--- a/gbp/git_utils.py
+++ b/gbp/git_utils.py
@@ -138,7 +138,7 @@ def replace_source_tree(repo, src_dir, filters, verbose=False):
"""
old = set(repo.index_files())
new = set(copy_from(src_dir, filters))
- GitAdd()(['.'])
+ GitAdd()(['-f', '.'])
files = [ obj for obj in old - new if not os.path.isdir(obj)]
if files:
GitRm(verbose=verbose)(files)
--
1.5.6.3
