diff options
author | Junio C Hamano <junkio@cox.net> | 2007-02-27 13:27:26 +0300 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-02-27 13:27:26 +0300 |
commit | 88459358cdd70246e805b0ee7db7fffb9564f80e (patch) | |
tree | 2bbb9cc6508fb5eb33e0d2fe1f70c5ada0bb7334 /git-fetch.sh | |
parent | fee7c2c71d9e35b2f54aa3631072bd7f73bb7b4c (diff) | |
parent | 0ab179504a17907c395a4009f7c23d2f71bba1d3 (diff) |
Merge branch 'np/types' into jc/fetch
* np/types: (253 commits)
get rid of lookup_object_type()
convert object type handling from a string to a number
formalize typename(), and add its reverse type_from_string()
sha1_file.c: don't ignore an error condition in sha1_loose_object_info()
sha1_file.c: cleanup "offset" usage
sha1_file.c: cleanup hdr usage
git-apply: do not fix whitespaces on context lines.
diff --cc: integer overflow given a 2GB-or-larger file
mailinfo: do not get confused with logical lines that are too long.
Documentation: link in 1.5.0.2 material to the top documentation page.
Documentation: document remote.<name>.tagopt
GIT 1.5.0.2
git-remote: support remotes with a dot in the name
Documentation: describe "-f/-t/-m" options to "git-remote add"
diff --cc: fix display of symlink conflicts during a merge.
merge-recursive: fix longstanding bug in merging symlinks
merge-index: fix longstanding bug in merging symlinks
diff --cached: give more sensible error message when HEAD is yet to be created.
Update tests to use test-chmtime
Add test-chmtime: a utility to change mtime on files
...
Diffstat (limited to 'git-fetch.sh')
-rwxr-xr-x | git-fetch.sh | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/git-fetch.sh b/git-fetch.sh index f875e0f99e..f438ac1ef2 100755 --- a/git-fetch.sh +++ b/git-fetch.sh @@ -129,6 +129,15 @@ then orig_head=$(git-rev-parse --verify HEAD 2>/dev/null) fi +# Allow --notags from remote.$1.tagopt +case "$tags$no_tags" in +'') + case "$(git-config --get "remote.$1.tagopt")" in + --no-tags) + no_tags=t ;; + esac +esac + # If --tags (and later --heads or --all) is specified, then we are # not talking about defaults stored in Pull: line of remotes or # branches file, and just fetch those and refspecs explicitly given. |