summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-05-24tests: do not use implicit "git diff --no-index"Libravatar Junio C Hamano50-387/+387
As a general principle, we should not use "git diff" to validate the results of what git command that is being tested has done. We would not know if we are testing the command in question, or locating a bug in the cute hack of "git diff --no-index". Rather use test_cmp for that purpose. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-23Merge git://git.kernel.org/pub/scm/gitk/gitkLibravatar Junio C Hamano2-23/+29
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload" gitk: Fix bug where current row number display stops working gitk: Move es.po where it belongs gitk: Fix "wrong # coordinates" error on reload
2008-05-23Merge branch 'pb/push'Libravatar Junio C Hamano6-35/+116
* pb/push: add special "matching refs" refspec
2008-05-23Merge branch 'bc/repack'Libravatar Junio C Hamano7-34/+154
* bc/repack: Documentation/git-repack.txt: document new -A behaviour let pack-objects do the writing of unreachable objects as loose objects add a force_object_loose() function builtin-gc.c: deprecate --prune, it now really has no effect git-gc: always use -A when manually repacking repack: modify behavior of -A option to leave unreferenced objects unpacked Conflicts: builtin-pack-objects.c
2008-05-23Merge branch 'sp/ignorecase'Libravatar Junio C Hamano2-1/+36
* sp/ignorecase: t0050: Fix merge test on case sensitive file systems t0050: Add test for case insensitive add t0050: Set core.ignorecase case to activate case insensitivity t0050: Test autodetect core.ignorecase git-init: autodetect core.ignorecase
2008-05-23Merge branch 'maint'Libravatar Junio C Hamano4-11/+18
* maint: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref Add missing "short" alternative to --date in rev-list-options.txt git-show.txt: Not very stubby these days. Clarify repack -n documentation
2008-05-23Add log.date config variableLibravatar Heikki Orsila3-1/+18
log.date config variable sets the default date-time mode for the log command. Setting log.date value is similar to using git log's --date option. Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-23Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-6/+12
* maint-1.5.4: rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a ref
2008-05-23rev-parse --symbolic-full-name: don't print '^' if SHA1 is not a refLibravatar Johannes Sixt1-6/+12
The intention of --symbolic-full-name is to not print anything if a revision is not an exact ref. But this command: $ git-rev-parse --symbolic-full-name --not master~1 still emitted a sole '^' to stdout (provided that there's no other ref at master~1). This fixes it. Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Updated status to show 'Not currently on any branch' in redLibravatar Chris Parsons3-5/+13
This provides additional warning to users when attempting to commit to a detached HEAD. It is configurable in color.status.nobranch. Signed-off-by: Chris Parsons <chris@edendevelopment.co.uk> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Add missing "short" alternative to --date in rev-list-options.txtLibravatar Heikki Orsila1-1/+1
Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22git-show.txt: Not very stubby these days.Libravatar Jon Loeliger1-2/+0
Signed-off-by: Jon Loeliger <jdl@freescale.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22Clarify repack -n documentationLibravatar Shawn O. Pearce1-2/+5
While repacking a local repository a coworker thought the -n option was necessary to git-repack to keep it from updating some unknown file on the central server we all share. Explaining further what the option is (not) doing helps to make it clear the option does not impact any remote repositories the user may have configured. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22pull --rebase: exit early when the working directory is dirtyLibravatar Johannes Schindelin2-0/+23
When rebasing fails during "pull --rebase", you cannot just clean up the working directory and call "pull --rebase" again, since the remote branch was already fetched. Therefore, die early when the working directory is dirty. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22gitweb: Convert string to internal form before chopping in chop_strLibravatar Anders Waldenborg1-0/+4
Fix chop_str not to cut in middle of utf8 multibyte chars. Without this fix at least author name in short log may cut in middle of a multibyte char. When the result comes to esc_html to_utf8 is called again, which doesn't find valid utf8 and decodes using $fallback_encoding making it even worse. This also have the nice side effect that it actually tries to show the first 10 _characters_, not the number of characters that happened to fit into 10 bytes. Signed-off-by: Anders Waldenborg <anders@0x63.nu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-22gitk: Fix bug introduced by "gitk: Fix "wrong # coordinates" error on reload"Libravatar Paul Mackerras1-1/+3
Commit 94503a66c56c935e77a8fbe3622f1f56b7134ccc ("gitk: Fix "wrong # coordinates" error on reload") was correct as far as it went, but introduced a problem because it didn't also clear out boldrows and boldnamerows in clear_display. This resulted in Tcl errors after scrolling through the graph for a while if some rows were highlighted. This fixes it. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-05-21Merge branch 'maint'Libravatar Junio C Hamano2-3/+3
* maint: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
2008-05-21Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano2-3/+3
* maint-1.5.4: git-am: fix typo in usage message doc/git-daemon: s/uploadarchive/uploadarch/
2008-05-21Merge branch 'ar/add-unreadable'Libravatar Junio C Hamano8-21/+114
* ar/add-unreadable: Add a config option to ignore errors for git-add Add a test for git-add --ignore-errors Add --ignore-errors to git-add to allow it to skip files with read errors Extend interface of add_files_to_cache to allow ignore indexing errors Make the exit code of add_file_to_index actually useful
2008-05-21Merge branch 'ds/branch-auto-rebase'Libravatar Junio C Hamano0-0/+0
* ds/branch-auto-rebase: Allow tracking branches to set up rebase by default.
2008-05-21Merge branch 'sv/first-parent'Libravatar Junio C Hamano1-8/+6
* sv/first-parent: revision.c: really honor --first-parent Simplify and fix --first-parent implementation
2008-05-21Merge branch 'np/pack'Libravatar Junio C Hamano1-79/+120
* np/pack: pack-objects: fix early eviction for max depth delta objects pack-objects: allow for early delta deflating pack-objects: move compression code in a separate function pack-objects: clean up write_object() a bit pack-objects: simplify the condition associated with --all-progress pack-objects: remove some double negative logic pack-objects: small cleanup
2008-05-21Merge branch 'as/graph'Libravatar Junio C Hamano9-18/+1409
* as/graph: graph API: eliminate unnecessary indentation log and rev-list: add --graph option Add history graph API revision API: split parent rewriting and parent printing options
2008-05-21Merge branch 'jk/maint-send-email-compose'Libravatar Junio C Hamano2-2/+100
* jk/maint-send-email-compose: send-email: rfc2047-quote subject lines with non-ascii characters send-email: specify content-type of --compose body Conflicts: t/t9001-send-email.sh Due to 065096c (git-send-email.perl: Handle shell metacharacters in $EDITOR properly, 2008-05-04) which is a backward incompatible change (but it makes handling of EDITOR consistent with other parts of the system), the test script t9001 had to be adjusted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Merge branch 'hb/maint-send-email-quote-recipients'Libravatar Junio C Hamano1-1/+1
* hb/maint-send-email-quote-recipients: Fix recipient santitization
2008-05-21cvsexportcommit: Create config option for CVS dirLibravatar Trent Piepho2-1/+12
For a given project the directory used with the -w option is almost always the same each time. Let it be specified with 'cvsexportcommit.cvsdir' so it's not necessary to manually add it with -w each time. Signed-off-by: Trent Piepho <tpiepho@freescale.com> Acked-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Fix recipient santitizationLibravatar Horst H. von Brand1-1/+1
Need to quote all special characters, not just the first one Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21send-email: rfc2047-quote subject lines with non-ascii charactersLibravatar Jeff King2-2/+32
We always use 'utf-8' as the encoding, since we currently have no way of getting the information from the user. This also refactors the quoting of recipient names, since both processes can share the rfc2047 quoting code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21send-email: specify content-type of --compose bodyLibravatar Jeff King2-0/+68
If the compose message contains non-ascii characters, then we assume it is in utf-8 and include the appropriate MIME headers. If the user has already included a MIME-Version header, then we assume they know what they are doing and don't add any headers. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Documentation: rev-parse: add a few "--verify" and "--default" examplesLibravatar Christian Couder1-0/+25
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21git-merge: exclude unnecessary options from OPTIONS_SPECLibravatar Miklos Vajna1-3/+1
gitcli(5) already documents them, and there are no options named --no-no-stat, --no-no-summary and --no-no-log. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Fix t3701 if core.filemode disabledLibravatar Alex Riesen1-0/+7
[jc: squashed in suggestions from Jeff King] Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-21Fix prepare-commit-msg hook and replace in-place sedLibravatar Marcel Koeppen1-4/+4
The patterns to the case statement could never be matched, so the hook was a noop. This patch also replaces the non-portable use of in-place sed. Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-20gitk: Fix bug where current row number display stops workingLibravatar Paul Mackerras1-23/+23
The display of the current row number would stop working if the user clicked on a line, or if selectedline got unset for any other reason, because the trace on it got lost when it was unselected. This fixes it by changing the places that unset selectedline to set it to the empty string instead, and the places that tested for it being set or unset to compare it with the empty string. Thus it never gets unset now. This actually simplified the code in a few places since it can be compared for equality with a row number now without first testing if it is set. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-05-19git-am: fix typo in usage messageLibravatar Jeff King1-1/+1
Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-19doc/git-daemon: s/uploadarchive/uploadarch/Libravatar Jeff King1-2/+2
The git-daemon upload-archive feature has always used the config directive 'daemon.uploadarch'; the documentation which came later seems to have just mistakenly used the wrong name. Noticed by lionel@over-blog.com. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-19Documentation: Add missing git svn commandsLibravatar Gustaf Hendeby1-2/+15
Signed-off-by: Gustaf Hendeby <hendeby@isy.liu.se> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-18t/Makefile: "trash" directory was renamed recentlyLibravatar Brandon Casey3-3/+3
Signed-off-by: Brandon Casey <drafnel@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-18Ensure that a test is run in the trash directoryLibravatar Alex Riesen1-1/+1
Exit with error if cd into the "trash directory" failed (error already reported, so just exit). Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-19gitk: Move es.po where it belongsLibravatar Michele Ballabio1-0/+0
Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-05-19gitk: Fix "wrong # coordinates" error on reloadLibravatar Paul Mackerras1-0/+4
This fixes the Tk error "wrong # coordinates: expected 0 or 4, got 2" that sometimes occurred when reloading. The problem was that we didn't unset the variables containing the canvas item id numbers for the displayed rows when we cleared the canvases. Thus make_secsel would think it had something to do when it didn't. Thanks to Michele Ballabio for finding a way to trigger the bug reliably. Signed-off-by: Paul Mackerras <paulus@samba.org>
2008-05-17t0050: Fix merge test on case sensitive file systemsLibravatar Steffen Prohaska1-0/+2
On a case sensitive filesystem, "git reset --hard" might refuse to overwrite a file whose name differs only by case, even if core.ignorecase is set. It is not clear which circumstances cause this behavior. This commit simply works around the problem by removing the case changing file before running "git reset --hard". Signed-off-by: Steffen Prohaska <prohaska@zib.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-17Makefile: update the default build options for AIXLibravatar Mike Ralphson1-0/+4
NO_MKDTEMP is required to build, FREAD_READS_DIRECTORIES and the definition of _LARGE_FILES fix test suite failures and INTERNAL_QSORT is required for adequate performance. Tested on AIX v5.3 Maintenance Level 06 Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
* maint: git-filter-branch: Clarify file removal example.
2008-05-16Replace in-place sed in t7502-commitLibravatar Marcel Koeppen1-1/+3
The in-place mode of sed used in t7502-commit is a non-POSIX extension. That call of sed is replaced by a more portable version using a temporary file. Signed-off-by: Marcel Koeppen <git-dev@marzelpan.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16git-filter-branch: Clarify file removal example.Libravatar Jon Loeliger1-0/+4
Signed-off-by: Jon Loeliger <jdl@jdl.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16submodule update: add convenience option --initLibravatar Johannes Schindelin3-2/+25
When a submodule is not initialized and you do not want to change the defaults from .gitmodules anyway, you can now say $ git submodule update --init <name> When "update" is called without --init on an uninitialized submodule, a hint to use --init is printed. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Documentation/git-repack.txt: document new -A behaviourLibravatar Chris Frey1-1/+13
Add paragraph for the -A option, and describe the new behaviour that makes unreachable objects loose. Signed-off-by: Chris Frey <cdfrey@foursquare.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16git-fast-import: rename cmd_*() functions to parse_*()Libravatar Miklos Vajna1-31/+31
There is a cmd_merge() function in fast-import that will conflict with builtin-merge's cmd_merge() function. To keep it consistent, rename all cmd_*() function to parse_*() Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-05-16Documentation/git-web--browse.txt: fix small typoLibravatar Teemu Likonen1-1/+1
Change "brower.konqueror.path" to "browser.konqueror.path" in documentation. Signed-off-by: Teemu Likonen <tlikonen@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 18:36:56 +0000