Commits

Show all
Author Commit Message Labels Comments Date
Tay Ray Chuan
http-push: add back underscore separator before lock token 817d14a (http-push: refactor request url creation, 2009-01-31) removed the underscore separator between the object path and the appended lock token. This patch adds it back. This would be keeping in line with the aforementioned patch's objective of refactoring, without changing the behaviour and effect, of the code. This would also be useful for testing if the lock token has been indeed appende…
William Pursell
User-manual: "git stash <comment>" form is long gone These days you must explicitly say "git stash save <comment>". Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
guanqun
add test-dump-cache-tree in Makefile 5c5ba73 (Makefile: Use generic rule to build test programs, 2007-05-31) tried to use generic rule to build test programs, but it misses the file 'dump-cache-tree.c', since its name is not prefixed by 'test-'. This commit solves this little problem by renaming this file instead of carrying out an explicit rule in Makefile. Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Ha…
guanqun
fix typo in Documentation Signed-off-by: Guanqun Lu <guanqun.lu@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
bash: offer to show (un)staged changes Add a bit of code to __git_ps1 that lets it append '*' to the branch name if there are any unstaged changes, and '+' if there are any staged changes. Since this is a rather expensive operation and will force a lot of data into the cache whenever you first enter a repository, you have to enable it manually by setting GIT_PS1_SHOWDIRTYSTATE to a nonempty value. The configuration variable bash.show…
Johannes Schindelin
apply: fix access to an uninitialized mode variable, found by valgrind When 'tpatch' was initialized successfully, st_mode was already taken from the previous diff. We should not try to override it with data from an lstat() that was never called. This is a companion patch to 7a07841(git-apply: handle a patch that touches the same path more than once better). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobo…
Eric Kidd
filter-branch: Fix fatal error on bare repositories When git filter-branch is run on a bare repository, it prints out a fatal error message: $ git filter-branch branch Rewrite 476c4839280c219c2317376b661d9d95c1727fc3 (9/9) WARNING: Ref 'refs/heads/branch' is unchanged fatal: This operation must be run in a work tree Note that this fatal error message doesn't prevent git filter-branch from exiting successfully. (Why doesn't git filter-bran…
Junio C Hamano
tests: fix test_commit() for case insensitive filesystems Brian Gernhardt noticed that t3411 was broken recently on case insensitive filesystems. 0088496 (test-lib.sh: introduce test_commit() and test_merge() helpers, 2009-01-27) used a tag and a file with the same name, only different in case, and converted many existing tests that needed only a file (or a tag). Some tests may want to refer to a rev or a file, but on a filesystem that loses cases, ref…
Jay Soffian
builtin-remote: make rm() use properly named variable to hold return value "i" is a loop counter and should not be used to hold a return value; use "result" instead which is consistent with the rest of builtin-remote.c. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
t3412: further simplify setting of GIT_EDITOR 2182896 (t3412: clean up GIT_EDITOR usage, 2009-01-30) tried to clean up the script's use of GIT_EDITOR, but it can further be simplified, because that is how test-lib.sh sets things up already. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
receive-pack: explain what to do when push updates the current branch This makes "git push" issue a more detailed instruction when a user pushes into the current branch of a non-bare repository without having an explicit configuration set to receive.denycurrentbranch. In such a case, it will also tell the user that the default will change to refusal in a future version of git. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'maint' * maint: grep: pass -I (ignore binary) down to external grep
Junio C Hamano
Merge branch 'maint-1.6.0' into maint * maint-1.6.0: grep: pass -I (ignore binary) down to external grep
Junio C Hamano
Merge branch 'jc/maint-add-u-remove-conflicted' * jc/maint-add-u-remove-conflicted: add -u: do not fail to resolve a path as deleted
Junio C Hamano
Merge branch 'jk/maint-cleanup-after-exec-failure' * jk/maint-cleanup-after-exec-failure: git: use run_command() to execute dashed externals run_command(): help callers distinguish errors run_command(): handle missing command errors more gracefully git: s/run_command/run_builtin/
Junio C Hamano
http-push.c: get_remote_object_url() is only used under USE_CURL_MULTI Otherwise -Wunused-function (which is implied by -Wall) triggers. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
grep: pass -I (ignore binary) down to external grep We forgot to pass this option to the external grep process. Signed-off-by: Junio C Hamano <gitster@pobox.com>
William Pursell
In add --patch, Handle K,k,J,j slightly more gracefully. Instead of printing the help menu, this will print "No next hunk" and then process the given hunk again. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
William Pursell
Add / command in add --patch This command allows the user to skip hunks that don't match the specified regex. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
William Pursell
git-add -i/-p: Change prompt separater from slash to comma Otherwise the find command '/' soon to be introduced will be hard to see. Signed-off-by: William Pursell <bill.pursell@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Thomas Rast
t3412: use log|name-rev instead of log --graph Replace all 'git log --graph' calls for history verification with the combination of 'git log ...| git name-rev' first introduced by a6c7a27 (rebase -i: correctly remember --root flag across --continue, 2009-01-26). This should be less susceptible to format changes than the --graph code. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jakub Narębski
gitweb: Update README that gitweb works better with PATH_INFO One had to configure gitweb for it to find static files (stylesheets, images) when using path_info URLs. Now that it is not necessary thanks to adding BASE element to HTML head if needed, update README to reflect this fact. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Kirill Smelkov
mailinfo: cleanup extra spaces for complex 'From:' currently for cases like From: A U Thor <a.u.thor@example.com> (Comment) mailinfo extracts the following 'Author:' field: Author: A U Thor (Comment) ^^ which has two extra spaces left in there after removed email part. I think this is wrong so here is a fix. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Junio C Hamano <gitster@pobox.com…
Junio C Hamano
Merge branch 'ks/maint-mailinfo-folded' * ks/maint-mailinfo-folded: mailinfo: tests for RFC2047 examples mailinfo: add explicit test for mails like '<a.u.thor@example.com> (A U Thor)' mailinfo: 'From:' header should be unfold as well mailinfo: correctly handle multiline 'Subject:' header
Junio C Hamano
Merge branch 'jc/maint-apply-fix' * jc/maint-apply-fix: builtin-apply.c: do not set bogus mode in check_preimage() for deleted path
Junio C Hamano
Merge branch 'am/maint-push-doc' * am/maint-push-doc: Documentation: rework src/dst description in git push Documentation: more git push examples Documentation: simplify refspec format description
Junio C Hamano
Merge branch 'jc/maint-allow-uninteresting-missing' * jc/maint-allow-uninteresting-missing: revision traversal: allow UNINTERESTING objects to be missing
Junio C Hamano
Merge branch 'jg/tag-contains' * jg/tag-contains: git-tag: Add --contains option Make has_commit() non-static Make opt_parse_with_commit() non-static
Junio C Hamano
Merge branch 'js/maint-rebase-i-submodule' * js/maint-rebase-i-submodule: Fix submodule squashing into unrelated commit rebase -i squashes submodule changes into unrelated commit
Junio C Hamano
Merge branch 'jc/maint-split-diff-metainfo' * jc/maint-split-diff-metainfo: diff.c: output correct index lines for a split diff
  1. Prev
  2. Next