aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* diff: do not use configuration magic at the core-levelJunio C Hamano2006-07-08
| | | | | | | | | | | | | | | | | | | | The Porcelainish has become so much usable as the UI that there is not much reason people should be using the core programs by hand anymore. At this point we are better off making the behaviour of the core programs predictable by keeping them unaffected by the configuration variables. Otherwise they will become very hard to use as reliable building blocks. For example, "git-commit -a" internally uses git-diff-files to figure out the set of paths that need to be updated in the index, and we should never allow diff.renames that happens to be in the configuration to interfere (or slow down the process). The UI level configuration such as showing renamed diff and coloring are still honored by the Porcelainish ("git log" family and "git diff"), but not by the core anymore. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update diff-options and config documentation.Junio C Hamano2006-07-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff.c: --no-color to defeat diff.color configuration.Junio C Hamano2006-07-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff.c: respect diff.renames config optionEric Wong2006-07-07
| | | | | | | | | | | diff.renames is mentioned several times in the documentation, but to my surprise it didn't do anything before this patch. Also add the --no-renames option to override this from the command-line. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff-options: Explain --text and -aStephan Feder2006-07-07
| | | | | Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add -a and --text to common diff options helpStephan Feder2006-07-07
| | | | | Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach diff -a as shorthand for --textStephan Feder2006-07-07
| | | | | Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Teach --text option to diffStephan Feder2006-07-07
| | | | | | | | Add new item text to struct diff_options. If set then do not try to detect binary files. Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* send-email: format 2822 datestring ourselves.Jakub Narebski2006-07-07
| | | | | | | | | | | It is not worth trying to force C locale (and failing) just to format the 2822 datestring. This code was borrowed from /usr/bin/822-date (Ian Jackson and Klee Dienes, both in public domain), per suggestion by Eric Wong. Signed-off-by: Junio C Hamano <junkio@cox.net> Acked-by: Jakub Narebski <jnareb@gmail.com>
* Do not drop data from '\0' until eol in patch outputStephan Feder2006-07-07
| | | | | | | | The binary file detection is just a heuristic which can well fail. Do not produce garbage patches in these cases. Signed-off-by: Stephan Feder <sf@b-i-t.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* builtin-log: respect diff configuration optionsEric Wong2006-07-07
| | | | | | | | The log commands are all capable of generating diffs, so we should respect those configuration options for diffs here. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* rev-parse documentation: talk about range notation.Junio C Hamano2006-07-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* show-branch: match documentation and usageJunio C Hamano2006-07-06
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'js/merge-base'Junio C Hamano2006-07-06
|\
| * builtin-rev-parse.c: constness tighteningJunio C Hamano2006-07-06
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Re-fix clear_commit_marks().Junio C Hamano2006-07-04
| | | | | | | | | | | | | | Fix clear_commit_marks() enough to be usable in get_merge_bases(), and retire now unused clear_object_marks(). Signed-off-by: Junio C Hamano <junkio@cox.net>
| * rev-list: free commit_list in ... handlerRene Scharfe2006-07-04
| | | | | | | | | | | | | | | | | | | | Johannes noticed the missing call to free_commit_list() in the patch from Santi to add ... support to rev-parse. Turns out I forgot it too in rev-list. This patch is against the next branch (3b1d06a). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Teach rev-parse the ... syntax.Santi Béjar2006-07-04
| | | | | | | | | | | | | | [jc: moved the difference code around into its own function.] Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * Merge branch 'master' into js/merge-baseJunio C Hamano2006-07-03
| |\ | | | | | | | | | This is to pull in the object-hash clean-up from the master branch.
| * | revert clear-commit-marks for now.Junio C Hamano2006-07-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier change broke "git describe A B" among other things. Revert it for now, and clean the commits smudged by get_merge_bases using clear_object_marks() function. For complex commit ancestry graph, this is way cheaper as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | get_merge_bases: clean up even when there is no common commit.Junio C Hamano2006-07-03
| | | | | | | | | | | | | | | | | | | | | Actually in this case we would have traversed a lot of commits, so cleaning things up is even more important. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | commit.c: do not redefine UNINTERESTING bit.Junio C Hamano2006-07-02
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Fold get_merge_bases_clean() into get_merge_bases()Rene Scharfe2006-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change get_merge_bases() to be able to clean up after itself if needed by adding a cleanup parameter. We don't need to save the flags and restore them afterwards anymore; that was a leftover from before the flags were moved out of the range used in revision.c. clear_commit_marks() sets them to zero, which is enough. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Make clear_commit_marks() clean harderRene Scharfe2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | Don't care if objects have been parsed or not and don't stop when we reach a commit that is already clean -- its parents could be dirty. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Add '...' operator for revisionsRene Scharfe2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'A...B' is a shortcut for 'A B --not $(git-merge-base --all A B)'. This XOR-like operation is called symmetric difference in set theory. The symbol '...' has been chosen because it's rather similar to the existing '..' operator and the somewhat more natural caret ('^') is already taken. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | Add get_merge_bases_clean()Rene Scharfe2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add get_merge_bases_clean(), a wrapper for get_merge_bases() that cleans up after doing its work and make get_merge_bases() NOT clean up. Single-shot programs like git-merge-base can use the dirty and fast version. Also move the object flags used in get_merge_bases() out of the range defined in revision.h. This fixes the "66ae0c77...ced9456a 89719209...262a6ef7" test of the ... operator which is introduced with the next patch. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | move get_merge_bases() to core lib.Johannes Schindelin2006-06-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | refactor merge_bases() as preparation to libify merge-baseJohannes Schindelin2006-06-29
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'ew/instaweb'Junio C Hamano2006-07-06
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ew/instaweb: instaweb: fix unportable ';' usage in sed Makefile: replace ugly and unportable sed invocation Add git-instaweb, instantly browse the working repo with gitweb gitweb: Declare global variables with "our" gitweb: Enable tree (directory) history display gitweb: optimize per-file history generation
| * | | instaweb: fix unportable ';' usage in sedEric Wong2006-07-02
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hint taken from Johannes. I've tested this with sed --posix on my system with GNU sed and it works fine with and also without it. Further portability testing/review would be good. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Makefile: replace ugly and unportable sed invocationJohannes Schindelin2006-07-02
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | Add git-instaweb, instantly browse the working repo with gitwebEric Wong2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I got tired of having to configure gitweb for every repository I work on. I sometimes prefer gitweb to standard GUIs like gitk or gitview; so this lets me automatically configure gitweb to browse my working repository and also opens my browser to it. Updates from the original patch: Added Apache/mod_perl2 compatibility if Dennis Stosberg's gitweb has been applied, too: <20060621130708.Gcbc6e5c@leonov.stosberg.net> General cleanups in shell code usage. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Declare global variables with "our"Dennis Stosberg2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Variables declared with "my" in the file scope cannot be accessed from subroutines with mod_perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: Enable tree (directory) history displayLuben Tuikov2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows history display of whole trees/directories a la "git-rev-list HEAD -- <dir or file>". I find this useful especially when a project lives in its own subdirectory, as opposed to being all of the GIT repository (i.e. when a sub-project is merged into a super-project). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | gitweb: optimize per-file history generationJunio C Hamano2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rev-list command that is recent enough can filter commits based on paths they touch, so use it instead of generating the full list and limiting it by passing it with diff-tree --stdin. [jc: The patch originally came from Luben Tuikov but the it was corrupt, but it was short enough to be applied by hand. I added the --full-history to make the output compatible with the original while doing so.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | core.compression documentation formatting fix.Joachim Berdal Haga2006-07-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I didn't notice earlier that two colons are required for the asciidoc entry. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | git-reset: complain and exit upon seeing an unknown parameter.Junio C Hamano2006-07-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check to use "rev-parse --verify" was defeated by the use of "--default HEAD". "git reset --hard bogus-committish" just defaulted to reset to the HEAD without complaining. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'lt/gitweb'Junio C Hamano2006-07-05
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * lt/gitweb: gitweb: Declare global variables with "our" gitweb: Enable tree (directory) history display gitweb: optimize per-file history generation
| * | | | gitweb: Declare global variables with "our"Dennis Stosberg2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variables declared with "my" in the file scope cannot be accessed from subroutines with mod_perl. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | gitweb: Enable tree (directory) history displayLuben Tuikov2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allows history display of whole trees/directories a la "git-rev-list HEAD -- <dir or file>". I find this useful especially when a project lives in its own subdirectory, as opposed to being all of the GIT repository (i.e. when a sub-project is merged into a super-project). Signed-off-by: Luben Tuikov <ltuikov@yahoo.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | gitweb: optimize per-file history generationJunio C Hamano2006-07-01
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rev-list command that is recent enough can filter commits based on paths they touch, so use it instead of generating the full list and limiting it by passing it with diff-tree --stdin. [jc: The patch originally came from Luben Tuikov but the it was corrupt, but it was short enough to be applied by hand. I added the --full-history to make the output compatible with the original while doing so.] Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/fmt-merge-msg-test'Junio C Hamano2006-07-05
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * jc/fmt-merge-msg-test: t6200: fmt-merge-msg test.
| * | | | t6200: fmt-merge-msg test.Junio C Hamano2006-07-03
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | Merge branch 'jc/sha1'Junio C Hamano2006-07-05
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/sha1: A better-scheduled PPC SHA-1 implementation. test-sha1: test hashing large buffer Makefile: add framework to verify and bench sha1 implementations.
| * | | | | A better-scheduled PPC SHA-1 implementation.Unknown2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is about 15% faster that the current sha1ppc.S on a G4, and 5% faster on a G5 when hashing 10 million bytes, unaligned. (The G5 ratio seems to get better as the sizes fall.) It's also somewhat smaller, due to using load-multiple instructions. No copyright is claimed on the changes to Paul Mackerras' work below.
| * | | | | test-sha1: test hashing large bufferJunio C Hamano2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test to hash a large buffer in one go is more important than hashing large amount of data in small fixed chunks. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | | Makefile: add framework to verify and bench sha1 implementations.Junio C Hamano2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | Merge branch 'jc/diff-test'Junio C Hamano2006-07-05
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * jc/diff-test: t4013: add "diff" UI program tests.
| * | | | | | t4013: add "diff" UI program tests.Junio C Hamano2006-07-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | | | | Merge branch 'th/diff'Junio C Hamano2006-07-05
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * th/diff: builtin-diff: turn recursive on when defaulting to --patch format. t4013: note improvements brought by the new output code. t4013: add format-patch tests. format-patch: fix diff format option implementation combine-diff.c: type sanity. t4013 test updates for new output code. Fix some more diff options changes. Fix diff-tree -s log --raw: Don't descend into subdirectories by default diff-tree: Use ---\n as a message separator Print empty line between raw, stat, summary and patch t4013: add more tests around -c and --cc whatchanged: Default to DIFF_FORMAT_RAW Don't xcalloc() struct diffstat_t Add msg_sep to diff_options DIFF_FORMAT_RAW is not default anymore Set default diff output format after parsing command line Make --raw option available for all diff commands Merge with_raw, with_stat and summary variables to output_format t4013: add tests for diff/log family output options.
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-12 08:02:37 +0000