Re: [RFC PATCH v1 4/5] [telegram] Remove unecessary files

[Ammar Faizi <ammarfaizi2@gnuweeb.org>]

On 9/6/22 11:46 PM, Muhammad Rizki wrote:
> On 06/09/2022 23.02, Ammar Faizi wrote:
>> On 9/6/22 6:19 PM, Muhammad Rizki wrote:
>>> Just remove unecessary files because it's already moved to the
>>> plugins/commands
>> 
>> You moved them in patch #1, why not delete these files in the first place?
> 
> Yeah, but I don't know yet how to place this commit to the first commit, 
> my knowledge only know to place this commit after the fist commit using 
> rebase then commit. Or you want to place this commit after the first commit?

Fold this one into the first commit.

# Download this patch
wget https://lore.gnuweeb.org/gwml/20220906111929.1657-5-kiizuha@gnuweeb.org/raw -O patch.diff;

# Rebase interactive
git rebase -i 2582d7e5225d47
# Open text editor, "edit" the first commit, save, close text editor

# Fold the diff
git apply patch.diff

# Amend it
git commit --amend --no-edit .

# Go...
git rebase --continue

>> 
>>> Signed-off-by: Muhammad Rizki <kiizuha@gnuweeb.org>
>>> ---
>>>   daemon/telegram/packages/plugins/admin.py  | 42 -----------
>>>   daemon/telegram/packages/plugins/scrape.py | 86 ----------------------
>>>   2 files changed, 128 deletions(-)
>>>   delete mode 100644 daemon/telegram/packages/plugins/admin.py
>>>   delete mode 100644 daemon/telegram/packages/plugins/scrape.py
>> 
>> Can't we squash this into the first patch? Or I missed something?
>> 
> 
> Yes, but I only know to place it after the first commit, I was wondering 
> why this file still exist while the master branch already removed that 
> files.
You didn't remove them in first patch, you copied them.

-- 
Ammar Faizi