From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on gnuweeb.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=ALL_TRUSTED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,NO_DNS_FOR_FROM, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from [192.168.169.80] (unknown [182.2.36.141]) by gnuweeb.org (Postfix) with ESMTPSA id B9D247E257; Tue, 6 Sep 2022 16:53:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gnuweeb.org; s=default; t=1662483226; bh=mcOImxLvfBm0dbxS9UqM3DZsHC5sWDxrz4FenxUDDmg=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=iQXKUk7pHsL43YmGa0lMzVz9xR0FRxy2+Oojc+Zv7CnShJaw5Bu+kYeCIJQuq13wl dQ+cMoVYQebCAsoyCapvHMuHaKZYU87M5itwUU9MKTVGj0PaMVhsQg/I6UmUzW6qlp iCkQZ3a52X+ugf/jK0f9z5zxJOpADMiIfNV8QMiUj5GiZwRWIw/L/Mv9YLVp7i4gXd Bv8OajAc3zfKb55wzAdL5MnyNxkhZWLP1x+xp4BT9/57h2nJRlGcfjinTevn7OmXWk hUDjfvgXloXMDw9ypGKvdkNZ3dlUJwB8A7w0xt2EV8rhb366xXA6gVAxUpvc+/Mv9y e9qyf2s6CTa6Q== Message-ID: Date: Tue, 6 Sep 2022 23:53:42 +0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [RFC PATCH v1 4/5] [telegram] Remove unecessary files Content-Language: en-US To: Muhammad Rizki Cc: GNU/Weeb Mailing List , Alviro Iskandar Setiawan References: <20220906111929.1657-1-kiizuha@gnuweeb.org> <20220906111929.1657-5-kiizuha@gnuweeb.org> <96b21e73-ff59-1d1d-8146-aadba17b69c0@gnuweeb.org> From: Ammar Faizi In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit List-Id: 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 >>> --- >>> 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