summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2008-09-21Merge branch 'db/maint-checkout-b'Libravatar Junio C Hamano2-0/+22
* db/maint-checkout-b: Check early that a new branch is new and valid
2008-09-21t5510: test "git fetch" following tags minimallyLibravatar Junio C Hamano1-0/+20
When "git fetch" auto-follows tags, it should not download excess ones. This new test makes sure that condition. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-21Check early that a new branch is new and validLibravatar Daniel Barkalow2-0/+22
If you fail to update refs to change branches in checkout, your index and working tree are left already updated. We don't have an easy way to undo this, but at least we can check things that would make the creation of a new branch fail. These checks were in the shell version, and were lost in the C conversion. The messages are from the shell version, and should probably be made nicer. [jc: added test to t7201] Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-20Update draft release notes to 1.6.1Libravatar Junio C Hamano1-1/+21
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19Merge branch 'maint'Libravatar Junio C Hamano8-39/+56
* maint: Start draft release notes for 1.6.0.3 git-repack uses --no-repack-object, not --no-repack-delta. Typo "bogos" in format-patch error message. builtin-clone: fix typo Bust the ghost of long-defunct diffcore-pathspec. completion: git commit should list --interactive Conflicts: RelNotes
2008-09-19Start draft release notes for 1.6.0.3Libravatar Junio C Hamano2-1/+30
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19git-repack uses --no-repack-object, not --no-repack-delta.Libravatar Mikael Magnusson2-2/+2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19Typo "bogos" in format-patch error message.Libravatar Mikael Magnusson1-1/+1
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19builtin-clone: fix typoLibravatar Fabrizio Chiarello1-1/+1
Signed-off-by: Fabrizio Chiarello <ponch@autistici.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19Bust the ghost of long-defunct diffcore-pathspec.Libravatar Yann Dirson2-34/+22
This concept was retired by 77882f6 (Retire diffcore-pathspec., 2006-04-10), more than 2 years ago. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19bash: use for-each-ref format 'refname:short'Libravatar SZEDER Gábor1-20/+6
Using this format simplifies the code for completing refs and (in some cases) improves performance significantly. For repositories like the current git.git (with more than 200 refs) there is no real performance difference, but for a repository with 2000 refs the total time needed to complete the refs is reduced by ~25% (from around 400ms to around 305ms). Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-19completion: git commit should list --interactiveLibravatar Eric Raible1-1/+1
Signed-off-by: Eric Raible <raible@gmail.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18Merge branch 'maint'Libravatar Junio C Hamano12-39/+327
* maint: sha1_file: link() returns -1 on failure, not errno Make git archive respect core.autocrlf when creating zip format archives Add new test to demonstrate git archive core.autocrlf inconsistency gitweb: avoid warnings for commits without body Clarified gitattributes documentation regarding custom hunk header. git-svn: fix handling of even funkier branch names git-svn: Always create a new RA when calling do_switch for svn:// git-svn: factor out svnserve test code for later use diff/diff-files: do not use --cc too aggressively
2008-09-18Merge branch 'jc/diff-prefix'Libravatar Junio C Hamano7-8/+70
* jc/diff-prefix: diff: vary default prefix depending on what are compared
2008-09-18Merge branch 'np/pack'Libravatar Junio C Hamano3-11/+27
* np/pack: t5300: improve SHA1 collision test pack-objects: don't include missing preferred base objects sha1write: don't copy full sized buffers Conflicts: t/t5300-pack-object.sh
2008-09-18Merge branch 'bw/shortref'Libravatar Junio C Hamano3-7/+173
* bw/shortref: for-each-ref: `:short` format for `refname`
2008-09-18Merge branch 'rs/decorate'Libravatar Junio C Hamano5-28/+60
* rs/decorate: add '%d' pretty format specifier to show decoration move load_ref_decorations() to log-tree.c and export it log: add load_ref_decorations()
2008-09-18Merge branch 'tr/rev-list-reverse'Libravatar Junio C Hamano3-21/+60
* tr/rev-list-reverse: t6013: replace use of 'tac' with equivalent Perl rev-list: fix --reverse interaction with --parents
2008-09-18Merge branch 'cc/bisect'Libravatar Junio C Hamano2-27/+260
* cc/bisect: bisect: remove "checkout_done" variable used when checking merge bases bisect: only check merge bases when needed bisect: test merge base if good rev is not an ancestor of bad rev
2008-09-18Merge branch 'jc/setlinebuf-setvbuf'Libravatar Junio C Hamano1-1/+2
* jc/setlinebuf-setvbuf: daemon.c: avoid setlinebuf()
2008-09-18Merge branch 'dp/maint-rebase-fix' into maintLibravatar Junio C Hamano1-3/+11
* dp/maint-rebase-fix: git-rebase--interactive: auto amend only edited commit git-rebase-interactive: do not squash commits on abort
2008-09-18Merge branch 'jc/maint-checkout-keep-remove' into maintLibravatar Junio C Hamano5-2/+24
* jc/maint-checkout-keep-remove: checkout: do not lose staged removal
2008-09-18Merge branch 'jc/maint-diff-quiet' into maintLibravatar Junio C Hamano1-11/+1
* jc/maint-diff-quiet: diff --quiet: make it synonym to --exit-code >/dev/null diff Porcelain: do not disable auto index refreshing on -C -C
2008-09-18Merge branch 'jc/maint-name-hash-clear' into maintLibravatar Junio C Hamano1-0/+1
* jc/maint-name-hash-clear: discard_cache: reset lazy name_hash bit
2008-09-18Merge branch 'jc/maint-template-permbits' into maintLibravatar Junio C Hamano1-5/+7
* jc/maint-template-permbits: Fix permission bits on sources checked out with an overtight umask
2008-09-18Merge branch 'mh/maint-honor-no-ssl-verify' into maintLibravatar Junio C Hamano1-1/+10
* mh/maint-honor-no-ssl-verify: Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
2008-09-18sha1_file: link() returns -1 on failure, not errnoLibravatar Thomas Rast1-1/+3
5723fe7 (Avoid cross-directory renames and linking on object creation, 2008-06-14) changed the call to use link() directly instead of through a custom wrapper, but forgot that it returns 0 or -1, not 0 or errno. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18Make git archive respect core.autocrlf when creating zip format archivesLibravatar Charles Bailey2-1/+3
There is currently no call to git_config at the start of cmd_archive. When creating tar archives the core config is read as a side-effect of reading the tar specific config, but this doesn't happen for zip archives. The consequence is that in a configuration with core.autocrlf set, although files in a tar archive are created with crlf line endings, files in a zip archive retain unix line endings. Signed-off-by: Charles Bailey <charles@hashpling.org> Acked-by: René Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18Add new test to demonstrate git archive core.autocrlf inconsistencyLibravatar Charles Bailey1-0/+46
Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18gitweb: avoid warnings for commits without bodyLibravatar Joey Hess1-1/+1
In the unusual case when there is no commit message, gitweb would output an uninitialized value warning. Signed-off-by: Joey Hess <joey@kitenet.net> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18Clarified gitattributes documentation regarding custom hunk header.Libravatar Garry Dolley1-9/+9
The only part of the hunk header that we can change is the "TEXT" portion. Additionally, a few grammatical errors have been corrected. Signed-off-by: Garry Dolley <gdolley@ucla.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18git-svn: fix handling of even funkier branch namesLibravatar Eric Wong2-0/+17
Apparently do_switch() tolerates the lack of escaping in less funky branch names. For the really strange and scary ones, we need to escape them properly. It strangely maintains compatible with the existing handling of branch names with spaces and exclamation marks. Reported-by: m.skoric@web.de ($gmane/94677) Signed-off-by: Eric Wong <normalperson@yhbt.net>
2008-09-18git-svn: Always create a new RA when calling do_switch for svn://Libravatar Alec Berryman3-13/+235
Not doing so caused the "Malformed network data" error when a directoy was deleted and replaced with a copy from an older version. Signed-off-by: Alec Berryman <alec@thened.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18git-svn: factor out svnserve test code for later useLibravatar Alec Berryman2-13/+18
Signed-off-by: Alec Berryman <alec@thened.net> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-18diff/diff-files: do not use --cc too aggressivelyLibravatar Junio C Hamano2-2/+13
Textual diff output for unmerged paths was too eager to give condensed combined diff. Even though "diff -c" (and "diff-files -c -p") is a request to view combined diff without condensing (otherwise the user would have explicitly asked for --cc, not -c), we showed "--cc" output anyway. 0fe7c1d (built-in diff: assorted updates, 2006-04-29) claimed to be careful about doing this, but its breakage was hidden because back then "git diff" was still a shell script that did not use the codepath it introduced fully. Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-16Merge branch 'maint'Libravatar Junio C Hamano10-31/+34
* maint: Cosmetical command name fix Start conforming code to "git subcmd" style part 3 t9700/test.pl: remove File::Temp requirement t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()
2008-09-16Merge branch 'dp/maint-rebase-fix'Libravatar Junio C Hamano1-3/+11
* dp/maint-rebase-fix: git-rebase--interactive: auto amend only edited commit git-rebase-interactive: do not squash commits on abort
2008-09-16Merge branch 'jc/maint-checkout-keep-remove'Libravatar Junio C Hamano5-2/+24
* jc/maint-checkout-keep-remove: checkout: do not lose staged removal
2008-09-16Merge branch 'jc/maint-diff-quiet'Libravatar Junio C Hamano1-11/+1
* jc/maint-diff-quiet: diff --quiet: make it synonym to --exit-code >/dev/null diff Porcelain: do not disable auto index refreshing on -C -C
2008-09-16Merge branch 'jc/maint-name-hash-clear'Libravatar Junio C Hamano1-0/+1
* jc/maint-name-hash-clear: discard_cache: reset lazy name_hash bit
2008-09-16Merge branch 'jc/maint-template-permbits'Libravatar Junio C Hamano1-3/+5
* jc/maint-template-permbits: Fix permission bits on sources checked out with an overtight umask
2008-09-16Merge branch 'mh/maint-honor-no-ssl-verify'Libravatar Junio C Hamano1-1/+10
* mh/maint-honor-no-ssl-verify: Don't verify host name in SSL certs when GIT_SSL_NO_VERIFY is set
2008-09-15Cosmetical command name fixLibravatar Heikki Orsila1-1/+1
If we came from git.c the first arg would be "archive". "git-archive" isn't a bug because cmd_archive() doesn't check the first arg. Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15Start conforming code to "git subcmd" style part 3Libravatar Heikki Orsila9-19/+19
User notifications are presented as 'git cmd', and code comments are presented as '"cmd"' or 'git's cmd', rather than 'git-cmd'. Signed-off-by: Heikki Orsila <heikki.orsila@iki.fi> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15t9700/test.pl: remove File::Temp requirementLibravatar Brandon Casey1-10/+13
The object oriented version of File::Temp is a rather new incarnation it seems. The File::Temp man page for v5.8.0 says "(NOT YET IMPLEMENTED)" in the 'Objects' section. Instead of creating a file with a unique name in the system TMPDIR, we can create our own temporary file with a static name and use that instead. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> on RHEL 3, Perl 5.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15t9700/test.pl: avoid bareword 'STDERR' in 3-argument open()Libravatar Brandon Casey1-1/+1
Some versions of perl complain when 'STDERR' is used as the third argument in the 3-argument form of open(). Convert to the 2-argument form which is described for duping STDERR in my second edition camel book. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Tested-by: Tom G. Christensen <tgc@statsbiblioteket.dk> on RHEL 3, Perl 5.8.0 Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-15Update RPM spec for the new location of git-cvsserver.Libravatar Quy Tonthat1-0/+4
git-cvsserver has been moved from libexecdir to bindir. Signed-off-by: Quy Tonthat <qtonthat@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-12Sync with 1.6.0.2Libravatar Junio C Hamano6-6/+11
2008-09-12GIT 1.6.0.2Libravatar Junio C Hamano2-2/+4
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-09-12Merge branch 'ho/maint-dashless' into maintLibravatar Junio C Hamano5-14/+14
* ho/maint-dashless: Start conforming code to "git subcmd" style part 2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 14:08:35 +0000