From b768051ab5177a2fb9063b3938bd91948ef562e9 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 8 Nov 2016 00:46:49 +0000
Subject: [PATCH] gitk stuff

---
 0000-gitk-cover-letter.txt | 72 ++++++++++++++++++++++++++++++++++++++
 gitktagmkseries            | 31 ++++++++++++++++
 2 files changed, 103 insertions(+)
 create mode 100644 0000-gitk-cover-letter.txt
 create mode 100755 gitktagmkseries

diff --git a/0000-gitk-cover-letter.txt b/0000-gitk-cover-letter.txt
new file mode 100644
index 0000000..adfc5c6
--- /dev/null
+++ b/0000-gitk-cover-letter.txt
@@ -0,0 +1,72 @@
+From 4137ab3807278b2576d9d682eb7896d17257cc89 Mon Sep 17 00:00:00 2001
+From: Ian Jackson <ijackson@chiark.greenend.org.uk>
+Date: Tue, 8 Nov 2016 00:40:41 +0000
+Subject: [PATCH 0/6] Provide for config to specify tags not to abbreviate
+
+Hi.
+
+Please find in the following mails patches which provide a way to make
+gitk display certain tags in full, even if they would normally be
+abbreviated.
+
+There are four patches to gitk, three to prepare the ground, and one
+to introduce the new feature.
+
+There is one patch for git, to just document the new config variable.
+
+I hope this is the right way to submit this series.
+
+
+As I say in the patch "gitk: Provide for config to specify tags not to
+abbreviate":
+
+The config setting is in git config logs.* rather than gitk's
+own configuration, because:
+
+ - Tools which manage git trees may want to set this, depending
+   on their knowledge of the nature of the tags likely to be
+   present;
+
+ - Whether this property ought to be set is mostly a property of the
+   contents of the tag namespaces in the tree, not a user preference.
+   (Although of course user preferences are supported.)
+
+ - Other git utilities (or out of tree utilities) may want to
+   reference this setting for their own display purposes.
+
+There will be another, separate, patch to the `git' tree to document
+this config option.
+
+Background motivation:
+
+Debian's dgit archive gateway tool generates and uses tags called
+archive/debian/VERSION.  If such a tag refers to a Debian source tree,
+it is probably very interesting because it refers to a version
+actually uploaded to Debian by the Debian package maintainer.
+
+We would therefore like a way to specify that such tags should be
+displayed in full.  dgit will be able to set an appropriate config
+setting in the trees it deals with.
+
+
+
+Ian Jackson (4):
+  gitk: Internal: drawtags: Abolish "singletag" variable
+  gitk: Internal: drawtags: Idempotently reset "ntags"
+  gitk: drawtags: Introduce concept of unabbreviated marks
+  gitk: Provide for config to specify tags not to abbreviate
+
+ gitk | 34 ++++++++++++++++++++++++++++++----
+ 1 file changed, 30 insertions(+), 4 deletions(-)
+
+
+Ian Jackson (1):
+  config docs: Provide for config to specify tags not to abbreviate
+
+ Documentation/config.txt | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+
+-- 
+2.10.1
+
diff --git a/gitktagmkseries b/gitktagmkseries
new file mode 100755
index 0000000..ecafbc6
--- /dev/null
+++ b/gitktagmkseries
@@ -0,0 +1,31 @@
+#!/bin/sh
+set -e
+rm -rf ../d
+git checkout for-gitk-upstream
+git format-patch --subject-prefix='PATCH GITK' --cover-letter \
+    -o ../d remotes/gitk/master
+count=$(ls -1 ../d | wc -l)
+
+rename 's/$/-A/' ../d/0000-*
+
+git checkout for-git-upstream
+git format-patch -n --start-number=$(($count)) --cover-letter \
+   -o ../d remotes/upstream/master
+
+rename 's/$/-B/' ../d/0000-*
+
+count=$(ls -1 ../d | wc -l)
+count=$(($count-1))
+
+cat ../d/0000-*-[AB] >../d/0000-cover-letter.txt
+rm ../d/0000-*-[AB]
+
+cp ../play/0000-gitk-cover-letter.txt ../d/0000-cover-letter.txt
+
+for f in ../d/*; do
+    perl -i -pe '
+        next if m/^$/..0;
+	next unless m/^Subject/;
+	s{(PATCH(?: \w+)? \d+/)\d+(?=\])}{${1}'"$count"'};
+    ' $f
+done
-- 
2.30.2