aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-sh-setup: do not use repo-config to test the git directoryJunio C Hamano2006-08-11
| | | | | | | | | | Since repo-config does not fail in non-git directory, it is not a good command to use to test the git-ness nor validate the repository revision of $GIT_DIR. Original patch by Robert Shearman but with minor fixes. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: bugfix: allow SVN:: lib users to track the root of the repositoryEric Wong2006-08-11
| | | | | | | | | | | | I'm not sure if anybody has hit this (besides me), but this fixes the problem where I ran into while attempting to import a small repo at the root level: I ended up with all the commits, but with no file/tree changes at all throughout the entire history. Also, fix a warning if the commit message is not defined for revision 0. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svn: correctly kill keyword expansion without munging EOLsEric Wong2006-08-11
| | | | | | | | | | | | | | | | | | | This bugfix applies to users of the svn command-line client only. We no longer muck with newlines when killing keyword expansion. This tended to generate unintended diffs in commits because svn revert -R would destroy the manual EOL changes we were doing. Of course, we didn't need the EOL munging in the first place, as svn seems to do it for us even in the text-base files. Now we set the mtime and atime the files changed by keyword expansion killing to avoid triggering a change on svn revert, which svn still seems to want to do. Thanks to Seth Falcon for reporting this bug. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* drop length argument of has_extensionRene Scharfe2006-08-11
| | | | | | | | | | | | | | | | | | | As Fredrik points out the current interface of has_extension() is potentially confusing. Its parameters include both a nul-terminated string and a length-limited string. This patch drops the length argument, requiring two nul-terminated strings; all callsites are updated. I checked that all of them indeed provide nul-terminated strings. Filenames need to be nul-terminated anyway if they are to be passed to open() etc. The performance penalty of the additional strlen() is negligible compared to the system calls which inevitably surround has_extension() calls. Additionally, change has_extension() to use size_t inside instead of int, as that is the exact type strlen() returns and memcmp() expects. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'rn/push-dav'Junio C Hamano2006-08-10
|\ | | | | | | | | * rn/push-dav: http-push: Make WebDAV work with (broken?) default apache2 WebDAV module
| * http-push: Make WebDAV work with (broken?) default apache2 WebDAV moduleRutger Nijlunsing2006-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | WebDAV on Debian unstable cannot handle renames on WebDAV from file.ext to newfile (without ext) when newfile* already exists. Normally, git creates a file like 'objects/xx/sha1.token', which is renamed to 'objects/xx/sha1' when transferred completely. Just use '_' instead of '.' so WebDAV doesn't see it as an extension change. Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add Documentation/howto/setup-git-server-over-http.txtRutger Nijlunsing2006-08-10
| | | | | | | | | | | | | | | | | | | | | | A small howto on how to setup GIT over HTTP transport protocol by setting up WebDAV access on apache2. [jc: minimum ispell fixes applied] Signed-off-by: Rutger Nijlunsing <git@tux.tmfweb.nl> Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: no need to count errorsRene Scharfe2006-08-10
| | | | | | | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: buffer overrun paranoiaRene Scharfe2006-08-10
| | | | | | | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: free pack after use and a cleanupRene Scharfe2006-08-10
| | | | | | | | | | | | | | | | | | Plug memory leak in verify_one_pack() by freeing the struct packed_git we got from add_packed_git(). Also rename g to pack and pull an assignment out of an if statement while we're at it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: get rid of while loopRene Scharfe2006-08-10
| | | | | | | | | | | | | | | | | | Get rid of that while loop which was apparently used as a way to avoid goto's (why?). It's easy now because there is only one break left at the end of it. Also make the comment clearer. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: insist on .idx extensionRene Scharfe2006-08-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | git-verify-pack can be called with a filename without .idx extension. add_packed_git() on the other hand depends on its presence. So instead of trying to call it with whatever the user gave us check for that extension and add it if it's missing. That means that you can't name your index file "blah" and your pack file ".pack" anymore ("git-verify-pack blah" currently works in that case). I think this regression is a good change. ;-) Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: more careful path handlingRene Scharfe2006-08-10
| | | | | | | | | | | | | | | | | | | | Use strlcpy() to copy the filename into a buffer and complain if it doesn't fit. Also move the path buffer into verify_one_pack(); it is used only there. Now we can const'ify the first argument of this function. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-verify-pack: show usage when no pack was specifiedRene Scharfe2006-08-10
| | | | | | | | | | Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Add has_extension()Rene Scharfe2006-08-10
| | | | | | | | | | | | | | | | The little helper has_extension() documents through its name what we are trying to do and makes sure we don't forget the underrun check. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | builtin-apply: remove unused incrementJunio C Hamano2006-08-10
| | | | | | | | | | | | | | We do not use desc.alloc after assigning desc.buffer to patch->result; do not bother to increment it. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix git-diff A...BJunio C Hamano2006-08-10
| | | | | | | | | | | | | | | | Commit 9919f41 meant to make git-diff A...B to (usually) mean "git-diff `git-merge-base A B` B", but it got the parameters wrong and ended up showing "git-diff `git-merge-base A B` A" by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | combine-diff: use colorJunio C Hamano2006-08-10
|/ | | | | | | Using the same mechanism as the regular diffs, color combined diff output. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-apply: applying a patch to make a symlink shorter.Junio C Hamano2006-08-09
| | | | | | | | | | | The internal representation of the result is counted string (i.e. char *buf and ulong size), which is fine for writing out to regular file, but throwing the buf at symlink(2) was a no-no. Reported by Willy Tarreau. Signed-off-by: Junio C Hamano <junkio@cox.net>
* allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4Junio C Hamano2006-08-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* make --find-copies-harder imply -CJunio C Hamano2006-08-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* find_unique_abbrev() with len=0 should not abbreviateJunio C Hamano2006-08-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* check return value from diff_setup_done()Junio C Hamano2006-08-09
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix tutorial-2.htmlJunio C Hamano2006-08-09
| | | | | | Honza Pazdziora noticed that one example did not match reality. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Documentation: git-status takes the same options as git-commitJunio C Hamano2006-08-08
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Update git-init-db(1) and documentation of core.sharedRepositoryJonas Fonseca2006-08-08
| | | | | | | | Combine option descriptions in git-init-db(1). Reflect the changes to additionally allow all users to read the created git repository. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-push: allow pushing from subdirectoriesJeff King2006-08-08
| | | | | | | | The semantics are equivalent to pushing from the root; we just try harder to find the .git directory. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT-VERSION-GEN: adjust for ancient gitJunio C Hamano2006-08-08
| | | | | | | | | | When an ancient "git" that does not understand "describe" command is on the $PATH, "git describe" emitted a Usage message without exiting non-zero status (which is a mistake we cannot fix retroactively). Catch this case to make sure we do not try using phoney multi-line string as a version number. Signed-off-by: Junio C Hamano <junkio@cox.net>
* builtin-mv: fix use of uninitialized memory.Junio C Hamano2006-08-08
| | | | | | | Juergen Ruehle noticed that add_slash() tries to strcat() into uninitialized memory and fails. Signed-off-by: Junio C Hamano <junkio@cox.net>
* debugging: XMALLOC_POISONJunio C Hamano2006-08-08
| | | | | | | Compile with -DXMALLOC_POISON=1 to catch errors from using uninitialized memory returned by xmalloc. Signed-off-by: Junio C Hamano <junkio@cox.net>
* annotate: Fix bug when parsing merges with differing real and logical parents.Ryan Anderson2006-08-07
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* log-tree: show_log() should respect the setting of diffopt->line_terminationRyan Anderson2006-08-07
| | | | | Signed-off-by: Ryan Anderson <ryan@michonline.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* handle https:// protocol in git-cloneMichael Krelin2006-08-07
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix "grep -w"Junio C Hamano2006-08-06
| | | | | | | | | | | | | | | We used to find the first match of the pattern and then if the match is not for the entire word, declared that the whole line does not match. But that is wrong. The command "git grep -w -e mmap" should find that a line "foo_mmap bar mmap baz" matches, by tring the second instance of pattern "mmap" on the same line. Problems an earlier round of "fix" had were pointed out by Morten Welinder, which have been incorporated in the t7002 tests. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Makefile: Cygwin does not seem to need NO_STRLCPYJunio C Hamano2006-08-05
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* commit walkers: setup_ident() to record correct committer in ref-log.Ramsay Jones2006-08-05
| | | | | | | | | The function pull() in fetch.c calls write_ref_sha1(), which may need committer identity to update the ref-log, so they need to call setup_ident() before calling git_config() function. Acked-by: Shawn Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Allow config file to specify Signed-off-by identity in format-patch.Ramsay Jones2006-08-04
| | | | | | | | | | | | | Unlike git-commit, git-format-patch was not picking up and using the user.email config variable for the email part of the committer info. I was forced to use the GIT_COMMITTER_EMAIL environment variable to override the default <user@localhost.localdomain>. The fix was to simply move the call to setup_ident() to come before the git_config() call. Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/c99'Junio C Hamano2006-08-04
|\ | | | | | | | | * jc/c99: Cygwin needs NO_C99_FORMAT???
| * Cygwin needs NO_C99_FORMAT???Junio C Hamano2006-08-02
| | | | | | | | | | | | | | I noticed that t3800 test breaks with git built without this option. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fix crash when GIT_DIR is invalidJohannes Schindelin2006-08-04
| | | | | | | | | | | | | | We used to test if a pointer was NULL, and if it was, try to access it. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | git-tar-tree: fix minor memory leakRene Scharfe2006-08-04
| | | | | | | | | | | | | | | | | | Free the root tree object buffer when we're done, plugging a minor leak in generate_tar(). Note: we cannot simply free(tree.buf) because this pointer is modified by tree_entry() calls in traverse_tree(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Document rev-list's option --mergeUwe Zeisberger2006-08-04
| | | | | | | | | | Signed-off-by: Uwe Zeisberger <Uwe_Zeisberger@digi.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Further clean-up: usage() vs die()Junio C Hamano2006-08-03
| | | | | | | | | | | | | | | | This hopefully finishes the clean-up Ramsay started with recent commit 15e593e4d37d1d350fef20ab666d58f6881c7f5f and commit 8cdf33643dc0b21d9ea922a3fdd7f64226c421aa. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Replace some calls to die(usage_str) with usage(usage_str).Ramsay Allan Jones2006-08-03
| | | | | | | | | | | | | | | | | | The only change in behaviour should be having a "usage: " prefix on the output string rather than "fatal: ", and an exit code of 129 rather than 128. Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Fixup command names in some usage strings.Ramsay Allan Jones2006-08-03
| | | | | | | | | | | | | | | | | | Most usage strings, such as for command xxx, start with "git-xxx". This updates the rebels to conform to the general pattern. (The git wrapper is an exception to this, of course ...) Signed-off-by: Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | GIT 1.4.2-rc3v1.4.2-rc3Junio C Hamano2006-08-03
| | | | | | | | | | | | | | | | We ended up merging too many stuff after -rc2, so here is another round of release candidate. Non bugfixes will be queued to "next" from now on until a real 1.4.2 happens. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Documentation/git.txt: link git-svn and git-instaweb from the main page.Junio C Hamano2006-08-03
| | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/sideband'Junio C Hamano2006-08-03
|\ \ | | | | | | | | | | | | | | | * jc/sideband: sideband: do not use color, just say "remote:" fetch/clone: mark messages from remote side stand out.
| * | sideband: do not use color, just say "remote:"Junio C Hamano2006-08-03
| | | | | | | | | | | | | | | | | | ... per suggestion by Andrew. Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | fetch/clone: mark messages from remote side stand out.Junio C Hamano2006-08-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When dealing with a corrupt or out of sync remote repository, the user often gets error messages like this: error: refs/heads/devel does not point to a valid commit object! which leaves the user wondering if the breakage is on the local end or on the remote end. This is unnecessarily alarming. This patch changes the way we display messages received from the remote side over the git protocol sideband (i.e. stderr stream of the remote process). It shows them with blue background with white letters, but this presentation is subject to proposals of better ways from the list. The problem was pointed out by Andrew Morton. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-10-21 11:05:55 +0000