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

[GUILT v2 12/29] "guilt header": more robust header selection.

From
Per Cederqvist <cederp@opera.com>
Date
May 13, 2014, 20:30 UTC
Message-ID
<1400013065-27919-13-git-send-email-cederp@opera.com>
In-Reply-To
<1400013065-27919-1-git-send-email-cederp@opera.com>

If you run something like "guilt header '.*'" the command would crash, because the grep comand that tries to ensure that the patch exist would detect a match, but the later code expected the match to be exact.

Fixed by comparing exact strings.

And as a creeping feature "guilt header" will now try to use the supplied patch name as an unachored regexp if no exact match was found. If the regexp yields a unique match, it is used; if more than one patch matches, the names of all patches are listed and the command fails. (Exercise left to the reader: generalized this so that "guilt push" also accepts a unique regular expression.)

Signed-off-by: Per Cederqvist <cederp@opera.com>
---
 guilt-header | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/guilt-header b/guilt-header
index 41e00cc..4701b31 100755
--- a/guilt-header
+++ b/guilt-header
@@ -45,10 +45,32 @@ esac
 [ -z "$patch" ] && die "No patches applied."
 
 # check that patch exists in the series
-ret=`get_full_series | grep -e "^$patch\$" | wc -l`
-if [ $ret -eq 0 ]; then
-	die "Patch $patch is not in the series"
+full_series=`get_tmp_file series`
+get_full_series > "$full_series"
+found_patch=
+while read x; do
+	if [ "$x" = "$patch" ]; then
+		found_patch="$patch"
+		break
+	fi
+done < "$full_series"
+if [ -z "$found_patch" ]; then
+	TMP_MATCHES=`get_tmp_file series`
+	grep "$patch" < "$full_series" > "$TMP_MATCHES"
+	nr=`wc -l < $TMP_MATCHES`
+	if [ $nr -gt 1 ]; then
+		echo "$patch does not uniquely identify a patch. Did you mean any of these?" >&2
+		sed 's/^/  /' "$TMP_MATCHES" >&2
+		rm -f "$TMP_MATCHES"
+		exit 1
+	elif [ $nr -eq 0 ]; then
+		rm -f "$TMP_MATCHES"
+		die "Patch $patch is not in the series"
+	fi
+	found_patch=`cat $TMP_MATCHES`
+	rm -f "$TMP_MATCHES"
 fi
+patch="$found_patch"
 
 # FIXME: warn if we're editing an applied patch
 

-- 
1.8.3.1
Previous: Per CederqvistNext: Jeff Sipek
Message 21 of 63 in “[GUILT v2 00/29] Teach guilt import-commit how to create legal patch names, and more”
  1. Per CederqvistMay 13, 2014
  2. 01/29 The tests should not fail if guilt.diffstat is set.Per Cederqvist, May 13, 2014
  3. 02/29 Allow "guilt delete -f" to run from a dir which contains spaces.Per Cederqvist, May 13, 2014
  4. 03/29 Added test case for "guilt delete -f".Per Cederqvist, May 13, 2014
  5. 04/29 Allow "guilt import-commit" to run from a dir which contains spaces.Per Cederqvist, May 13, 2014
  6. Jeff SipekMay 13, 2014
  7. 05/29 "guilt new": Accept more than 4 arguments.Per Cederqvist, May 13, 2014
  8. 06/29 Fix the do_get_patch function.Per Cederqvist, May 13, 2014
  9. Jeff SipekMay 13, 2014
  10. Per CederqvistMay 14, 2014
  11. 07/29 Added test cases for "guilt fold".Per Cederqvist, May 13, 2014
  12. Jeff SipekMay 13, 2014
  13. Per CederqvistMay 14, 2014
  14. 08/29 Added more test cases for "guilt new": empty patches.Per Cederqvist, May 13, 2014
  15. Jeff SipekMay 14, 2014
  16. Per CederqvistMay 14, 2014
  17. 09/29 Test suite: properly check the exit status of commands.Per Cederqvist, May 13, 2014
  18. 10/29 Run test_failed if the exit status of a test script is bad.Per Cederqvist, May 13, 2014
  19. Jeff SipekMay 13, 2014
  20. 11/29 test suite: remove pointless redirection.Per Cederqvist, May 13, 2014
  21. 12/29 "guilt header": more robust header selection.Per Cederqvist, May 13, 2014
  22. Jeff SipekMay 15, 2014
  23. Per CederqvistMay 16, 2014
  24. Jeff SipekMay 16, 2014
  25. 13/29 Check that "guilt header '.*'" fails.Per Cederqvist, May 13, 2014
  26. Jeff SipekMay 15, 2014
  27. 14/29 Use "git check-ref-format" to validate patch names.Per Cederqvist, May 13, 2014
  28. Jeff SipekMay 15, 2014
  29. 15/29 Produce legal patch names in guilt-import-commit.Per Cederqvist, May 13, 2014
  30. Jeff SipekMay 15, 2014
  31. 16/29 Fix backslash handling when creating names of imported patches.Per Cederqvist, May 13, 2014
  32. Jeff SipekMay 13, 2014
  33. Per CederqvistMay 14, 2014
  34. Jeff SipekMay 14, 2014
  35. 17/29 "guilt graph" no longer loops when no patches are applied.Per Cederqvist, May 13, 2014
  36. Jeff SipekMay 13, 2014
  37. 18/29 guilt-graph: Handle commas in branch names.Per Cederqvist, May 13, 2014
  38. 19/29 Check that "guilt graph" works when working on a branch with a comma.Per Cederqvist, May 13, 2014
  39. Jeff SipekMay 13, 2014
  40. 20/29 "guilt graph": Handle patch names containing quotes.Per Cederqvist, May 13, 2014
  41. Jeff SipekMay 13, 2014
  42. 21/29 The log.decorate setting should not influence import-commit.Per Cederqvist, May 13, 2014
  43. 22/29 The log.decorate setting should not influence patchbomb.Per Cederqvist, May 13, 2014
  44. 23/29 The log.decorate setting should not influence guilt rebase.Per Cederqvist, May 13, 2014
  45. 24/29 disp no longer processes backslashes.Per Cederqvist, May 13, 2014
  46. Jeff SipekMay 13, 2014
  47. 25/29 "guilt push" now fails when there are no more patches to push.Per Cederqvist, May 13, 2014
  48. Jeff SipekMay 13, 2014
  49. Per CederqvistMay 14, 2014
  50. Jeff SipekMay 14, 2014
  51. 26/29 "guilt pop" now fails when there are no more patches to pop.Per Cederqvist, May 13, 2014
  52. Jeff SipekMay 13, 2014
  53. 27/29 Minor testsuite fix.Per Cederqvist, May 13, 2014
  54. 28/29 Added guilt.reusebranch configuration option.Per Cederqvist, May 13, 2014
  55. Jeff SipekMay 14, 2014
  56. Per CederqvistMay 15, 2014
  57. Jeff SipekMay 15, 2014
  58. 29/29 Added a short style guide, and Emacs settings.Per Cederqvist, May 13, 2014
  59. Jeff SipekMay 13, 2014
  60. Theodore Ts'oMay 13, 2014
  61. Jeff SipekMay 13, 2014
  62. Per CederqvistMay 13, 2014
  63. Per CederqvistMay 14, 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.