aboutsummaryrefslogtreecommitdiffstats
path: root/commit.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-06 09:10:35 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-06 09:10:35 -0800
commit3013dff8662eae06457fe6e5348dfe2270810ab2 (patch)
treed35df35b9733badb3aa86000132595b6668172ae /commit.c
parentMerge branch 'jc/merge-base-fork-point-doc' into maint (diff)
downloadgit-3013dff8662eae06457fe6e5348dfe2270810ab2.tar.gz
git-3013dff8662eae06457fe6e5348dfe2270810ab2.zip
Prepare for 2.15.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions
nkio@cox.net> 2006-06-22Check and document the options to prevent mistakes.Eric W. Biederman2-0/+23 When multiple recipients are given to git-send-email on the same --cc line the code does not properly handle it. Full and proper parsing of the email addresses so I can detect which commas mean a new email address is more than I care to implement. In particular this email address: "bibo,mao" <bibo.mao@intel.com> must not be treated as two email addresses. So this patch simply treats all commas in recipient lists as an error and fails if one is given. At the same time it documents that git-send-email wants multiple instances of --cc specified on the command line if you want to cc multiple recipients. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-22Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.Yakov Lerner1-1/+2 Before this patch, -DDEFAULT_GIT_TEMPLATE_DIR was passed on compilation command line to all and every .c file compiled. In fact the macro is used by only one .c file, and unused by all other .c files. Remove -DDEFAULT_GIT_TEMPLATE_DIR where unused. Follow the example of exec_cmd.o. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used. Signed-off-by: Yakov Lerner <iler.ml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-21daemon: send stderr to /dev/null instead of closing.Junio C Hamano1-1/+1 Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-21gitweb: Make use of $PATH_INFO for project parameterJakub Narebski1-1/+2 Allow to have project name in the path part of URL, just after the name of script. For example instead of gitweb.cgi?p=git.git you can write gitweb.cgi/git.git or gitweb.cgi/git.git/ Not used in URLs inside gitweb; it means that the above alternate syntax must be generated by hand, at least for now. Side effect: project name parameter is now stripped of leading and trailing slash before validation. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-21Fix grow_refs_hash()Linus Torvalds1-16/+14 Earlier commit 3e4339e6f96e8c4f38a9c6607b98d3e96a2ed783 had a thinko that did not check for collisions while repopulating the objects in the new hash table. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net> 2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeEric Wong2-0/+15 recursive merge relies on Python, and we can't perform rename-aware merges without the recursive merge. So bail out before trying it. The test won't work w/o recursive merge, either, so skip that, too. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>