Show all
Author Commit Message Labels Comments Date
Jens Lehmann
submodule: update and add must honor --quiet flag When using the --quiet flag "git submodule update" and "git submodule add" didn't behave as the documentation stated. They printed progress output from the clone, even though they should only print error messages. Fix that by passing the -q flag to git clone in module_clone() when the GIT_QUIET variable is set. Two tests in t7400 have been modified to test that behavior. Reported-by: Daniel Holt…
Jon Seymour
Ensure git ls-tree exits with a non-zero exit code if read_tree_recursive fails. In the case of a corrupt repository, git ls-tree may report an error but presently it exits with a code of 0. This change uses the return code of read_tree_recursive instead. Improved-by: Jens Lehmann <> Signed-off-by: Jon Seymour <> Signed-off-by: Junio C Hamano <>
Jens Lehmann
tests: print failed test numbers at the end of the test run On modern multi-core processors "make test" is often run in multiple jobs. If one of them fails the test run does stop, but the concurrently running tests finish their run. It is rather easy to find out which test failed by doing a "ls -d t/trash*". But that only works when you don't use the "-i" option to "make test" because you want to get an overview of all failing tests. In that case all thras…
Jon Seymour
Add a test to check that git ls-tree sets non-zero exit code on error. Expected to fail at this commit, fixed by subsequent commit. Additional tests of adhoc or uncategorised nature should be added to this file. Improved-by: Jens Lehmann <> Improved-by: Junio C Hamano <> Signed-off-by: Jon Seymour <> Signed-off-by: Junio C Hamano <>
Dmitry Ivankov
doc/fast-import: clarify notemodify command The "notemodify" fast-import command was introduced in commit a8dd2e7 (fast-import: Add support for importing commit notes, 2009-10-09) The commit log has slightly different description than the added documentation. The latter is somewhat confusing. "notemodify" is a subcommand of "commit" command used to add a note for some commit. Does this note annotate the commit produced by the "commit" comma…
Documentation: minor grammatical fix in rev-list-options.txt Signed-off-by: Jack Nagel <> Signed-off-by: Junio C Hamano <>
Peter Collingbourne
Documentation: git-filter-branch honors replacement refs Make it clear that git-filter-branch will honor and make permanent replacement refs as well as grafts. Signed-off-by: Peter Collingbourne <> Signed-off-by: Junio C Hamano <>
Julian Phillips
remote-curl: Add a format check to parsing of info/refs When parsing info/refs, no checks were applied that the file was in the requried format. Since the file is read from a remote webserver, this isn't guarenteed to be true. Add a check that the file at least only contains lines that consist of 40 characters followed by a tab and then the ref name. Signed-off-by: Julian Phillips <> Signed-off-by: Junio C Hamano <gitster@pob…
Pavan Kumar Sunkara
git-config: Remove extra whitespaces Remove extra whitespaces introduced by commits 01ebb9dc and fc1905bb Signed-off-by: Pavan Kumar Sunkara <> Signed-off-by: Junio C Hamano <>
Martin von Zweigbergk
rebase: clarify "restore the original branch" The description for 'git rebase --abort' currently says: Restore the original branch and abort the rebase operation. The "restore" can be misinterpreted to imply that the original branch was somehow in a broken state during the rebase operation. It is also not completely clear what "the original branch" is --- is it the branch that was checked out before the rebase operation was called or is…
Junio C Hamano
reset [<commit>] paths...: do not mishandle unmerged paths Because "diff --cached HEAD" showed an incorrect blob object name on the LHS of the diff, we ended up updating the index entry with bogus value, not what we read from the tree. Noticed by John Nowak. Signed-off-by: Junio C Hamano <>
Bert Wesarg
Documentation: clearly specify what refs are honored by core.logAllRefUpdates The documentation for logging updates in git-update-ref, doesn't make it clear that only a specific subset of refs are honored by this variable. Signed-off-by: Bert Wesarg <> Signed-off-by: Junio C Hamano <>
Johannes Schindelin
get_pwd_cwd(): Do not trust st_dev/st_ino blindly 10c4c88 (Allow add_path() to add non-existent directories to the path, 2008-07-21) introduced get_pwd_cwd() function in order to favor $PWD when getenv("PWD") and getcwd() refer to the same directory but are different strings (e.g. the former gives a nicer looking name via a symbolic link to an uglier looking automounted path). The function tried to determine if two directories are the same by run…
help_unknown_cmd: do not propose an "unknown" cmd When executing an external shell script like `git foo` with a bad shebang, e.g. "#!/usr/bin/not/existing", execvp returns 127 (ENOENT). Since help_unknown_cmd proposes the use of all external commands similar to the name of the "unknown" command, it suggests the just failed command again. Stop it and give some advice to the user. Helped-by: Jeff King <> Signed-off-by: Michael Schube…
Junio C Hamano
Merge commit 'v1.7.6' into jc/checkout-reflog-fix * commit 'v1.7.6': (3211 commits) Git 1.7.6 completion: replace core.abbrevguard to core.abbrev Git 1.7.6-rc3 Documentation: git diff --check respects core.whitespace gitweb: 'pickaxe' and 'grep' features requires 'search' to be enabled t7810: avoid unportable use of "echo" plug a few coverity-spotted leaks builtin/gc.c: add missing newline in message tests: link shell libraries …
Junio C Hamano
Merge commit 'v1.7.0' into jc/checkout-reflog-fix * commit 'v1.7.0': (4188 commits) Git 1.7.0 Fix typo in release notes Re-fix check-ref-format documentation mark-up archive documentation: attributes are taken from the tree by default Documentation: minor fixes to RelNotes-1.7.0 bash: support 'git am's new '--continue' option filter-branch: Fix error message for --prune-empty --commit-filter am: switch --resolved to --cont…
Junio C Hamano
Merge commit 'v1.6.0' into jc/checkout-reflog-fix * commit 'v1.6.0': (2063 commits) GIT 1.6.0 git-p4: chdir now properly sets PWD environment variable in msysGit Improve error output of git-rebase t9300: replace '!' with test_must_fail Make File::Spec and File::Temp requirement lazy Documentation: document the pager.* configuration setting git-stash: improve synopsis in help and manual page Makefile: building git in cygwin…
Junio C Hamano
checkout: do not write bogus reflog entry out As resolve_ref() returns a static buffer that is local to the function, the caller needs to be sure that it will not have any other calls to the function before it uses the returned value, or store it away with a strdup(). The code used old.path to record which branch it used to be on, so that it can say between which branches the switch took place in the reflog, but sometimes it failed to do so.…
Martin von Zweigbergk
Documentation: use [verse] for SYNOPSIS sections The SYNOPSIS sections of most commands that span several lines already use [verse] to retain line breaks. Most commands that don't span several lines seem not to use [verse]. In the HTML output, [verse] does not only preserve line breaks, but also makes the section indented, which causes a slight inconsistency between commands that use [verse] and those that don't. Use [verse] in all SYNOPSIS sect…
Jeff King
docs: document --textconv diff option This has been there since textconv existed, but was never documented. There is some overlap with what's in gitattributes(5), but it's important to warn in both places that textconv diffs probably can't be applied. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Jakub Narębski
gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss Enhance usability of 'blob_plain' view protection against XSS attacks (enabled by setting $prevent_xss to true) by serving contents inline as safe 'text/plain' mimetype where possible, instead of serving with "Content-Disposition: attachment" to make sure they don't run in gitweb's security domain. This patch broadens downgrading to 'text/plain' further, to any */*+xml mimetype. This includes: …
Jakub Narębski
gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss One of mechanism enabled by setting $prevent_xss to true is 'blob_plain' view protection. With XSS prevention on, blobs of all types except a few known safe ones are served with "Content-Disposition: attachment" to make sure they don't run in our security domain. Instead of serving text/* type files, except text/plain (and including text/html), as attachements, downgrade it to text/plain. This …
Brandon Casey preserve stdin for the command spawned by foreach The user-supplied command spawned by 'submodule foreach' loses its connection to the original standard input. Instead, it is connected to the output of a pipe within the git-submodule script. The user-supplied command supplied to 'submodule foreach' is spawned within a while loop which is being piped into. Due to the way shells implement piping output to a while loop, a subshell is created with…
Brandon Casey
t/t7407: demonstrate that the command called by 'submodule foreach' loses stdin The user-supplied command spawned by 'submodule foreach' loses its connection to the original standard input. Instead, it is connected to the output of a pipe within the git-submodule script. This can cause a problem if the command requires reading from stdin or if it changes its behavior based on whether stdin is a tty or not (e.g. git shortlog). Demonstrate this flaw. Signed-off-by: Brandon …
Junio C Hamano
Merge git:// into maint * git:// git-svn: Correctly handle root commits in mergeinfo ranges git-svn: Disambiguate rev-list arguments to improve error message git-svn: Demonstrate a bug with root commits in mergeinfo ranges
Junio C Hamano
Merge branch 'maint-1.7.5' into maint * maint-1.7.5: test: skip clean-up when running under --immediate mode "branch -d" can remove more than one branches
Junio C Hamano
test: skip clean-up when running under --immediate mode Some tests try to be too careful about cleaning themselves up and do test_expect_success description ' set-up some test refs and/or configuration && test_when_finished "revert the above changes" && the real test ' Which is nice to make sure that a potential failure would not have unexpected interaction with the next test. This however interferes when "the real test" fail…
Junio C Hamano
"branch -d" can remove more than one branches Since 03feddd (git-check-ref-format: reject funny ref names, 2005-10-13), "git branch -d" can take more than one branch names to remove. The documentation was correct, but the usage string was not. Signed-off-by: Junio C Hamano <>
Michael Haggerty
git-svn: Correctly handle root commits in mergeinfo ranges If the bottom of a mergeinfo range is a commit that maps to a git root commit, then it doesn't have a parent. In such a case, use git commit range "$top_commit" rather than "$bottom_commit^..$top_commit". [ew: line-wrap at 80 columns] Signed-off-by: Michael Haggerty <> Acked-by: Eric Wong <>
Michael Haggerty
git-svn: Disambiguate rev-list arguments to improve error message Add "--" in the "git rev-list" command line so that if there is a bug and the revisions cannot be found, the error message is a bit less cryptic. Signed-off-by: Michael Haggerty <> Acked-by: Eric Wong <>
  1. Prev
  2. Next