Commits

Show all
Author Commit Message Labels Comments Date
Junio C Hamano
GIT 1.3.0 Signed-off-by: Junio C Hamano <junkio@cox.net>
Tags
v1.3.0
Jonas Fonseca
Add git-annotate(1) and git-blame(1) [jc: with entries in git.txt] Signed-off-by: Jonas Fonseca <fonseca@diku.dk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
diff --stat: make sure to set recursive. 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>
Herbert Valerio Riedel
git-svnimport symlink support 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>
Junio C Hamano
packed_object_info_detail(): check for corrupt packfile. 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>
Serge E. Hallyn
cleanups: remove unused variable from exec_cmd.c 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>
Serge E. Hallyn
cleanups: prevent leak of two strduped strings in config.c 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>
Serge E. Hallyn
cleanups: Remove impossible case in quote.c 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>
Serge E. Hallyn
cleanups: Remove unused vars from combine-diff.c 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>
Serge E. Hallyn
cleanups: Fix potential bugs in connect.c 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>
Junio C Hamano
Merge branch 'jc/boundary' * jc/boundary: rev-list --boundary: show boundary commits even when limited otherwise.
Junio C Hamano
Merge branch 'jc/bottomless' * jc/bottomless: rev-list --bisect: limit list before bisecting.
Yann Dirson
Allow empty lines in info/grafts 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>
Junio C Hamano
rev-list --boundary: show boundary commits even when limited otherwise. 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>
A Large Angry SCM
Makefile fixups. Signed-off-by: A Large Angry SCM <gitzilla@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano
Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix bug caused by missing commitlisted elements
Paul Mackerras
gitk: Fix bug caused by missing commitlisted elements 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…
Junio C Hamano
reading $GIT_DIR/info/graft - skip comments correctly. Noticed by Yann Dirson. Signed-off-by: Junio C Hamano <junkio@cox.net>
Johannes Schindelin
pager: do not fork a pager if PAGER is set to empty. 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>
Johannes Schindelin
diff-options: add --patch-with-stat 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>
Junio C Hamano
diff-files --stat: do not dump core with unmerged index. Signed-off-by: Junio C Hamano <junkio@cox.net>
Linus Torvalds
Support "git cmd --help" syntax 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 …
Junio C Hamano
diff --stat: do not do its own three-dashes. 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>
Junio C Hamano
diff-tree: typefix. 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>
Junio C Hamano
GIT v1.3.0-rc4 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>
Tags
v1.3.0-rc4
Junio C Hamano
Merge branch 'dl/xdiff' * dl/xdiff: xdiff: post-process hunks to make them consistent.
Junio C Hamano
Merge branch 'js/diffstat' * js/diffstat: diff --stat: no need to ask funcnames nor context. diff-options: add --stat (take 2) diff-options: add --stat (take 2)
Junio C Hamano
Merge branch 'jc/fix5500' * jc/fix5500: t5500: test fix
Junio C Hamano
rev-list --bisect: limit list before bisecting. 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` g…
Linus Torvalds
Clean up trailing whitespace when pretty-printing commits 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>
  1. Prev
  2. Next