threads / patch / 14283

patchDiscard stderr output from git apply

Subject: [StGit PATCH] Discard stderr output from git apply

## tl;dr

3 messages between Jul 4, 2008 and Jul 8, 2008. Diffs are folded; open one to read it.

replies: 2people: 2as markdown or json

Karl Hasselström· Jul 4, 2008, 06:35 UTC · lore

It prints error messages when it fails, and we don't need to see them since we don't care exactly _why_ it failed.

Signed-off-by: Karl Hasselström <kha@treskal.com>
---

With the optimizations that make us start using apply a lot; I noticed git apply was spamming on stderr.

 stgit/lib/git.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Show changes to stgit/lib/git.py +1 −1
diff --git a/stgit/lib/git.py b/stgit/lib/git.py
index 6ccdfa7..9208965 100644
--- a/stgit/lib/git.py
+++ b/stgit/lib/git.py
@@ -556,7 +556,7 @@ class Index(RunWithEnv):
         """In-index patch application, no worktree involved."""
         try:
             self.run(['git', 'apply', '--cached']
-                     ).raw_input(patch_text).no_output()
+                     ).raw_input(patch_text).discard_stderr().no_output()
         except run.RunException:
             raise MergeException('Patch does not apply cleanly')
     def delete(self):
Catalin Marinas· Jul 7, 2008, 20:49 UTC · re: Karl Hasselström · lore

Re: [StGit PATCH] Discard stderr output from git apply

2008/7/4 Karl Hasselström <kha@treskal.com>:
> It prints error messages when it fails, and we don't need to see them
> since we don't care exactly _why_ it failed.

Are you sure we don't need this? I found it useful when running "import" to see why a patch failed.

-- 
Catalin
Karl Hasselström· Jul 8, 2008, 04:39 UTC · re: Catalin Marinas · lore

Re: [StGit PATCH] Discard stderr output from git apply

On 2008-07-07 21:49:31 +0100, Catalin Marinas wrote:
Show 7 quoted lines
> 2008/7/4 Karl Hasselström <kha@treskal.com>:
>
> > It prints error messages when it fails, and we don't need to see
> > them since we don't care exactly _why_ it failed.
>
> Are you sure we don't need this? I found it useful when running
> "import" to see why a patch failed.

Aww, you're right. Apply isn't just called from the simple merge fast path, it's also used to apply patches. Who would've guessed? ;-)

I'll add a parameter to shut it up or not depending on the caller's preferences.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle

← back to recent threads