git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 13/17] contrib: remove 'rerere-train'

From
Felipe Contreras <felipe.contreras@gmail.com>
Date
May 9, 2014, 19:11 UTC
Message-ID
<1399662703-355-14-git-send-email-felipe.contreras@gmail.com>
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
Previous: Felipe ContrerasNext: Felipe Contreras
Message 38 of 42 in “contrib: cleanup”
  1. 00/17 contrib: cleanupFelipe Contreras, May 9, 2014
  2. 01/17 contrib: remove outdated READMEFelipe Contreras, May 9, 2014
  3. Junio C HamanoMay 9, 2014
  4. Felipe ContrerasMay 9, 2014
  5. Martin LanghoffMay 13, 2014
  6. Junio C HamanoMay 13, 2014
  7. Felipe ContrerasMay 13, 2014
  8. Junio C HamanoMay 13, 2014
  9. Martin LanghoffMay 13, 2014
  10. Felipe ContrerasMay 13, 2014
  11. Philippe VaucherMay 14, 2014
  12. Felipe ContrerasMay 14, 2014
  13. Martin LanghoffMay 14, 2014
  14. Jeff KingMay 14, 2014
  15. Felipe ContrerasMay 14, 2014
  16. Junio C HamanoMay 14, 2014
  17. Felipe ContrerasMay 14, 2014
  18. Martin LanghoffMay 14, 2014
  19. Felipe ContrerasMay 14, 2014
  20. Junio C HamanoMay 15, 2014
  21. Felipe ContrerasMay 16, 2014
  22. William GiokasMay 16, 2014
  23. Felipe ContrerasMay 16, 2014
  24. William GiokasMay 16, 2014
  25. Felipe ContrerasMay 16, 2014
  26. Felipe ContrerasMay 13, 2014
  27. 02/17 contrib: remove 'vim'Felipe Contreras, May 9, 2014
  28. 03/17 contrib: remove 'emacs'Felipe Contreras, May 9, 2014
  29. 04/17 contrib: remove 'diffall'Felipe Contreras, May 9, 2014
  30. Tim HeniganMay 9, 2014
  31. 05/17 contrib: remove 'hg-to-git'Felipe Contreras, May 9, 2014
  32. 07/17 contrib: remove 'stats'Felipe Contreras, May 9, 2014
  33. 08/17 contrib: remove 'convert-objects'Felipe Contreras, May 9, 2014
  34. 09/17 contrib: remove 'git-shell-commands'Felipe Contreras, May 9, 2014
  35. 10/17 contrib: reomve 'thunderbird-patch-inline'Felipe Contreras, May 9, 2014
  36. 11/17 contrib: remove 'workdir'Felipe Contreras, May 9, 2014
  37. 12/17 contrib: remove 'svn-fe'Felipe Contreras, May 9, 2014
  38. 13/17 contrib: remove 'rerere-train'Felipe Contreras, May 9, 2014
  39. 14/17 contrib: remove 'remotes2config'Felipe Contreras, May 9, 2014
  40. 15/17 contrib: remove 'persistent-https'Felipe Contreras, May 9, 2014
  41. 16/17 contrib: remove 'git-resurrect'Felipe Contreras, May 9, 2014
  42. 17/17 contrib: remove 'contacts'Felipe Contreras, May 9, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.