summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2006-06-25diff --color: use $GIT_DIR/configLibravatar Junio C Hamano2-15/+80
This lets you use something like this in your $GIT_DIR/config file. [diff] color = auto [diff.color] new = blue old = yellow frag = reverse When diff.color is set to "auto", colored diff is enabled when the standard output is the terminal. Other choices are "always", and "never". Usual boolean true/false can also be used. The colormap entries can specify colors for the following slots: plain - lines that appear in both old and new file (context) meta - diff --git header and extended git diff headers frag - @@ -n,m +l,k @@ lines (hunk header) old - lines deleted from old file new - lines added to new file The following color names can be used: normal, bold, dim, l, blink, reverse, reset, black, red, green, yellow, blue, magenta, cyan, white Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-25git-commit: filter out log message lines only when editor was run.Libravatar Yann Dirson1-7/+12
The current behaviour strips out lines starting with a # even when fed through stdin or -m. This is particularly bad when importing history from another SCM (tailor 0.9.23 uses git-commit). In the best cases all lines are stripped and the commit fails with a confusing "empty log message" error, but in many cases the commit is done, with loss of information. Note that it is quite peculiar to just have "#" handled as a leading comment char here. One commonly meet CVS: or CG: or STG: as prefixes, and using GIT: would be more robust as well as consistent with other commit tools. However, that would break any tool relying on the # (if any). Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24Rename safe_strncpy() to strlcpy().Libravatar Peter Eriksen12-30/+48
This cleans up the use of safe_strncpy() even more. Since it has the same semantics as strlcpy() use this name instead. Also move the definition from inside path.c to its own file compat/strlcpy.c, and use it conditionally at compile time, since some platforms already has strlcpy(). It's included in the same way as compat/setenv.c. Signed-off-by: Peter Eriksen <s022018@student.dtu.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Libravatar Johannes Schindelin1-9/+16
It does not make much sense to build git whose behaviour is different depending on the brokenness of diff implementation of the platform because the brokenness of the patch that is applied with the tool depends on brokenness of the diff the person who generates the patch uses. So we do not use NO_ACCURATE_DIFF anymore, but help people to apply patches that do not record incomplete lines correctly with a runtime flag. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24Clean up diff.cLibravatar Timo Hirvonen1-12/+6
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24repo-config: fix printing of boolLibravatar Junio C Hamano1-6/+3
When a bool variable appears without any value, it means true. However, replacing the NULL value with an empty string, an earlier commit f067a13745fbeae1aa357876348a00e5edd0a629 broke show-config. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24diff --color: use reset sequence when we mean reset.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24git-repack -- respect -q and be quietLibravatar Martin Langhoff1-2/+3
git-repack was passing the -q along to pack-objects but ignoring it itself. Correct the oversight. Signed-off-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24git-pull: abort when fmt-merge-msg fails.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24Merge branch 'pb/error'Libravatar Junio C Hamano5-6/+52
* pb/error: usage: minimum type fix. Customizable error handlers git-merge: Don't use -p when outputting summary git-commit: allow -e option anywhere on command line patch-id: take "commit" prefix as well as "diff-tree" prefix
2006-06-24usage: minimum type fix.Libravatar Junio C Hamano1-3/+3
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-24Customizable error handlersLibravatar Petr Baudis2-4/+46
This patch makes the usage(), die() and error() handlers customizable. Nothing in the git code itself uses that but many other libgit users (like Git.pm) will. This is implemented using the mutator functions primarily because you cannot directly modifying global variables of libgit from a program that dlopen()ed it, apparently. But having functions for that is a better API anyway. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23git-merge: Don't use -p when outputting summaryLibravatar Timo Hirvonen1-1/+1
-p is not needed and we only want diffstat and summary. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23git-commit: allow -e option anywhere on command lineLibravatar Jeff King1-1/+3
Previously, the command 'git-commit -e -m foo' would ignore the '-e' option because the '-m' option overwrites the no_edit flag during sequential option parsing. Now we cause -e to reset the no_edit flag after all options are parsed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-23patch-id: take "commit" prefix as well as "diff-tree" prefixLibravatar Johannes Schindelin1-0/+2
Some time ago we changed git-log in a massive way, and one consequence is that the keyword changed. Adjust patch-id for that. [jc: as Linus suggests, allowing both old and new prefix.] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Makefile: do not recompile main programs when libraries have changed.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22add GIT-CFLAGS to .gitignoreLibravatar Matthias Kestenholz1-0/+1
Signed-off-by: Matthias Kestenholz <matthias@spinlock.ch> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Tweak diff colorsLibravatar Linus Torvalds1-41/+58
This patch does: - always reset the color _before_ printing out the newline. This is actually important. You (and Johannes) didn't see it, because it only matters if you set the background, but if you don't do this, you get some random and funky behaviour if you pick a color with a non-default background (which still potentially has problems with tabs etc, but less so). - allow people to have a different color for the "file headers" (DIFF_METAINFO) and for the "fragment header" (DIFF_FRAGINFO). Also, make a difference between "normal color" and "reset colors" - default to red/green for old/new lines. That's the norm, I'd think. - instead of that eye-popping (and eye-ball-with-a-fondue-fork-popping) purple color for metadata, use bold-face for file headers, and cyan for the frag headers. I actually prefer the "gray background" for that, but it only works well in xterms, so COLOR_CYAN it is.. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Merge branch 'master' into nextLibravatar Junio C Hamano4-8/+34
* master: git-svn: fix commit --edit flag when using SVN:: libraries Makefile: do not force unneeded recompilation upon GIT_VERSION changes Check and document the options to prevent mistakes. Pass -DDEFAULT_GIT_TEMPLATE_DIR only where actually used.
2006-06-22Merge branch 'js/lsfix'Libravatar Junio C Hamano9-127/+200
* js/lsfix: Initialize lock_file struct to all zero. Make git-update-ref a builtin Make git-update-index a builtin Make git-stripspace a builtin Make git-mailinfo a builtin Make git-mailsplit a builtin Make git-write-tree a builtin
2006-06-22Merge branch 'ew/rebase'Libravatar Junio C Hamano3-10/+320
* ew/rebase: rebase --merge: fix for rebasing more than 7 commits. rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing
2006-06-22Merge branch 'jn/web'Libravatar Junio C Hamano2-127/+490
* jn/web: gitweb: whitespace cleanup around '=' gitweb: Use $hash_base as $search_hash if possible gitweb: Make use of $PATH_INFO for project parameter Move $gitbin earlier in gitweb.cgi Add git version to gitweb output gitweb: whitespace cleanup gitweb: style done with stylesheet gitweb: A couple of page title tweaking Fix: Support for the standard mime.types map in gitweb gitweb: add type="text/css" to stylesheet link Make CSS file gitweb/gitweb.css more readable Fix gitweb stylesheet Support for the standard mime.types map in gitweb gitweb: text files for 'blob_plain' action without charset by default gitweb: safely output binary files for 'blob_plain' action Move gitweb style to gitweb.css
2006-06-22Merge early parts of branch 'js/diff'Libravatar Junio C Hamano3-11/+73
2006-06-22Merge branch 'jc/upload-corrupt'Libravatar Junio C Hamano17-293/+338
* jc/upload-corrupt: daemon: send stderr to /dev/null instead of closing. upload-pack/fetch-pack: support side-band communication Retire git-clone-pack upload-pack: prepare for sideband message support. upload-pack: avoid sending an incomplete pack upon failure
2006-06-22Merge branch 'ew/rebase' into nextLibravatar Junio C Hamano1-13/+10
* ew/rebase: rebase --merge: fix for rebasing more than 7 commits.
2006-06-22Merge branch 'jn/web' into nextLibravatar Junio C Hamano1-5/+7
* jn/web: gitweb: whitespace cleanup around '=' gitweb: Use $hash_base as $search_hash if possible
2006-06-22gitweb: whitespace cleanup around '='Libravatar Jakub Narebski1-4/+4
Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22gitweb: Use $hash_base as $search_hash if possibleLibravatar Timo Hirvonen1-1/+3
$hash (h parameter) does not always point to a commit. Use $hash_base as $search_hash when it is defined. Signed-off-by: Timo Hirvonen <tihirvon@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Merge branch 'jc/waitpid'Libravatar Junio C Hamano3-0/+15
* jc/waitpid: Restore SIGCHLD to SIG_DFL where we care about waitpid().
2006-06-22Merge branch 'ff/c99'Libravatar Junio C Hamano24-107/+122
* ff/c99: Remove all void-pointer arithmetic. Change types used in bitfields to be `int's. Don't use empty structure initializers. Cast pointers to `void *' when used in a format. Don't instantiate structures with FAMs. Initialize FAMs using `FLEX_ARRAY'. Remove ranges from switch statements.
2006-06-22Merge branch 'pb/config'Libravatar Junio C Hamano5-11/+107
* pb/config: git_config: access() returns 0 on success, not > 0 repo-config: Fix late-night bug Read configuration also from $HOME/.gitconfig Fix setting config variables with an alternative GIT_CONFIG Support for extracting configuration from different files
2006-06-22Merge branch 'lt/objlist'Libravatar Junio C Hamano14-131/+151
* lt/objlist: Add "named object array" concept
2006-06-22git-svn: fix commit --edit flag when using SVN:: librariesLibravatar Eric Wong1-6/+8
Trying to open an interactive editor in the console while stdout is being piped to the parent process doesn't work out very well. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Makefile: do not force unneeded recompilation upon GIT_VERSION changesLibravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22rebase --merge: fix for rebasing more than 7 commits.Libravatar Junio C Hamano1-13/+10
Instead of using 4-digit numbers to name commits being rebased, just use "cmt.$msgnum" string, with $msgnum as a decimal number without leading zero padding. This makes it possible to rebase more than 9999 commits, but of more practical importance is that the earlier code used "printf" to format already formatted $msgnum and barfed when it counted up to 0008. In other words, the old code was incapable of rebasing more than 7 commits, and this fixes that problem. Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-22Check and document the options to prevent mistakes.Libravatar 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.Libravatar 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-21Merge branch 'master' into nextLibravatar Junio C Hamano1-16/+14
* master: Fix grow_refs_hash()
2006-06-21Merge branch 'jc/upload-corrupt' into nextLibravatar Junio C Hamano1-1/+1
* jc/upload-corrupt: daemon: send stderr to /dev/null instead of closing.
2006-06-21Merge branch 'jn/web' into nextLibravatar Junio C Hamano1-1/+2
* jn/web: gitweb: Make use of $PATH_INFO for project parameter
2006-06-21daemon: send stderr to /dev/null instead of closing.Libravatar Junio C Hamano1-1/+1
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21gitweb: Make use of $PATH_INFO for project parameterLibravatar Jakub 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()Libravatar 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-21Merge branch 'ew/rebase' into nextLibravatar Junio C Hamano4-10/+326
* ew/rebase: rebase: error out for NO_PYTHON if they use recursive merge Add renaming-rebase test. rebase: Allow merge strategies to be used when rebasing object-refs: avoid division by zero
2006-06-21rebase: error out for NO_PYTHON if they use recursive mergeLibravatar Eric 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>
2006-06-21Add renaming-rebase test.Libravatar Junio C Hamano1-0/+106
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21rebase: Allow merge strategies to be used when rebasingLibravatar Eric Wong2-10/+202
This solves the problem of rebasing local commits against an upstream that has renamed files. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21object-refs: avoid division by zeroLibravatar Andre Noll1-0/+3
Currently, we don't check refs_hash_size size and happily call lookup_object_refs() even if refs_hash_size is zero which leads to a division by zero in hash_obj(). Signed-off-by: Andre Noll <maan@systemlinux.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-21Merge branch 'ff/c99' into nextLibravatar Junio C Hamano19-69/+72
* ff/c99: Remove all void-pointer arithmetic.
2006-06-21Merge branch 'jc/upload-corrupt' into nextLibravatar Junio C Hamano17-296/+342
* jc/upload-corrupt: upload-pack/fetch-pack: support side-band communication Retire git-clone-pack upload-pack: prepare for sideband message support. upload-pack: avoid sending an incomplete pack upon failure Fix possible out-of-bounds array access
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 04:21:43 +0000