aboutsummaryrefslogtreecommitdiffstats
path: root/wt-status.c
AgeCommit message (Expand)AuthorFilesLines
2017-05-08split_commit_in_progress(): simplify & fix memory leakJohannes Schindelin1-14/+14
2017-05-08status: close file descriptor after reading git-rebase-todoJohannes Schindelin1-0/+1
2017-05-06dir: convert fill_directory to take an indexBrandon Williams1-1/+1
2017-04-28status: fix missing newline when comment chars are disabledJeff King1-1/+1
2017-04-27timestamp_t: a new data type for timestampsJohannes Schindelin1-1/+1
2017-03-29short status: improve reporting for submodule changesStefan Beller1-2/+15
2017-03-21Merge branch 'sb/wt-status-cleanup'Junio C Hamano1-15/+5
2017-03-17Merge branch 'mg/status-porcelain-no-i18n'Junio C Hamano1-4/+4
2017-03-17wt-status: simplify by using for_each_string_list_itemStefan Beller1-15/+5
2017-03-14git-status: make porcelain more robustMichael J Gruber1-4/+4
2017-02-22wt-status: convert to struct object_idbrian m. carlson1-22/+22
2017-02-22refs: convert each_reflog_ent_fn to struct object_idbrian m. carlson1-3/+3
2017-02-22Convert remaining callers of resolve_refdup to object_idbrian m. carlson1-2/+2
2017-02-03Merge branch 'rs/object-id'Junio C Hamano1-2/+2
2017-02-02Merge branch 'js/status-pre-rebase-i'Junio C Hamano1-4/+10
2017-01-30use oidcpy() for copying hashes between instances of struct object_idRené Scharfe1-2/+2
2017-01-26status: be prepared for not-yet-started interactive rebaseJohannes Schindelin1-4/+10
2016-12-07wt-status: implement opportunisitc index update correctlyJunio C Hamano1-3/+4
2016-10-27Merge branch 'nd/ita-empty-commit'Junio C Hamano1-1/+6
2016-10-26Merge branch 'js/libify-require-clean-work-tree'Junio C Hamano1-0/+78
2016-10-24diff-lib: allow ita entries treated as "not yet exist in index"Nguyễn Thái Ngọc Duy1-1/+6
2016-10-17Merge branch 'rs/cocci'Junio C Hamano1-6/+4
2016-10-10use strbuf_add_unique_abbrev() for adding short hashes, part 3René Scharfe1-6/+4
2016-10-07wt-status: begin error messages with lower-caseJohannes Schindelin1-3/+3
2016-10-07wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin1-7/+9
2016-10-07wt-status: export also the has_un{staged,committed}_changes() functionsJohannes Schindelin1-2/+2
2016-10-07wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin1-0/+76
2016-10-06Merge branch 'rs/cocci'Junio C Hamano1-2/+1
2016-09-27use strbuf_add_unique_abbrev() for adding short hashes, part 2René Scharfe1-2/+1
2016-09-26Merge branch 'rs/cocci'Junio C Hamano1-3/+3
2016-09-19Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2016-09-15use strbuf_addstr() for adding constant strings to a strbuf, part 2René Scharfe1-3/+3
2016-09-08Merge branch 'jh/status-v2-porcelain'Junio C Hamano1-59/+511
2016-08-11status: print branch info with --porcelain=v2 --branchJeff Hostetler1-0/+90
2016-08-11status: print per-file porcelain v2 status dataJeff Hostetler1-1/+284
2016-08-11status: collect per-file data for --porcelain=v2Jeff Hostetler1-2/+62
2016-08-10Merge branch 'js/am-3-merge-recursive-direct'Junio C Hamano1-2/+2
2016-08-05status: cleanup API to wt_status_printJeff Hostetler1-3/+22
2016-08-05status: rename long-format print routinesJeff Hostetler1-55/+55
2016-08-03Merge branch 'mm/status-suggest-merge-abort'Junio C Hamano1-2/+5
2016-07-26die("bug"): report bugs consistentlyJohannes Schindelin1-2/+2
2016-07-25Merge branch 'rs/use-strbuf-addbuf'Junio C Hamano1-1/+1
2016-07-22status: suggest 'git merge --abort' when appropriateMatthieu Moy1-2/+5
2016-07-19Merge branch 'bc/cocci'Junio C Hamano1-1/+2
2016-07-19use strbuf_addbuf() for appending a strbuf to anotherRené Scharfe1-1/+1
2016-07-13Merge branch 'va/i18n-even-more'Junio C Hamano1-2/+2
2016-06-28diff: convert struct diff_filespec to struct object_idbrian m. carlson1-1/+2
2016-06-17i18n: unmark die messages for translationVasco Almeida1-2/+2
2016-06-09Use "working tree" instead of "working directory" for git statusLars Vogel1-1/+1
2016-05-23Merge branch 'nd/worktree-various-heads'Junio C Hamano1-20/+43
2016-05-23Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano1-0/+1
2016-04-22wt-status.c: split bisect detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy1-9/+14
2016-04-22wt-status.c: make wt_status_check_rebase() work on any worktreeNguyễn Thái Ngọc Duy1-13/+20
2016-04-22wt-status.c: split rebase detection out of wt_status_get_state()Nguyễn Thái Ngọc Duy1-6/+17
2016-04-13Merge branch 'sb/misc-cleanups'Junio C Hamano1-3/+1
2016-04-01abbrev_sha1_in_line: don't leak memoryStefan Beller1-3/+1
2016-03-14Merge branch 'mg/wt-status-mismarked-i18n'Junio C Hamano1-2/+2
2016-03-14wt-status: allow "ahead " to be picked up by l10nMichael J Gruber1-2/+2
2016-02-17wt-status.c: set commitable bit if there is a meaningful merge.Stephen P. Smith1-0/+1
2016-01-15strbuf: introduce strbuf_getline_{lf,nul}()Junio C Hamano1-2/+2
2015-12-10Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2015-11-28wt-status: correct and simplify check for detached HEADRené Scharfe1-5/+4
2015-11-20Remove get_object_hash.brian m. carlson1-1/+1
2015-11-20Add several uses of get_object_hash.brian m. carlson1-1/+1
2015-11-05Merge branch 'rs/wt-status-detached-branch-fix' into maintJunio C Hamano1-35/+29
2015-11-03Merge branch 'rs/wt-status-detached-branch-fix'Junio C Hamano1-35/+29
2015-11-01wt-status: use skip_prefix() to get rid of magic string length constantsRené Scharfe1-21/+15
2015-11-01wt-status: don't skip a magical number of characters blindlyRené Scharfe1-1/+1
2015-11-01wt-status: avoid building bogus branch name with detached HEADRené Scharfe1-6/+9
2015-11-01wt-status: exit early using goto in wt_shortstatus_print_tracking()René Scharfe1-8/+5
2015-10-16Merge branch 'mm/detach-at-HEAD-reflog' into maintJunio C Hamano1-0/+6
2015-10-15Merge branch 'mm/detach-at-HEAD-reflog'Junio C Hamano1-0/+6
2015-10-02status: don't say 'HEAD detached at HEAD'Matthieu Moy1-0/+6
2015-09-03Merge branch 'sg/wt-status-header-inclusion' into maintJunio C Hamano1-1/+0
2015-08-26Merge branch 'sg/wt-status-header-inclusion'Junio C Hamano1-1/+0
2015-08-21wt-status: move #include "pathspec.h" to the headerSZEDER Gábor1-1/+0
2015-08-10memoize common git-path "constant" filesJeff King1-4/+4
2015-08-03Merge branch 'gp/status-rebase-i-info'Junio C Hamano1-17/+134
2015-08-03Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano1-4/+5
2015-07-06status: give more information during rebase -iGuillaume Pagès1-0/+114
2015-06-30status: differentiate interactive from non-interactive rebasesGuillaume Pagès1-1/+4
2015-06-30status: factor two rebase-related messages togetherGuillaume Pagès1-16/+16
2015-06-24Merge branch 'sg/commit-cleanup-scissors'Junio C Hamano1-4/+5
2015-06-09commit: cope with scissors lines in commit messageSZEDER Gábor1-4/+5
2015-06-05Merge branch 'jk/at-push-sha1'Junio C Hamano1-12/+6
2015-05-26Merge branch 'nd/untracked-cache'Junio C Hamano1-0/+2
2015-05-22remote.c: return upstream name from stat_tracking_infoJeff King1-12/+6
2015-04-14Merge branch 'sb/plug-wt-shortstatus-tracking-leak'Junio C Hamano1-0/+1
2015-03-30wt-status.c: fix a memleakStefan Beller1-0/+1
2015-03-25Merge branch 'jk/run-command-capture'Junio C Hamano1-7/+3
2015-03-22wt-status: use capture_commandJeff King1-4/+1
2015-03-22wt_status: fix signedness mismatch in strbuf_read callJeff King1-3/+3
2015-03-22wt-status: don't flush before running "submodule status"Jeff King1-1/+0
2015-03-20Merge branch 'mg/detached-head-report'Junio C Hamano1-3/+3
2015-03-17Merge branch 'mg/status-v-v'Junio C Hamano1-0/+20
2015-03-12status: enable untracked cacheNguyễn Thái Ngọc Duy1-0/+2
2015-03-06wt-status: refactor detached HEAD analysisMichael J Gruber1-3/+3
2015-03-06commit/status: show the index-worktree diff with -v -vMichael J Gruber1-0/+20
2015-02-24Merge branch 'jk/status-read-branch-name-fix' into maintJunio C Hamano1-1/+1
2015-02-17Merge branch 'jk/status-read-branch-name-fix'Junio C Hamano1-1/+1
2015-01-28read_and_strip_branch: fix typo'd address-of operatorJeff King1-1/+1
2014-11-10use args member of struct child_processRené Scharfe1-10/+7
2014-10-24Merge branch 'rs/run-command-env-array'Junio C Hamano1-4/+2
2014-10-19use env_array member of struct child_processRené Scharfe1-4/+2
2014-10-15refs.c: change resolve_ref_unsafe reading argument to be a flags fieldRonnie Sahlberg1-1/+1
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-07-22Merge branch 'kb/perf-trace'Junio C Hamano1-11/+3
2014-07-13wt-status: simplify performance measurement by using getnanotime()Karsten Blees1-11/+3
2014-07-10Merge branch 'rs/status-code-clean-up'Junio C Hamano1-8/+5
2014-06-29wt-status: simplify building of summary limit argumentRené Scharfe1-3/+1
2014-06-29wt-status: use argv_array for environmentRené Scharfe1-5/+4
2014-06-25Merge branch 'jl/status-added-submodule-is-never-ignored' into maintJunio C Hamano1-1/+11
2014-06-16Merge branch 'jl/status-added-submodule-is-never-ignored'Junio C Hamano1-1/+11
2014-06-06Merge branch 'fc/status-printf-squelch-format-zero-length-warnings'Junio C Hamano1-11/+11
2014-05-07silence a bunch of format-zero-length warningsFelipe Contreras1-11/+11
2014-04-07status/commit: show staged submodules regardless of ignore configJens Lehmann1-1/+11
2014-03-31Merge branch 'mm/status-porcelain-format-i18n-fix'Junio C Hamano1-5/+8
2014-03-26status: disable translation when --porcelain is usedMatthieu Moy1-5/+8
2014-03-25Merge branch 'nd/commit-editor-cleanup'Junio C Hamano1-8/+13
2014-03-21Merge branch 'jn/wt-status'Junio C Hamano1-42/+75
2014-03-12wt-status: lift the artificual "at least 20 columns" floorJunio C Hamano1-2/+0
2014-03-12wt-status: i18n of section labelsJonathan Nieder1-19/+47
2014-03-12wt-status: extract the code to compute width for labelsJonathan Nieder1-7/+15
2014-03-12wt-status: make full label string to be subject to l10nJunio C Hamano1-18/+17
2014-02-24pathspec: convert some match_pathspec_depth() to dir_path_match()Nguyễn Thái Ngọc Duy1-2/+2
2014-02-24pathspec: convert some match_pathspec_depth() to ce_path_match()Nguyễn Thái Ngọc Duy1-1/+1
2014-02-18wt-status.c: move cut-line print code out to wt_status_add_cut_lineNguyễn Thái Ngọc Duy1-7/+12
2014-02-18wt-status.c: make cut_line[] const to shrink .data section a bitNguyễn Thái Ngọc Duy1-1/+1
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-8/+8
2013-12-17Merge branch 'jl/commit-v-strip-marker'Junio C Hamano1-2/+27
2013-12-05commit -v: strip diffs and submodule shortlogs from the commit messageJens Lehmann1-2/+27
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-8/+8
2013-11-06wt-status: take the alignment burden off translatorsNguyễn Thái Ngọc Duy1-27/+53
2013-10-11status: show commit sha1 in "You are currently cherry-picking" messageRalf Thielow1-2/+5
2013-09-20Merge branch 'mm/commit-template-squelch-advice-messages'Junio C Hamano1-19/+19
2013-09-20Merge branch 'mm/status-without-comment-char'Junio C Hamano1-22/+69
2013-09-20Merge branch 'jx/branch-vv-always-compare-with-upstream'Junio C Hamano1-4/+22
2013-09-12wt-status: turn advice_status_hints into a field of wt_statusMatthieu Moy1-19/+19
2013-09-09Merge branch 'jl/submodule-mv'Junio C Hamano1-9/+7
2013-09-06status: add missing blank line after list of "other" filesMatthieu Moy1-1/+3
2013-09-06status: disable display of '#' comment prefix by defaultMatthieu Moy1-11/+29
2013-09-06submodule summary: ignore --for-status optionMatthieu Moy1-1/+26
2013-09-06wt-status: use argv_array APIMatthieu Moy1-12/+14
2013-08-26status: always show tracking branch even no changeJiang Xin1-5/+5
2013-08-26branch: report invalid tracking branch as goneJiang Xin1-4/+22
2013-07-22Merge branch 'jx/clean-interactive'Junio C Hamano1-9/+8
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-2/+2
2013-07-15convert {read,fill}_directory to take struct pathspecNguyễn Thái Ngọc Duy1-1/+1
2013-07-15status: convert to use parse_pathspecNguyễn Thái Ngọc Duy1-9/+7
2013-07-11Merge branch 'jg/status-config'Junio C Hamano1-0/+1
2013-07-11Merge branch 'rr/rebase-checkout-reflog'Junio C Hamano1-3/+4
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-2/+2
2013-06-27am: replace uses of --resolved with --continueKevin Bracey1-1/+1
2013-06-26quote_path_relative(): remove redundant parameterJiang Xin1-9/+8
2013-06-24status/commit: make sure --porcelain is not affected by user-facing configJunio C Hamano1-0/+1
2013-06-17wt-status: give better advice when cherry-pick is in progressRalf Thielow1-2/+4
2013-06-17status: do not depend on rebase reflog messagesRamkumar Ramachandra1-1/+4
2013-06-17wt-status: remove unused field in grab_1st_switch_cbdataRamkumar Ramachandra1-2/+0
2013-04-15dir.c: git-status --ignored: don't scan the work tree twiceKarsten Blees1-13/+11
2013-04-15dir.c: git-ls-files --directories: don't hide empty directoriesKarsten Blees1-1/+1
2013-04-12Sync with 'maint'Junio C Hamano1-8/+4
2013-04-12Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano1-8/+4
2013-04-12i18n: make the translation of -u advice in one goJiang Xin1-8/+4
2013-04-02status: show commit sha1 in "You are currently reverting" messageMatthieu Moy1-2/+6
2013-04-02status: show 'revert' state and status hintMatthieu Moy1-0/+23
2013-04-01Merge branch 'tb/document-status-u-tradeoff' into maintJunio C Hamano1-0/+25
2013-04-01Merge branch 'nd/branch-show-rebase-bisect-state'Junio C Hamano1-62/+144
2013-03-23status, branch: fix the misleading "bisecting" messageNguyễn Thái Ngọc Duy1-1/+1
2013-03-21Merge branch 'maint'Junio C Hamano1-1/+4
2013-03-21wt-status: fix possible use of uninitialized variableJeff King1-1/+4
2013-03-21Merge branch 'tb/document-status-u-tradeoff'Junio C Hamano1-0/+25
2013-03-16status: show more info than "currently not on any branch"Nguyễn Thái Ngọc Duy1-4/+85
2013-03-16wt-status: move wt_status_get_state() out to wt_status_print()Nguyễn Thái Ngọc Duy1-19/+20
2013-03-16wt-status: split wt_status_state parsing function outNguyễn Thái Ngọc Duy1-18/+23
2013-03-16wt-status: move strbuf into read_and_strip_branch()Nguyễn Thái Ngọc Duy1-35/+30
2013-03-16status: advise to consider use of -u when read_directory takes too longNguyễn Thái Ngọc Duy1-0/+25
2013-02-14Merge branch 'nd/status-show-in-progress'Junio C Hamano1-6/+88
2013-02-05status: show the branch name if possible in in-progress infoNguyễn Thái Ngọc Duy1-6/+88
2013-02-04Merge branch 'jc/custom-comment-char'Junio C Hamano1-4/+6
2013-01-16Allow custom "comment char"Junio C Hamano1-4/+6
2013-01-14Merge branch 'ap/status-ignored-in-ignored-directory'Junio C Hamano1-1/+3
2013-01-01dir.c: Make git-status --ignored more consistentAntoine Pelisse1-1/+3
2012-09-15wt-status.c: mark a private file-scope symbol as staticJunio C Hamano1-2/+2
2012-09-06status: remove i18n legosNguyễn Thái Ngọc Duy1-20/+28
2012-07-16status: color in-progress message like other header messagesJeff King1-2/+1
2012-06-14status: better advices when splitting a commit (during rebase -i)Lucien Kong1-0/+52
2012-06-14status: don't suggest "git rm" or "git add" if not appropriateLucien Kong1-1/+36
2012-06-14wt-status.*: better advices for git status addedLucien Kong1-0/+156
2012-05-08Merge branch 'jk/maint-status-porcelain-z-b' into HEADJeff King1-17/+18
2012-05-08status: respect "-b" for porcelain formatJeff King1-3/+3
2012-05-08status: fix null termination with "-b"Jeff King1-3/+4
2012-05-08status: refactor null_termination optionJeff King1-13/+13
2012-04-27status: add --columnNguyễn Thái Ngọc Duy1-2/+26
2011-12-13Convert resolve_ref+xstrdup to new resolve_refdup functionNguyễn Thái Ngọc Duy1-3/+1
2011-10-23Merge branch 'maint-1.7.3' into maintJunio C Hamano1-1/+1
2011-10-23Reindent closing bracket using tab instead of spacesNguyễn Thái Ngọc Duy1-1/+1
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-2/+4
2011-08-19color: delay auto-color decision until point of useJeff King1-1/+3
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-1/+1
2011-06-29Merge branch 'jk/maint-1.7.2-status-ignored'Junio C Hamano1-1/+1
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-20 10:25:09 +0000