git/ident.c, branch v1.6.3

Add backslash to list of 'crud' characters in real name

2008-12-02T23:29:13Z

We remove crud characters at the beginning and end of real-names so that when we see email addresses like From: "David S. Miller" we drop the quotes around the name when we parse that and split it up into name and email. However, the list of crud characters was basically just a random list of common things that are found around names, and it didn't contain the backslash character that some insane scripts seem to use when quoting things. So now the kernel has a number of authors listed like Author: \"Rafael J. Wysocki\ because the author name had started out as From: \"Rafael J. Wysocki\" and the only "crud" character we noticed and removed was the final double-quote at the end. We should probably do better quote removal from names anyway, but this is the minimal obvious patch. Signed-off-by: Linus Torvalds Signed-off-by: Junio C Hamano

Replace uses of "git-var" with "git var"

2008-07-30T18:42:01Z

Signed-off-by: Todd Zullinger Signed-off-by: Junio C Hamano

commit: Show committer if automatic

2008-05-06T23:50:17Z

To warn the user in case he/she might be using an unintended committer identity. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

ident.c: reword error message when the user name cannot be determined

2008-03-09T03:43:21Z

The "config --global" suggested in the message is a valid one-shot fix, and hopefully one-shot across machines that NFS mounts the home directories. This knowledge can hopefully be reused when you are forced to use git on Windows, but the fix based on GECOS would not be applicable, so it is not such a useful hint to mention the exact reason why the name cannot be determined. Signed-off-by: Santi Béjar Signed-off-by: Junio C Hamano

Fix grammar nits in documentation and in code comments.

2008-01-03T17:15:17Z

Signed-off-by: Jim Meyering Signed-off-by: Junio C Hamano

Re-fix "builtin-commit: fix --signoff"

2007-12-09T08:55:55Z

An earlier fix to the said commit was incomplete; it mixed up the meaning of the flag parameter passed to the internal fmt_ident() function, so this corrects it. git_author_info() and git_committer_info() can be told to issue a warning when no usable user information is found, and optionally can be told to error out. Operations that actually use the information to record a new commit or a tag will still error out, but the caller to leave reflog record will just silently use bogus user information. Not warning on misconfigured user information while writing a reflog entry is somewhat debatable, but it is probably nicer to the users to silently let it pass, because the only information you are losing is who checked out the branch. * git_author_info() and git_committer_info() used to take 1 (positive int) to error out with a warning on misconfiguration; this is now signalled with a symbolic constant IDENT_ERROR_ON_NO_NAME. * These functions used to take -1 (negative int) to warn but continue; this is now signalled with a symbolic constant IDENT_WARN_ON_NO_NAME. * fmt_ident() function implements the above error reporting behaviour common to git_author_info() and git_committer_info(). A symbolic constant IDENT_NO_DATE can be or'ed in to the flag parameter to make it return only the "Name ". * fmt_name() is a thin wrapper around fmt_ident() that always passes IDENT_ERROR_ON_NO_NAME and IDENT_NO_DATE. Signed-off-by: Junio C Hamano

Merge branch 'maint'

2007-12-07T07:20:18Z

* maint: Change from using email.com to example.com as example domain, as per RFC 2606.

Change from using email.com to example.com as example domain, as per RFC 2606.

2007-12-07T07:20:11Z

Signed-off-by: David Symonds Signed-off-by: Junio C Hamano

Merge branch 'kh/commit'

2007-12-05T01:16:33Z

* kh/commit: (33 commits) git-commit --allow-empty git-commit: Allow to amend a merge commit that does not change the tree quote_path: fix collapsing of relative paths Make git status usage say git status instead of git commit Fix --signoff in builtin-commit differently. git-commit: clean up die messages Do not generate full commit log message if it is not going to be used Remove git-status from list of scripts as it is builtin Fix off-by-one error when truncating the diff out of the commit message. builtin-commit.c: export GIT_INDEX_FILE for launch_editor as well. Add a few more tests for git-commit builtin-commit: Include the diff in the commit message when verbose. builtin-commit: fix partial-commit support Fix add_files_to_cache() to take pathspec, not user specified list of files Export three helper functions from ls-files builtin-commit: run commit-msg hook with correct message file builtin-commit: do not color status output shown in the message template file_exists(): dangling symlinks do exist Replace "runstatus" with "status" in the tests t7501-commit: Add test for git commit with dirty index. ...

Simplify crud() in ident.c

2007-12-04T23:50:18Z

Signed-off-by: Alex Riesen Signed-off-by: Junio C Hamano