Guido Günther <[EMAIL PROTECTED]> writes:
>> $ git-import-orig --verbose --upstream-version=2007.01.01
>> ../fvwm-icons_2007.01.01.orig.tar.gz
>> Run above command (C-c to abort)
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> Where does this come from?
Nothing important. One script that asks a question to run that command.
>> Upstream version is 2007.01.01
>> tar ['-C', '../tmpoKDrq8', '--gzip', '-xf',
>> '../fvwm-icons_2007.01.01.orig.tar.gz'] []
>> Unpacked ../fvwm-icons_2007.01.01.orig.tar.gz to '../tmpoKDrq8'
>> Importing '../fvwm-icons_2007.01.01.orig.tar.gz' to branch 'upstream'...
>> git ['checkout', 'upstream'] []
>> Switched to branch "upstream"
>> git ['add'] ['-f', '.']
>> Nothing to commit, nothing imported.
>> rm ['-rf', '../tmpoKDrq8'] []
>>
>> PROBLEM
>>
>> The branch pointed is left in 'upstream' when I expected it to be on
>> 'master' after git-import-orig call, because it cleaned ../tmpoKDrq8
>>
>> $git branch
>> master
>> pristine-tar
>> * upstream
>>
> What is this bug about? That you're left on upstream after an error or
> that nothing get's imported?
That the program leaves on "upstream". An mproved version could:
a) display a message:
"Note, the branch is now at 'upstream' for you to investigate the
issue"
b) or go back to 'master' as usual (I'd prefer this) to reset the situation.
> you might want to stay on that branch in case of an error to
> investigate.
If possible, the choice between (a) and (b) could be configurable in
~/.gbp.conf
> To debug the later I'd need the repo to reproduce. Cheers, -- Guido
>
>> There are files in the new tar, but I haven't analyzed why the import
>> reports "nothing to commit" (it's not a problem in git-buildpackage I
>> assume).
Comparing the new upstream tar file to the old showed that upstream had
bumped the version, but the contents of the tar files were identical.
Thus:
Nothing to commit, nothing imported
FEATURE REQUEST
Could there be a new option --force-empty-commit that would:
* Commit with message-only: "Imported .... (no changes)"
* mark the commit as usual "upstream/version"
How pristine-tar plays ball in this situation would need testing.
Jari
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
