Add/remove patches

This commit is contained in:
Julian Ospald 2016-10-25 16:43:28 +02:00
parent a3fea623bf
commit 4e0eabe235
2 changed files with 13 additions and 29 deletions

View File

@ -1,29 +0,0 @@
From 28d39f71134d8cde70096e22c74405f8b2eb05d2 Mon Sep 17 00:00:00 2001
From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Fri, 9 Sep 2016 14:25:46 +0200
Subject: [PATCH] git-gui: respect commit.gpgsign again
As of v2.9.0, `git commit-tree` no longer heeds the `commit.gpgsign`
config setting. This broke committing in Git GUI.
This fixes https://github.com/git-for-windows/git/issues/850
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
---
git-gui/lib/commit.tcl | 3 +++
1 file changed, 3 insertions(+)
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 60edf99..e3183a6 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -388,6 +388,9 @@ A rescan will be automatically started now.
# -- Create the commit.
#
set cmd [list commit-tree $tree_id]
+ if {[is_config_true commit.gpgsign]} {
+ lappend cmd -S
+ }
foreach p [concat $PARENT $MERGE_HEAD] {
lappend cmd -p $p
}

View File

@ -0,0 +1,13 @@
Index: printing/backend/print_backend_cups.cc
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 8bacfd76a7b0d891bd542ee19187c5b2701f0dbe..b469a1c657e5d383ed80961abb11a081ea8c8dce 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -4,6 +4,7 @@
#include "printing/backend/print_backend_cups.h"
+#include <cups/ppd.h>
#include <dlfcn.h>
#include <errno.h>
#include <pthread.h>