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

[GUILT v4 30/33] Added a short style guide, and Emacs settings.

From
Per Cederqvist <cederp@opera.com>
Date
May 18, 2014, 22:00 UTC
Message-ID
<1400450409-30998-31-git-send-email-cederp@opera.com>
In-Reply-To
<1400450409-30998-1-git-send-email-cederp@opera.com>
Signed-off-by: Per Cederqvist <cederp@opera.com>
Signed-off-by: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
---
 .dir-locals.el             |  3 +++
 Documentation/Contributing | 15 +++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 .dir-locals.el
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 0000000..50ef2b7
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,3 @@
+((nil . ((indent-tabs-mode . t)
+	 (tab-width . 8)))
+ (sh-mode . ((sh-basic-offset . 8))))
diff --git a/Documentation/Contributing b/Documentation/Contributing
index abf3480..0da49d6 100644
--- a/Documentation/Contributing
+++ b/Documentation/Contributing
@@ -4,6 +4,21 @@ Documentation/SubmittingPatches file. :)
 
 1) Hack on the code a bit
 
+Please follow this style guide:
+
+ - Use tabs for indentation.
+
+ - Put "then" on the same line as "if".
+
+ - Follow the style of the existing code, except if it breaks the
+   above guidlines.
+
+ - If you change the code to conform to the style guide, please do so
+   in a separate commit that does not change anything else.
+
+Please check that you change does not break "make test".  Please add
+new testcases for any new functionality, and if you fix a bug.
+
 2) Make a patch:
 
 Use "diff -up" or "diff -uprN" to create patches. Or simply use git to

-- 
1.8.3.1
Previous: Per CederqvistNext: Per Cederqvist
Message 35 of 40 in “[GUILT v4 00/33] Teach guilt import-commit how to create legal patch names, and more”
  1. Per CederqvistMay 18, 2014
  2. 01/33 The tests should not fail if guilt.diffstat is set.Per Cederqvist, May 18, 2014
  3. 02/33 Allow "guilt delete -f" to run from a dir which contains spaces.Per Cederqvist, May 18, 2014
  4. 03/33 Added test case for "guilt delete -f".Per Cederqvist, May 18, 2014
  5. 04/33 Allow "guilt import-commit" to run from a dir which contains spaces.Per Cederqvist, May 18, 2014
  6. 05/33 "guilt new": Accept more than 4 arguments.Per Cederqvist, May 18, 2014
  7. 06/33 Fix the do_get_patch function.Per Cederqvist, May 18, 2014
  8. 07/33 Added test cases for "guilt fold".Per Cederqvist, May 18, 2014
  9. 08/33 Added more test cases for "guilt new": empty patches.Per Cederqvist, May 18, 2014
  10. 09/33 Test suite: properly check the exit status of commands.Per Cederqvist, May 18, 2014
  11. Jeff SipekJan 22, 2015
  12. 10/33 Run test_failed if the exit status of a test script is bad.Per Cederqvist, May 18, 2014
  13. 11/33 test suite: remove pointless redirection.Per Cederqvist, May 18, 2014
  14. 12/33 "guilt header": more robust header selection.Per Cederqvist, May 18, 2014
  15. 13/33 Check that "guilt header '.*'" fails.Per Cederqvist, May 18, 2014
  16. 14/33 Use "git check-ref-format" to validate patch names.Per Cederqvist, May 18, 2014
  17. Jeff SipekJan 22, 2015
  18. 15/33 Produce legal patch names in guilt-import-commit.Per Cederqvist, May 18, 2014
  19. Jeff SipekJan 22, 2015
  20. Per CederqvistJan 22, 2015
  21. 16/33 Fix backslash handling when creating names of imported patches.Per Cederqvist, May 18, 2014
  22. 17/33 "guilt graph" no longer loops when no patches are applied.Per Cederqvist, May 18, 2014
  23. 18/33 guilt-graph: Handle commas in branch names.Per Cederqvist, May 18, 2014
  24. 19/33 Check that "guilt graph" works when working on a branch with a comma.Per Cederqvist, May 18, 2014
  25. 20/33 "guilt graph": Handle patch names containing quotes.Per Cederqvist, May 18, 2014
  26. 21/33 The log.decorate setting should not influence import-commit.Per Cederqvist, May 18, 2014
  27. 22/33 The log.decorate setting should not influence patchbomb.Per Cederqvist, May 18, 2014
  28. 23/33 The log.decorate setting should not influence guilt rebase.Per Cederqvist, May 18, 2014
  29. 24/33 disp no longer processes backslashes.Per Cederqvist, May 18, 2014
  30. 25/33 "guilt push" now fails when there are no more patches to push.Per Cederqvist, May 18, 2014
  31. 26/33 "guilt pop" now fails when there are no more patches to pop.Per Cederqvist, May 18, 2014
  32. 27/33 Minor testsuite fix.Per Cederqvist, May 18, 2014
  33. 28/33 Fix coding style errors in t-061.sh.Per Cederqvist, May 18, 2014
  34. 29/33 Added guilt.reusebranch configuration option.Per Cederqvist, May 18, 2014
  35. 30/33 Added a short style guide, and Emacs settings.Per Cederqvist, May 18, 2014
  36. 31/33 Don't use "git log -p" in the test suite.Per Cederqvist, May 18, 2014
  37. 32/33 Improved doc and tests for guilt header.Per Cederqvist, May 18, 2014
  38. Jeff SipekJan 22, 2015
  39. 33/33 Document the exit status of guilt push and guilt pop.Per Cederqvist, May 18, 2014
  40. Jeff SipekJan 22, 2015

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.