[pacman-dev] [PATCH 4929/4929] Make sed follow symlinks on Linux Signed-off-by: Maxime Gauduin <alucryd@gmail.com>
From: Alucryd
On Sun, Jan 27, 2013 at 10:16 AM, Maxime Gauduin
From: Alucryd
--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index e89d4fc..b1ff040 100644 --- a/configure.ac +++ b/configure.ac @@ -299,7 +299,7 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" -SEDINPLACE="sed -i" +SEDINPLACE="sed --follow-symlinks -i" DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded" -- 1.8.1.1
Sorry about the previous patch I sent, now only follow symlinks on Linux. -- Alucryd "In the name of God, impure souls of the living dead shall be banished into eternal damnation. Amen."
On 27/01/13 19:16, Maxime Gauduin wrote:
From: Alucryd
---
Patch is fine. Just a couple of tips for creating git patches. The commit messages goes: Title <blank line> description if needed <blank line> Signed-off-by: If you do "git commit -s" the signed off line is automatically added in the right place. Also, you can make a single patch of the top commit with "git format-patch HEAD^" I will fix the subject/signoff as I commit. Allan
configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index e89d4fc..b1ff040 100644 --- a/configure.ac +++ b/configure.ac @@ -299,7 +299,7 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" -SEDINPLACE="sed -i" +SEDINPLACE="sed --follow-symlinks -i" DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded"
On Mon, Jan 28, 2013 at 6:31 AM, Allan McRae
On 27/01/13 19:16, Maxime Gauduin wrote:
From: Alucryd
---
Patch is fine.
Just a couple of tips for creating git patches. The commit messages goes:
Title <blank line> description if needed <blank line> Signed-off-by:
If you do "git commit -s" the signed off line is automatically added in the right place.
Also, you can make a single patch of the top commit with "git format-patch HEAD^"
I will fix the subject/signoff as I commit.
Allan
configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac index e89d4fc..b1ff040 100644 --- a/configure.ac +++ b/configure.ac @@ -299,7 +299,7 @@ GCC_GNU89_INLINE_CC # Host-dependant definitions INODECMD="stat -c '%i %n'" SIZECMD="stat -c %s" -SEDINPLACE="sed -i" +SEDINPLACE="sed --follow-symlinks -i" DUFLAGS="-sk --apparent-size" STRIP_BINARIES="--strip-all" STRIP_SHARED="--strip-unneeded"
Thank you for the tips. I had read that "git format-patch commit_id" would give me the patch I wanted, but I only managed to have all patches generated. Maybe I put the wrong ID. And thank you for fixing the description. Maxime
On 28.01.2013 09:36, Maxime Gauduin wrote:
Thank you for the tips. I had read that "git format-patch commit_id" would give me the patch I wanted, but I only managed to have all patches generated.
format-patch gives you all changes made after the commit id you specify. So if you work on a separate branch and it's based on master you can run "format-patch master" you will get all your changes. You can also use format-patch origin/master if, but I use branches.
On Mon, Jan 28, 2013 at 11:41 AM, Florian Pritz
On 28.01.2013 09:36, Maxime Gauduin wrote:
Thank you for the tips. I had read that "git format-patch commit_id" would give me the patch I wanted, but I only managed to have all patches generated.
format-patch gives you all changes made after the commit id you specify. So if you work on a separate branch and it's based on master you can run "format-patch master" you will get all your changes. You can also use format-patch origin/master if, but I use branches.
Thanks, working on a separate branch is indeed a good idea. I just stumbled upon the super quick git guide on the wiki. This will be useful in the future. -- Alucryd "In the name of God, impure souls of the living dead shall be banished into eternal damnation. Amen."
participants (3)
-
Allan McRae
-
Florian Pritz
-
Maxime Gauduin