+21 -19

Documentation/SubmittingPatches

··· 41 41 maintainer (gitster@pobox.com) if (and only if) the patch 42 42 is ready for inclusion. If you use git-send-email(1), 43 43 please test it first by sending email to yourself. 44 44 + - see below for instructions specific to your mailer 44 45 45 46 Long version: 46 47 ··· 546 547 547 548 GMail does not appear to have any way to turn off line wrapping in the web 548 549 interface, so this will mangle any emails that you send. You can however 549 549 - use any IMAP email client to connect to the google imap server, and forward 550 550 + use "git send e-mail" and send your patches through the GMail SMTP server, or 551 551 + use any IMAP email client to connect to the google IMAP server and forward 550 552 the emails through that. 553 553 + 554 554 + To use "git send-email" and send your patches through the GMail SMTP server, 555 555 + edit ~/.gitconfig to specify your account settings: 556 556 + 557 557 + [sendemail] 558 558 + smtpencryption = tls 559 559 + smtpserver = smtp.gmail.com 560 560 + smtpuser = user@gmail.com 561 561 + smtppass = p4ssw0rd 562 562 + smtpserverport = 587 563 563 + 564 564 + Once your commits are ready to be sent to the mailing list, run the 565 565 + following commands: 566 566 + 567 567 + $ git format-patch --cover-letter -M origin/master -o outgoing/ 568 568 + $ edit outgoing/0000-* 569 569 + $ git send-email outgoing/* 551 570 552 571 To submit using the IMAP interface, first, edit your ~/.gitconfig to specify your 553 572 account settings: ··· 564 583 that the "Folder doesn't exist". 565 584 566 585 Once your commits are ready to be sent to the mailing list, run the 567 567 - following command to send the patch emails to your Gmail Drafts 568 568 - folder. 586 586 + following commands: 569 587 570 588 $ git format-patch --cover-letter -M --stdout origin/master | git imap-send 571 589 ··· 573 591 interface will line wrap no matter what, so you need to use a real 574 592 IMAP client). 575 593 576 576 - Alternatively, you can use "git send-email" and send your patches 577 577 - through the GMail SMTP server. edit ~/.gitconfig to specify your 578 578 - account settings: 579 579 - 580 580 - [sendemail] 581 581 - smtpencryption = tls 582 582 - smtpserver = smtp.gmail.com 583 583 - smtpuser = user@gmail.com 584 584 - smtppass = p4ssw0rd 585 585 - smtpserverport = 587 586 586 - 587 587 - Once your commits are ready to be sent to the mailing list, run the 588 588 - following commands: 589 589 - 590 590 - $ git format-patch --cover-letter -M origin/master -o outgoing/ 591 591 - $ git send-email outgoing/*

+2 -1

builtin/show-branch.c

··· 313 313 } 314 314 else 315 315 printf("[%s] ", 316 316 - find_unique_abbrev(commit->object.sha1, 7)); 316 316 + find_unique_abbrev(commit->object.sha1, 317 317 + DEFAULT_ABBREV)); 317 318 } 318 319 puts(pretty_str); 319 320 strbuf_release(&pretty);

+2 -4

diff-no-index.c

··· 150 150 151 151 static int path_outside_repo(const char *path) 152 152 { 153 153 - /* 154 154 - * We have already done setup_git_directory_gently() so we 155 155 - * know we are inside a git work tree already. 156 156 - */ 157 153 const char *work_tree; 158 154 size_t len; 159 155 160 156 if (!is_absolute_path(path)) 161 157 return 0; 162 158 work_tree = get_git_work_tree(); 159 159 + if (!work_tree) 160 160 + return 1; 163 161 len = strlen(work_tree); 164 162 if (strncmp(path, work_tree, len) || 165 163 (path[len] != '\0' && path[len] != '/'))

+1 -1

t/t7502-commit.sh

··· 35 35 36 36 ' 37 37 38 38 - test_expect_success 'partial modification in a subdirecotry' ' 38 38 + test_expect_success 'partial modification in a subdirectory' ' 39 39 40 40 test_tick && 41 41 git commit -m "partial commit to subdirectory" not &&