Commits

Author Commit Message Labels Comments Date
Junio C Hamano
Merge branch 'maint-1.6.1' into maint-1.6.2 * maint-1.6.1: Documentation: git-archive: mark --format as optional in summary
Junio C Hamano
Merge branch 'maint-1.6.0' into maint-1.6.1 * maint-1.6.0: Documentation: git-archive: mark --format as optional in summary
Wesley J. Landaker
Documentation: git-archive: mark --format as optional in summary The --format option was made optional in 8ff21b1 (git-archive: make tar the default format, 2007-04-09), but it was not marked as optional in the summary. This trival patch just changes the summary to match the rest of the documentation. Signed-off-by: Wesley J. Landaker <wjl@icecavern.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint-1.5.6' into maint-1.6.0 * maint-1.5.6: revision traversal and pack: notice and die on missing commit
David Reiss
Round-down years in "years+months" relative date view Previously, a commit from 1 year and 7 months ago would display as "2 years, 7 months ago". Signed-off-by: David Reiss <dreiss@facebook.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Rada
gitweb: add t9501 tests for checking HTTP status codes Adds a new test file, t9501, that checks HTTP status codes and messages from gitweb. Currently, the only tests are for the snapshot feature. Signed-off-by: Mark Rada <marada@uwaterloo.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mark Rada
gitweb: split test suite into library and tests To accommodate additions to the test cases for gitweb, the preamble from t9500 is now in its own library so that new sets of tests for gitweb can use the same setup without copying the code. Signed-off-by: Mark Rada <marada@uwaterloo.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'lt/block-sha1' * lt/block-sha1: remove ARM and Mozilla SHA1 implementations block-sha1: guard gcc extensions with __GNUC__ make sure byte swapping is optimal for git block-sha1: make the size member first in the context struct
Junio C Hamano
Merge branch 'as/maint-graph-interesting-fix' * as/maint-graph-interesting-fix: Add tests for rev-list --graph with options that simplify history graph API: fix bug in graph_is_interesting()
Junio C Hamano
Merge branch 'jh/submodule-foreach' * jh/submodule-foreach: git clone: Add --recursive to automatically checkout (nested) submodules t7407: Use 'rev-parse --short' rather than bash's substring expansion notation git submodule status: Add --recursive to recurse into nested submodules git submodule update: Introduce --recursive to update nested submodules git submodule foreach: Add --recursive to recurse into nested submodul…
Junio C Hamano
Merge branch 'jc/maint-unpack-objects-strict' * jc/maint-unpack-objects-strict: Fix "unpack-objects --strict" Conflicts: builtin-unpack-objects.c
Junio C Hamano
Merge branch 'wl/insta-mongoose' * wl/insta-mongoose: Add support for the Mongoose web server.
Junio C Hamano
Merge branch 'nd/sparse' (early part) * 'nd/sparse' (early part): Prevent diff machinery from examining assume-unchanged entries on worktree
Johannes Sixt
Make test case number unique Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
commit.c: rename variable named 'n' which masks previous declaration The variable named 'n' was initially declared to be of type int. The name 'n' was reused inside inner blocks as a different type. Rename the uses within inner blocks to avoid confusion and give them a slightly more descriptive name. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
abspath.c: move declaration of 'len' into inner block and use appropriate type The 'len' variable was declared at the beginning of the make_absolute_path function and also in an inner 'if' block which masked the outer declaration. It is only used in two 'if' blocks, so remove the outer declaration and make a new declaration inside the other 'if' block that uses 'len'. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Brandon Casey
Makefile: remove pointless conditional assignment in SunOS section It is true that NEEDS_RESOLV is needed on SunOS if NO_IPV6 is set since hstrerror() resides in libresolv, but performing this test at its current location is not very useful. It will only have any effect if the user modifies the make variables from the make command line, and will have no effect if a config.mak file is used. A better location for this conditional would have been further down in t…
Junio C Hamano
mailinfo.scissors: new configuration Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
am/mailinfo: Disable scissors processing by default You can enable it by giving --scissors to "git am". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nanako Shiraishi
Documentation: describe the scissors mark support of "git am" Describe what a scissors mark looks like, and explain in what situation it is often used. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Teach mailinfo to ignore everything before -- >8 -- mark This teaches mailinfo the scissors -- >8 -- mark; the command ignores everything before it in the message body. For lefties among us, we also support -- 8< -- ;-) Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
builtin-mailinfo.c: fix confusing internal API to mailinfo() It fed two arguments to override the corresponding global variables, but the caller always assigned the values to the global variables first and then passed those global variables to this function. Stop pretending to be a proper API to confuse people. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King
clone: add --branch option to select a different HEAD We currently point the HEAD of a newly cloned repo to the same ref as the parent repo's HEAD. While a user can then "git checkout -b foo origin/foo" whichever branch they choose, it is more convenient and more efficient to tell clone which branch you want in the first place. Based on a patch by Kirill A. Korinskiy. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@p…
Junio C Hamano
Merge branch 'maint' * maint: git-log: allow --decorate[=short|full] Minor improvement to the write-tree documentation git-bisect: call the found commit "*the* first bad commit"
Lars Hjemli
git-log: allow --decorate[=short|full] Commit de435ac0 changed the behavior of --decorate from printing the full ref (e.g., "refs/heads/master") to a shorter, more human-readable version (e.g., just "master"). While this is nice for human readers, external tools using the output from "git log" may prefer the full version. This patch introduces an extension to --decorate to allow the caller to specify either the short or the full versi…
David Kågedal
Minor improvement to the write-tree documentation Signed-off-by: David Kågedal <davidk@lysator.liu.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Nanako Shiraishi
git-bisect: call the found commit "*the* first bad commit" Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'js/maint-cover-letter-non-ascii' into maint * js/maint-cover-letter-non-ascii: Correctly mark cover letters' encodings if they are not pure ASCII Expose the has_non_ascii() function
Junio C Hamano
Merge branch 'jc/maint-clean-nested-dir-safety' into maint * jc/maint-clean-nested-dir-safety: clean: require double -f options to nuke nested git repository and work tree
Junio C Hamano
Merge branch 'jk/maint-merge-msg-fix' into maint * jk/maint-merge-msg-fix: merge: indicate remote tracking branches in merge message merge: fix incorrect merge message for ambiguous tag/branch add tests for merge message headings
  1. Prev
  2. Next