aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* socksetup: don't return on set_reuse_addr() errorv1.3.1Serge E. Hallyn2006-04-24
| | | | | | | | | | | The set_reuse_addr() error case was the only error case in socklist() where we returned rather than continued. Not sure why. Either we must free the socklist, or continue. This patch continues on error. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net> (cherry picked from 0032d548db56eac9ea09b4ba05843365f6325b85 commit)
* Document the configuration filePetr Baudis2006-04-24
| | | | | | | | | | This patch adds a Documentation/config.txt file included by git-repo-config and currently aggregating hopefully all the available git plumbing / core porcelain configuration variables, as well as briefly describing the format. It also updates an outdated bit of the example in git-repo-config(1). Signed-off-by: Petr Baudis <pasky@suse.cz>
* Document git-var -l listing also configuration variablesPetr Baudis2006-04-24
| | | | Signed-off-by: Petr Baudis <pasky@suse.cz>
* rev-parse: better error message for ambiguous argumentsPaul Mackerras2006-04-24
| | | | | | | | | | | | | | | Currently, if git-rev-parse encounters an argument that is neither a recognizable revision name nor the name of an existing file or directory, and it hasn't encountered a "--" argument, it prints an error message saying "No such file or directory". This can be confusing for users, including users of programs such as gitk that use git-rev-parse, who may then think that they can't ask about the history of files that no longer exist. This makes it print a better error message, one that points out the ambiguity and tells the user what to do to fix it. Signed-off-by: Paul Mackerras <paulus@samba.org>
* git-log produces no outputLinus Torvalds2006-04-21
| | | | | | | | | | | | | | When $PAGER is set to 'less -i', we used to fail because we assumed the $PAGER is a command and simply exec'ed it. Try exec first, and then run it through shell if it fails. This allows even funkier PAGERs like these ;-): PAGER='sed -e "s/^/`date`: /" | more' PAGER='contrib/colordiff.perl | less -RS' Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* fix pack-object buffer sizeNicolas Pitre2006-04-21
| | | | | | | | The input line has 40 _chars_ of sha1 and no 20 _bytes_. It should also account for the space before the pathname, and the terminating \n and \0. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* mailinfo: decode underscore used in "Q" encoding properly.Junio C Hamano2006-04-21
| | | | | | | | Quoted-Printable (RFC 2045) and the "Q" encoding (RFC 2047) are subtly different; the latter is used on the mail header and an underscore needs to be decoded to 0x20. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Reintroduce svn pools to solve the memory leak.Santi_Béjar2006-04-20
| | | | | | | Introduced in 4802426. Signed-off-by: Santi Béjar <sbejar@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* pack-objects: do not stop at object that is "too small"Junio C Hamano2006-04-20
| | | | | | | | | | | Because we sort the delta window by name-hash and then size, hitting an object that is too small to consider as a delta base for the current object does not mean we do not have better candidate in the window beyond it. Noticed by Shawn Pearce, analyzed by Nico, Linus and me. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-commit --amend: two fixes.Junio C Hamano2006-04-20
| | | | | | | | | | | | | | | | When running "git commit --amend" only to fix the commit log message without any content change, we mistakenly showed the git-status output that says "nothing to commit" without commenting it out. If you have already run update-index but you want to amend the top commit, "git commit --amend --only" without any paths should have worked, because --only means "starting from the base commit, update-index these paths only to prepare the index to commit, and perform the commit". However, we refused -o without paths. Signed-off-by: Junio C Hamano <junkio@cox.net>
* pre-commit hook: complain about conflict markers.Junio C Hamano2006-04-19
| | | | | | | | | | | | Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-merge: a bit more readable user guidance.Junio C Hamano2006-04-19
| | | | | | | | We said "fix up by hand" after failed automerge, which was a big "Huh? Now what?". Be a bit more explicit without being too verbose. Suggested by Carl Worth. Signed-off-by: Junio C Hamano <junkio@cox.net>
* Document git-clone --referenceShawn Pearce2006-04-18
| | | | | | | | | | | | The new --reference flag introduced to git-clone in GIT 1.3.0 was not documented but is rather handy. So document it. Also corrected a minor issue with the documentation for the -s flag; the info/alternates file name was spelled wrong. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Fix filename scaling for binary filesJonas Fonseca2006-04-18
| | | | | | | | Set maximum filename length for binary files so that scaling won't be triggered and result in invalid string access. Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* GIT 1.3.0v1.3.0Junio C Hamano2006-04-18
| | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* Add git-annotate(1) and git-blame(1)Jonas Fonseca2006-04-18
| | | | | | | [jc: with entries in git.txt] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
* diff --stat: make sure to set recursive.Junio C Hamano2006-04-18
| | | | | | | Just like "patch" format always needs recursive, "diffstat" format does not make sense without setting recursive. Signed-off-by: Junio C Hamano <junkio@cox.net>
* git-svnimport symlink supportHerbert Valerio Riedel2006-04-18
| | | | | | | | | added svn:special symlink support for access methods other than direct-http Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org> Acked-by: Matthias Urlichs <smurf@smurf.noris.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* packed_object_info_detail(): check for corrupt packfile.Junio C Hamano2006-04-17
| | | | | | | Serge E. Hallyn noticed that we compute how many input bytes are still left, but did not use it for sanity checking. Signed-off-by: Junio C Hamano <junkio@cox.net>
* cleanups: remove unused variable from exec_cmd.cSerge E. Hallyn2006-04-17
| | | | | | | | Not sure whether it should be removed, or whether execv_git_cmd() should return it rather than -1 at bottom. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cleanups: prevent leak of two strduped strings in config.cSerge E. Hallyn2006-04-17
| | | | | | | | Config_filename and lockfile are strduped and then leaked in git_config_set_multivar. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cleanups: Remove impossible case in quote.cSerge E. Hallyn2006-04-17
| | | | | | | | | | The switch is inside an if statement which is false if the character is ' '. Either the if should be <=' ' instead of <' ', or the case should be removed as it could be misleading. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cleanups: Remove unused vars from combine-diff.cSerge E. Hallyn2006-04-17
| | | | | | | Mod_type in particular sure looks like it wants to be used, but isn't. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* cleanups: Fix potential bugs in connect.cSerge E. Hallyn2006-04-17
| | | | | | | | | | | The strncmp for ACK was ACK does not include the final space. Presumably either we should either remove the trailing space, or compare 4 chars (as this patch does). 'path' is sometimes strdup'ed, but never freed. Signed-off-by: Serge E. Hallyn <serue@us.ibm.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* Merge branch 'jc/boundary'Junio C Hamano2006-04-17
|\ | | | | | | | | * jc/boundary: rev-list --boundary: show boundary commits even when limited otherwise.
| * rev-list --boundary: show boundary commits even when limited otherwise.Junio C Hamano2006-04-16
| | | | | | | | | | | | | | | | | | The boundary commits are shown for UI like gitk to draw them as soon as topo-order sorting allows, and should not be omitted by get_revision() filtering logic. As long as their immediate child commits are shown, we should not filter them out. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge branch 'jc/bottomless'Junio C Hamano2006-04-17
|\ \ | | | | | | | | | | | | * jc/bottomless: rev-list --bisect: limit list before bisecting.
| * | rev-list --bisect: limit list before bisecting.Junio C Hamano2006-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I noticed bisect does not work well without both good and bad. Running this script in git.git repository would give you quite different results: #!/bin/sh initial=e83c5163316f89bfbde7d9ab23ca2e25604af290 mid0=`git rev-list --bisect ^$initial --all` git rev-list $mid0 | wc -l git rev-list ^$mid0 --all | wc -l mid1=`git rev-list --bisect --all` git rev-list $mid1 | wc -l git rev-list ^$mid1 --all | wc -l The $initial commit is the very first commit you made. The first midpoint bisects things evenly as designed, but the latter does not. The reason I got interested in this was because I was wondering if something like the following would help people converting a huge repository from foreign SCM, or preparing a repository to be fetched over plain dumb HTTP only: #!/bin/sh N=4 P=.git/objects/pack bottom= while test 0 \< $N do N=$((N-1)) if test -z "$bottom" then newbottom=`git rev-list --bisect --all` else newbottom=`git rev-list --bisect ^$bottom --all` fi if test -z "$bottom" then rev_list="$newbottom" elif test 0 = $N then rev_list="^$bottom --all" else rev_list="^$bottom $newbottom" fi p=$(git rev-list --unpacked --objects $rev_list | git pack-objects $P/pack) git show-index <$P/pack-$p.idx | wc -l bottom=$newbottom done The idea is to pack older half of the history to one pack, then older half of the remaining history to another, to continue a few times, using finer granularity as we get closer to the tip. This may not matter, since for a truly huge history, running bisect number of times could be quite time consuming, and we might be better off running "git rev-list --all" once into a temporary file, and manually pick cut-off points from the resulting list of commits. After all we are talking about "approximately half" for such an usage, and older history does not matter much. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Allow empty lines in info/graftsYann Dirson2006-04-17
| |/ |/| | | | | | | | | | | | | In addition to the existing comment support, that just allows the user to use a convention that works pretty much everywhere else. Signed-off-by: Yann Dirson <ydirson@altern.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Makefile fixups.A Large Angry SCM2006-04-16
| | | | | | | | | | Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | Merge git://git.kernel.org/pub/scm/gitk/gitkJunio C Hamano2006-04-16
|\ \ | | | | | | | | | | | | * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug caused by missing commitlisted elements
| * | gitk: Fix bug caused by missing commitlisted elementsPaul Mackerras2006-04-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was reported by Yann Dirson, and results in an 'Error: expected boolean value but got ""' dialog when scrolling to the bottom of the graph under some circumstances. The issue is that git-rev-list isn't outputting all the boundary commits when it is asked for commits affecting only certain files. We already cope with that by adding the missing boundary commits in addextraid, but there we weren't adding a 0 to the end of the commitlisted list when we added the extra id to the end of the displayorder list. This fixes it by appending 0 to commitlisted in addextraid, thus keeping commitlisted and displayorder in sync. Signed-off-by: Paul Mackerras <paulus@samba.org>
* | | reading $GIT_DIR/info/graft - skip comments correctly.Junio C Hamano2006-04-16
| | | | | | | | | | | | | | | | | | Noticed by Yann Dirson. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | pager: do not fork a pager if PAGER is set to empty.Johannes Schindelin2006-04-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This skips an extra pipe, and helps debugging tremendously. [jc: PAGER=cat is a questionable hack and should be done as a separate patch. ] Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | diff-options: add --patch-with-statJohannes Schindelin2006-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this option, git prepends a diffstat in front of the patch. Since I really, really do not know what a diffstat of a combined diff ("merge diff") should look like, the diffstat is not generated for these. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | diff-files --stat: do not dump core with unmerged index.Junio C Hamano2006-04-15
| | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Support "git cmd --help" syntaxLinus Torvalds2006-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "--help" argument is special, in that it is (along with "--version") in that is taken by the "git" program itself rather than the sub-command, and thus we've had the syntax "git --help cmd". However, as anybody who has ever used CVS or some similar devil-spawn program, it's confusing as h*ll when options before the sub-command act differently from options after the sub-command, so this quick hack just makes it acceptable to do "git cmd --help" instead, and get the exact same result. It may be hacky, but it's simple and does the trick. Of course, this does not help if you use one of the non-builtin commands without using the "git" helper. Ie you won't be getting a man-page just because you do "git-rev-list --help". Don't expect us to be quite _that_ helpful. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | diff --stat: do not do its own three-dashes.Junio C Hamano2006-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed that "git-diff-* --stat" spits out three-dash separator on its own without being asked. Remove it. When we output commit log followed by diff, perhaps --patch-with-stat, for downstream consumer, we _would_ want the three-dash between the message and the diff material, but that logic belongs to the caller, not diff generator. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | diff-tree: typefix.Junio C Hamano2006-04-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Recent diff_tree_setup_paths() update made it take a second argument of type "struct diff_options", but we passed another struct that happenes to have that type at the beginning by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | GIT v1.3.0-rc4v1.3.0-rc4Junio C Hamano2006-04-14
| | | | | | | | | | | | | | | | | | | | | | | | I've merged everything I think is ready for 1.3.0, so this is the final round -- hopefully I can release this with minimum last-minute fixup as v1.3.0 early next week. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | Merge branch 'dl/xdiff'Junio C Hamano2006-04-14
|\ \ \ | | | | | | | | | | | | | | | | * dl/xdiff: xdiff: post-process hunks to make them consistent.
| * | | xdiff: post-process hunks to make them consistent.Davide Libenzi2006-04-13
| | | |
* | | | Merge branch 'js/diffstat'Junio C Hamano2006-04-14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2)
| * | | | diff --stat: no need to ask funcnames nor context.Junio C Hamano2006-04-13
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | diff-options: add --stat (take 2)Johannes Schindelin2006-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and a fix for an invalid free(): Signed-off-by: Junio C Hamano <junkio@cox.net>
| * | | | diff-options: add --stat (take 2)Johannes Schindelin2006-04-13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you can say "git diff --stat" (to get an idea how many changes are uncommitted), or "git log --stat". Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Merge branch 'jc/fix5500'Junio C Hamano2006-04-14
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | * jc/fix5500: t5500: test fix
| * | | t5500: test fixJunio C Hamano2006-04-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relying on eye-candy progress bar was fragile to begin with. Run fetch-pack with -k option, and count the objects that are in the pack that were transferred from the other end. Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | Clean up trailing whitespace when pretty-printing commitsLinus Torvalds2006-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partly because we've messed up and now have some commits with trailing whitespace, but partly because this also just simplifies the code, let's remove trailing whitespace from the end when pretty-printing commits. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
* | | | "git cmd -h" for shell scripts.Junio C Hamano2006-04-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrappers that use sh-setup took --help but not -h. Noticed by Sébastien Pierre. Signed-off-by: Junio C Hamano <junkio@cox.net>
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-15 16:01:16 +0000