From 4e1f87959c76455f0092a7c82aee78df60533ae5 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Sat, 22 May 2010 14:21:27 +0200 Subject: test get_git_work_tree() return value for NULL If we are in a git directory, get_git_work_tree() can return NULL. While trying to determine whether or not the given paths are outside the work tree, the following command would read from it anyways and trigger a segmentation fault. git diff / / Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano diff --git a/diff-no-index.c b/diff-no-index.c index aae8e7a..4cd9dac 100644 --- a/diff-no-index.c +++ b/diff-no-index.c @@ -150,16 +150,14 @@ static int queue_diff(struct diff_options *o, static int path_outside_repo(const char *path) { - /* - * We have already done setup_git_directory_gently() so we - * know we are inside a git work tree already. - */ const char *work_tree; size_t len; if (!is_absolute_path(path)) return 0; work_tree = get_git_work_tree(); + if (!work_tree) + return 1; len = strlen(work_tree); if (strncmp(path, work_tree, len) || (path[len] != '\0' && path[len] != '/')) -- cgit v0.10.2-6-g49f6 From e8f30160007d976746d880dab73b805435e04149 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Mon, 24 May 2010 16:51:17 +0800 Subject: t7502-commit: fix spelling s/subdirecotry/subdirectory/ Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 844fb43..9504466 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -35,7 +35,7 @@ test_expect_success 'partial' ' ' -test_expect_success 'partial modification in a subdirecotry' ' +test_expect_success 'partial modification in a subdirectory' ' test_tick && git commit -m "partial commit to subdirectory" not && -- cgit v0.10.2-6-g49f6 From bd7440fe1b22ff47daba1990653994e8a7128054 Mon Sep 17 00:00:00 2001 From: Tay Ray Chuan Date: Mon, 24 May 2010 16:50:44 +0800 Subject: show-branch: use DEFAULT_ABBREV instead of 7 Signed-off-by: Tay Ray Chuan Signed-off-by: Junio C Hamano diff --git a/builtin/show-branch.c b/builtin/show-branch.c index e20fcf3..e8719aa 100644 --- a/builtin/show-branch.c +++ b/builtin/show-branch.c @@ -313,7 +313,8 @@ static void show_one_commit(struct commit *commit, int no_name) } else printf("[%s] ", - find_unique_abbrev(commit->object.sha1, 7)); + find_unique_abbrev(commit->object.sha1, + DEFAULT_ABBREV)); } puts(pretty_str); strbuf_release(&pretty); -- cgit v0.10.2-6-g49f6 From e498257d650529812ffe1872b3cd62e2bd604287 Mon Sep 17 00:00:00 2001 From: Michael J Gruber Date: Tue, 25 May 2010 10:30:13 +0200 Subject: Documentation/SubmittingPatches: clarify GMail section and SMTP We keep getting mangled submissions from GMail's web interface. Try to be more proactive in SubmittingPatches by - pointing to MUA specific instructions early on, - structuring the GMail section more clearly, - putting send-email/SMTP before imap-send/IMAP. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index abc65de..22e3808 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -41,6 +41,7 @@ Checklist (and a short version for the impatient): maintainer (gitster@pobox.com) if (and only if) the patch is ready for inclusion. If you use git-send-email(1), please test it first by sending email to yourself. + - see below for instructions specific to your mailer Long version: @@ -519,9 +520,27 @@ Gmail GMail does not appear to have any way to turn off line wrapping in the web interface, so this will mangle any emails that you send. You can however -use any IMAP email client to connect to the google imap server, and forward +use "git send e-mail" and send your patches through the GMail SMTP server, or +use any IMAP email client to connect to the google IMAP server and forward the emails through that. +To use "git send-email" and send your patches through the GMail SMTP server, +edit ~/.gitconfig to specify your account settings: + +[sendemail] + smtpencryption = tls + smtpserver = smtp.gmail.com + smtpuser = user@gmail.com + smtppass = p4ssw0rd + smtpserverport = 587 + +Once your commits are ready to be sent to the mailing list, run the +following commands: + + $ git format-patch --cover-letter -M origin/master -o outgoing/ + $ edit outgoing/0000-* + $ git send-email outgoing/* + To submit using the IMAP interface, first, edit your ~/.gitconfig to specify your account settings: @@ -537,8 +556,7 @@ You might need to instead use: folder = "[Google Mail]/Drafts" if you get an err that the "Folder doesn't exist". Once your commits are ready to be sent to the mailing list, run the -following command to send the patch emails to your Gmail Drafts -folder. +following commands: $ git format-patch --cover-letter -M --stdout origin/master | git imap-send @@ -546,19 +564,3 @@ Just make sure to disable line wrapping in the email client (GMail web interface will line wrap no matter what, so you need to use a real IMAP client). -Alternatively, you can use "git send-email" and send your patches -through the GMail SMTP server. edit ~/.gitconfig to specify your -account settings: - -[sendemail] - smtpencryption = tls - smtpserver = smtp.gmail.com - smtpuser = user@gmail.com - smtppass = p4ssw0rd - smtpserverport = 587 - -Once your commits are ready to be sent to the mailing list, run the -following commands: - - $ git format-patch --cover-letter -M origin/master -o outgoing/ - $ git send-email outgoing/* -- cgit v0.10.2-6-g49f6