Commits

Author Commit Message Labels Comments Date
knittl
bash: Match lightweight tags in prompt The bash prompt would display a commit's object name when having checked out a lightweight tag. Provide `--tags` to `git describe` in the completion script, so it will display lightweight tag names, as it already does for annotated tags. Signed-off-by: Daniel Knittl-Frank <knittl89+git@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jari Aalto
git-commit.txt: (synopsis): move -i and -o before "--" All options, including -i and -o, must come before "--" which is the end of options marker. Reported-by: Joey Hess <joey@kitenet.net> Signed-off-by: Jari Aalto <jari.aalto@cante.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Martin von Zweigbergk
rebase: only show stat if configured to true If rebase.stat is set to true, a diffstat should be displayed. If it is not set, it should default to false. However, if it is explicitly set to false (or other value), a diffstat is still displayed, which is probably not what most users would expect. Show diffstat only if it is set to true. Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> Signed-off-by: Junio C Hamano <gits…
Nguyễn Thái Ngọc Duy
entry.c: remove "checkout-index" from error messages Back then when entry.c was part of checkout-index (or checkout-cache at that time [1]). It makes sense to print the command name in error messages. Nowadays entry.c is in libgit and can be used by any commands, printing "git checkout-index: blah" does no more than confusion. The error messages without it still give enough information. [1] 12dccc1 (Make fiel checkout function available to the git …
Tay Ray Chuan
http-fetch: rework url handling Do away with a second url variable, rewritten_url, and make url non-const. This is safe because the functions called with url (ie. get_http_walker() and walker_fetch()) do not modify it (ie. marked with const char *). Also, replace code that adds a trailing slash with a call to str_end_url_with_slash(). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox…
Tay Ray Chuan
http-push: add trailing slash at arg-parse time, instead of later on That way, we don't have to update repo->path and repo->path_len again after adding the trailing slash. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
http-push: check path length before using it We use path_len to skip the base url/path, but we do not know for sure if path does indeed contain the base url/path. Check if this is so. Helped-by: Johnathan Nieder <jrnieder@gmail.com> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
http-push: Normalise directory names when pushing to some WebDAV servers Fix a bug when pushing to WebDAV servers which do not use a trailing slash for collection names. The previous implementation fails to see that the requested resource "refs/" is the same resource as "refs" and loads every reference twice (once for refs/ and once for refs). This implementation normalises every collection name by appending a trailing slash if necessary. This can be tested with old …
Tay Ray Chuan
http-backend: use end_url_with_slash() Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
url: add str wrapper for end_url_with_slash() Helped-by: Johnathan Nieder <jrnieder@gmail.com> Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
shift end_url_with_slash() from http.[ch] to url.[ch] This allows non-http/curl users to access it too (eg. http-backend.c). Update include headers in end_url_with_slash() users too. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
t5550-http-fetch: add test for http-fetch Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tay Ray Chuan
t5550-http-fetch: add missing '&&' Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano
Merge branch 'jl/maint-pull-tags-doc' into maint * jl/maint-pull-tags-doc: pull: Remove --tags option from manpage
Junio C Hamano
Merge branch 'kb/maint-diff-ws-check' into maint * kb/maint-diff-ws-check: diff: handle lines containing only whitespace and tabs better test-lib: extend test_decode_color to handle more color codes
Junio C Hamano
Merge branch 'jm/mailmap' into maint * jm/mailmap: t4203: do not let "git shortlog" DWIM based on tty t4203 (mailmap): stop hardcoding commit ids and dates mailmap: fix use of freed memory
Junio C Hamano
Merge branch 'tr/maint-git-repack-tmpfile' into maint * tr/maint-git-repack-tmpfile: repack: place temporary packs under .git/objects/pack/
Junio C Hamano
Merge branch 'jk/maint-apply-no-binary' into maint * jk/maint-apply-no-binary: apply: don't segfault on binary files with missing data
Junio C Hamano
Merge branch 'jn/send-pack-error' into maint * jn/send-pack-error: send-pack: avoid redundant "pack-objects died with strange error"
Junio C Hamano
Merge branch 'ak/submodule-sync' into maint * ak/submodule-sync: submodule sync: Update "submodule.<name>.url" for empty directories
Junio C Hamano
Merge branch 'jk/maint-rev-list-nul' into maint * jk/maint-rev-list-nul: rev-list: handle %x00 NUL in user format
Junio C Hamano
Merge branch 'cb/diff-fname-optim' into maint * cb/diff-fname-optim: diff: avoid repeated scanning while looking for funcname do not search functions for patch ID add rebase patch id tests
Junio C Hamano
Merge branch 'jk/no-textconv-symlink' into maint * jk/no-textconv-symlink: diff: don't use pathname-based diff drivers for symlinks
Junio C Hamano
Merge branch 'dk/maint-blame-el' into maint * dk/maint-blame-el: git-blame.el: Add (require 'format-spec)
Junio C Hamano
Merge branch 'aw/git-p4-deletion' into maint * aw/git-p4-deletion: Fix handling of git-p4 on deleted files
Junio C Hamano
Merge branch 'kf/post-receive-sample-hook' into maint * kf/post-receive-sample-hook: post-receive-email: ensure sent messages are not empty
Junio C Hamano
Merge branch 'jk/repack-reuse-object' into maint * jk/repack-reuse-object: Documentation: pack.compression: explain how to recompress repack: add -F flag to let user choose between --no-reuse-delta/object Conflicts: Documentation/git-repack.txt
Junio C Hamano
Merge branch 'bc/fix-cherry-pick-root' into maint * bc/fix-cherry-pick-root: builtin/revert.c: don't dereference a NULL pointer
Junio C Hamano
Merge branch 'uk/fix-author-ident-sed-script' into maint * uk/fix-author-ident-sed-script: get_author_ident_from_commit(): remove useless quoting
Junio C Hamano
Merge branch 'ab/makefile-track-cc' into maint * ab/makefile-track-cc: Makefile: add CC to TRACK_CFLAGS
  1. Prev
  2. Next