From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 13/17] contrib: remove 'rerere-train'
Date: Fri, 9 May 2014 14:11:39 -0500 [thread overview]
Message-ID: <1399662703-355-14-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1399662703-355-1-git-send-email-felipe.contreras@gmail.com>
No activity, no nothing.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
contrib/rerere-train.sh | 52 -------------------------------------------------
1 file changed, 52 deletions(-)
delete mode 100755 contrib/rerere-train.sh
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
deleted file mode 100755
index 36b6fee..0000000
--- a/contrib/rerere-train.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2008, Nanako Shiraishi
-# Prime rerere database from existing merge commits
-
-me=rerere-train
-USAGE="$me rev-list-args"
-
-SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
-. $(git --exec-path)/git-sh-setup
-require_work_tree
-cd_to_toplevel
-
-# Remember original branch
-branch=$(git symbolic-ref -q HEAD) ||
-original_HEAD=$(git rev-parse --verify HEAD) || {
- echo >&2 "Not on any branch and no commit yet?"
- exit 1
-}
-
-mkdir -p "$GIT_DIR/rr-cache" || exit
-
-git rev-list --parents "$@" |
-while read commit parent1 other_parents
-do
- if test -z "$other_parents"
- then
- # Skip non-merges
- continue
- fi
- git checkout -q "$parent1^0"
- if git merge $other_parents >/dev/null 2>&1
- then
- # Cleanly merges
- continue
- fi
- if test -s "$GIT_DIR/MERGE_RR"
- then
- git show -s --pretty=format:"Learning from %h %s" "$commit"
- git rerere
- git checkout -q $commit -- .
- git rerere
- fi
- git reset -q --hard
-done
-
-if test -z "$branch"
-then
- git checkout "$original_HEAD"
-else
- git checkout "${branch#refs/heads/}"
-fi
--
1.9.2+fc1.28.g12374c0
next prev parent reply other threads:[~2014-05-09 19:12 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-09 19:11 [PATCH v2 00/17] contrib: cleanup Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 01/17] contrib: remove outdated README Felipe Contreras
2014-05-09 19:58 ` Junio C Hamano
2014-05-09 21:54 ` Felipe Contreras
2014-05-13 18:10 ` Martin Langhoff
2014-05-13 18:27 ` Junio C Hamano
2014-05-13 18:54 ` Felipe Contreras
2014-05-13 21:05 ` Junio C Hamano
2014-05-13 21:35 ` Martin Langhoff
2014-05-13 22:29 ` Felipe Contreras
2014-05-14 12:51 ` Philippe Vaucher
2014-05-14 19:35 ` Felipe Contreras
2014-05-14 19:55 ` Martin Langhoff
2014-05-14 20:26 ` Jeff King
2014-05-14 21:26 ` Felipe Contreras
2014-05-14 20:59 ` Junio C Hamano
2014-05-14 23:28 ` Felipe Contreras
2014-05-14 23:50 ` Martin Langhoff
2014-05-14 23:48 ` Felipe Contreras
2014-05-15 22:56 ` Junio C Hamano
2014-05-16 8:08 ` Felipe Contreras
2014-05-16 8:59 ` William Giokas
2014-05-16 10:21 ` Felipe Contreras
2014-05-16 11:25 ` William Giokas
2014-05-16 12:20 ` Felipe Contreras
2014-05-13 22:52 ` Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 02/17] contrib: remove 'vim' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 03/17] contrib: remove 'emacs' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 04/17] contrib: remove 'diffall' Felipe Contreras
2014-05-09 19:27 ` Tim Henigan
2014-05-09 19:11 ` [PATCH v2 05/17] contrib: remove 'hg-to-git' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 07/17] contrib: remove 'stats' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 08/17] contrib: remove 'convert-objects' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 09/17] contrib: remove 'git-shell-commands' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 10/17] contrib: reomve 'thunderbird-patch-inline' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 11/17] contrib: remove 'workdir' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 12/17] contrib: remove 'svn-fe' Felipe Contreras
2014-05-09 19:11 ` Felipe Contreras [this message]
2014-05-09 19:11 ` [PATCH v2 14/17] contrib: remove 'remotes2config' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 15/17] contrib: remove 'persistent-https' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 16/17] contrib: remove 'git-resurrect' Felipe Contreras
2014-05-09 19:11 ` [PATCH v2 17/17] contrib: remove 'contacts' Felipe Contreras
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1399662703-355-14-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).