summaryrefslogtreecommitdiff
path: root/sha1_name.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rr/die-on-missing-upstream'Junio C Hamano2013-06-111-7/+17
|\
| * sha1_name: fix error message for @{<N>}, @{<date>}Ramkumar Ramachandra2013-06-021-1/+10
| * sha1_name: fix error message for @{u}Ramkumar Ramachandra2013-05-221-6/+7
* | strbuf_branchname(): do not double-expand @{-1}~22Junio C Hamano2013-05-161-2/+6
|/
* Merge branch 'jc/sha1-name-object-peeler'Junio C Hamano2013-04-031-1/+5
|\
| * peel_onion(): teach $foo^{object} peelerJunio C Hamano2013-03-311-1/+3
| * peel_onion: disambiguate to favor tree-ish when we know we want a tree-ishJunio C Hamano2013-03-311-0/+2
* | Merge branch 'jc/reflog-reverse-walk'Junio C Hamano2013-03-261-30/+18
|\ \ | |/ |/|
| * reflog: add for_each_reflog_ent_reverse() APIJunio C Hamano2013-03-081-30/+18
* | sha1_name: pass object name length to diagnose_invalid_sha1_path()René Scharfe2013-03-171-18/+14
|/
* Merge branch 'jc/sha1-name-more'Junio C Hamano2012-07-221-128/+366
|\
| * rev-parse --disambiguate=<prefix>Junio C Hamano2012-07-091-9/+50
| * sha1_name.c: add support for disambiguating other typesJunio C Hamano2012-07-091-1/+65
| * sha1_name.c: introduce get_sha1_committish()Junio C Hamano2012-07-091-2/+19
| * sha1_name.c: teach lookup context to get_sha1_with_context()Junio C Hamano2012-07-091-9/+13
| * sha1_name.c: many short names can only be committishJunio C Hamano2012-07-091-4/+28
| * sha1_name.c: get_sha1_1() takes lookup flagsJunio C Hamano2012-07-091-8/+8
| * sha1_name.c: get_describe_name() by definition groks only commitsJunio C Hamano2012-07-091-1/+2
| * sha1_name.c: teach get_short_sha1() a commit-only optionJunio C Hamano2012-07-031-0/+9
| * sha1_name.c: allow get_short_sha1() to take other flagsJunio C Hamano2012-07-031-3/+4
| * get_sha1(): fix error status regressionJunio C Hamano2012-07-031-1/+1
| * sha1_name.c: restructure disambiguation of short namesJunio C Hamano2012-07-031-60/+112
| * sha1_name.c: correct misnamed "canonical" and "res"Junio C Hamano2012-07-031-22/+22
| * sha1_name.c: refactor find_short_packed_object()Junio C Hamano2012-07-031-47/+56
| * sha1_name.c: rename "now" to "current"Junio C Hamano2012-07-031-8/+8
| * sha1_name.c: clarify what "fake" is for in find_short_object_filename()Junio C Hamano2012-07-031-0/+7
| * sha1_name.c: get rid of get_sha1_with_mode()Junio C Hamano2012-07-031-8/+0
| * sha1_name.c: get rid of get_sha1_with_mode_1()Junio C Hamano2012-07-031-4/+16
| * sha1_name.c: hide get_sha1_with_context_1() uglinessJunio C Hamano2012-07-021-13/+18
| * sha1_name.c: indentation fixJunio C Hamano2012-06-181-2/+2
* | Merge branch 'mm/verify-filename-fix'Junio C Hamano2012-06-281-1/+1
|\ \
| * | sha1_name: do not trigger detailed diagnosis for file argumentsMatthieu Moy2012-06-181-1/+1
| |/
* | i18n: mark @{upstream} error messages for translationZbigniew Jędrzejewski-Szmek2012-04-151-4/+4
* | Be more specific if upstream branch is not trackedZbigniew Jędrzejewski-Szmek2012-04-151-1/+6
* | Provide better message for barnhc_wiht_tpyo@{u}Zbigniew Jędrzejewski-Szmek2012-04-151-1/+4
* | Provide branch name in error message when using @{u}Zbigniew Jędrzejewski-Szmek2012-04-151-4/+8
|/
* Merge branch 'jc/broken-ref-dwim-fix'Junio C Hamano2011-10-211-85/+0
|\
| * refs.c: move dwim_ref()/dwim_log() from sha1_name.cJunio C Hamano2011-10-121-85/+0
* | Merge branch 'mh/check-ref-format-3'Junio C Hamano2011-10-101-2/+2
|\ \ | |/
| * Change check_ref_format() to take a flags argumentMichael Haggerty2011-10-051-2/+2
* | Allow git merge ":/<pattern>"jc/want-commitJunio C Hamano2011-09-151-6/+0
|/
* Merge branch 'jc/magic-pathspec'Junio C Hamano2011-05-231-8/+9
|\
| * fix overslow :/no-such-string-ever-existed diagnosticsJunio C Hamano2011-05-101-8/+9
| * fix overstrict :<path> diagnosisJunio C Hamano2011-05-101-1/+1
* | sha1_name: Suggest commit:./file for path in subdirMichael J Gruber2011-04-031-4/+7
|/
* Revert "core.abbrevguard: Ensure short object names stay unique a bit longer"Junio C Hamano2011-03-101-3/+1
* Merge branch 'tf/commit-list-prefix'Junio C Hamano2010-12-221-1/+1
|\
| * commit: Add commit_list prefix in two function names.Thiago Farina2010-11-291-1/+1
* | Merge branch 'nd/oneline-sha1-name-from-specific-ref'Junio C Hamano2010-12-211-28/+55
|\ \
| * | get_sha1: handle special case $commit^{/}Nguyễn Thái Ngọc Duy2010-12-161-0/+7
View Lorry Controller Status