aboutsummaryrefslogtreecommitdiffstats
path: root/wt-status.c
AgeCommit message (Expand)AuthorFilesLines
2024-04-05Merge branch 'jk/core-comment-string'Junio C Hamano1-19/+12
2024-03-21Merge branch 'fs/find-end-of-log-message-fix'Junio C Hamano1-2/+5
2024-03-12wt-status: drop custom comment-char stringificationJeff King1-10/+3
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King1-1/+1
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King1-5/+5
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King1-2/+2
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King1-1/+1
2024-03-07Merge branch 'jt/commit-redundant-scissors-fix'Junio C Hamano1-4/+8
2024-03-07wt-status: don't find scissors line beyond buf lenFlorian Schmidt1-2/+5
2024-02-27commit: avoid redundant scissor line with --cleanup=scissors -vJosh Triplett1-4/+8
2024-02-08Merge branch 'rj/status-bisect-while-rebase' into maint-2.43Junio C Hamano1-3/+4
2024-01-02Merge branch 'ps/pseudo-refs'Junio C Hamano1-8/+14
2024-01-02Merge branch 'rj/status-bisect-while-rebase'Junio C Hamano1-3/+4
2023-12-14wt-status: read HEAD and ORIG_HEAD via the refdbPatrick Steinhardt1-8/+14
2023-10-16status: fix branch shown when not only bisectingRubén Justo1-3/+4
2023-09-14Merge branch 'jk/tree-name-and-depth-limit'Junio C Hamano1-1/+1
2023-09-01Merge branch 'jk/diff-result-code-cleanup'Junio C Hamano1-6/+6
2023-08-31read_tree(): respect max_allowed_tree_depthJeff King1-1/+1
2023-08-31Merge branch 'ob/sequencer-empty-hint-fix'Junio C Hamano1-1/+5
2023-08-24sequencer: rectify empty hint in call of require_clean_work_tree()Oswald Buddenhagen1-1/+5
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King1-2/+2
2023-08-21diff: drop useless return from run_diff_{files,index} functionsJeff King1-4/+4
2023-08-21diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano1-3/+3
2023-07-25Merge branch 'ah/advise-force-pushing'Junio C Hamano1-1/+2
2023-07-13wt-status: don't show divergence advice when committingAlex Henrie1-1/+2
2023-07-06Merge branch 'jk/cherry-pick-revert-status'Junio C Hamano1-2/+2
2023-07-06Merge branch 'cw/strbuf-cleanup'Junio C Hamano1-3/+3
2023-06-27fix cherry-pick/revert status when doing multiple commitsJacob Keller1-2/+2
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-0/+1
2023-06-21repository: remove unnecessary include of path.hElijah Newren1-0/+1
2023-06-21cache.h: remove this no-longer-used headerElijah Newren1-1/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-12strbuf: remove global variableCalvin Wan1-3/+3
2023-04-24commit.h: reduce unnecessary includesElijah Newren1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on advice.hElijah Newren1-0/+1
2023-04-11treewide: be explicit about dependence on trace.h & trace2.hElijah Newren1-0/+2
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-10/+11
2023-03-28libs: use "struct repository *" argument, not "the_repository"Ævar Arnfjörð Bjarmason1-5/+5
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-9/+9
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21environment: move comment_line_char from cache.hElijah Newren1-0/+1
2023-03-21treewide: be explicit about dependence on gettext.hElijah Newren1-0/+1
2023-02-23cache.h: remove dependence on hex.h; make other files include it explicitlyElijah Newren1-0/+1
2022-12-26Merge branch 'jk/unused-post-2.39'Junio C Hamano1-2/+2
2022-12-13diff: mark unused parameters in callbacksJeff King1-2/+2
2022-12-01status: modernize git-status "slow untracked files" adviceRudy Rigot1-5/+23
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-8/+8
2022-08-19refs: mark unused reflog callback parametersJeff King1-5/+9
2022-06-10Merge branch 'ab/env-array'Junio C Hamano1-1/+1
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason1-1/+1
2022-04-13revisions API: add a TODO for diff_free(&revs->diffopt)Ævar Arnfjörð Bjarmason1-2/+4
2022-04-13revisions API: have release_revisions() release "prune_data"Ævar Arnfjörð Bjarmason1-2/+0
2022-04-13revisions API users: use release_revisions() for "prune_data" usersÆvar Arnfjörð Bjarmason1-0/+1
2022-04-13revisions API users: add straightforward release_revisions()Ævar Arnfjörð Bjarmason1-0/+1
2022-04-13revision.[ch]: provide and start using a release_revisions()Ævar Arnfjörð Bjarmason1-2/+3
2022-03-16Merge branch 'ab/string-list-count-in-size-t'Junio C Hamano1-6/+6
2022-03-07string-list API: change "nr" and "alloc" to "size_t"Ævar Arnfjörð Bjarmason1-6/+6
2022-03-01status: fix nested sparse directory diff in sparse indexVictoria Dye1-0/+9
2022-01-05Merge branch 'xw/am-empty'Junio C Hamano1-1/+7
2021-12-15am: support --allow-empty to record specific empty patches徐沛文 (Aleen)1-1/+7
2021-10-21status: print stash info with --porcelain=v2 --show-stashØystein Walle1-0/+15
2021-10-21status: count stash entries in separate functionØystein Walle1-2/+8
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel1-3/+3
2021-07-28Merge branch 'ds/status-with-sparse-index'Junio C Hamano1-3/+62
2021-07-16Merge branch 'ds/gender-neutral-doc'Junio C Hamano1-1/+1
2021-07-14wt-status: expand added sparse directory entriesDerrick Stolee1-0/+51
2021-07-14status: skip sparse-checkout percentage with sparse-indexDerrick Stolee1-3/+11
2021-07-01dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason1-2/+1
2021-06-16comments: avoid using the gender of our usersFelipe Contreras1-1/+1
2021-05-10Merge branch 'bc/hash-transition-interop-part-1'Junio C Hamano1-2/+2
2021-05-07Merge branch 'ah/plugleaks'Junio C Hamano1-0/+4
2021-04-28wt-status: fix multiple small leaksAndrzej Hunt1-0/+4
2021-04-27hash: provide per-algorithm null OIDsbrian m. carlson1-2/+2
2021-03-13use CALLOC_ARRAYRené Scharfe1-3/+3
2021-01-25Merge branch 'sj/untracked-files-in-submodule-directory-is-not-dirty'Junio C Hamano1-1/+3
2021-01-07branch: sort detached HEAD based on a flagÆvar Arnfjörð Bjarmason1-2/+2
2020-12-08diff: do not show submodule with untracked files as "-dirty"Sangeeta Jain1-1/+3
2020-10-05Merge branch 'ma/worktree-cleanups'Junio C Hamano1-30/+42
2020-09-27wt-status: introduce wt_status_state_free_buffers()Martin Ågren1-3/+8
2020-09-27wt-status: print to s->fp, not stdoutMartin Ågren1-25/+32
2020-09-27wt-status: replace sha1 mentions with oidMartin Ågren1-4/+4
2020-09-18Merge branch 'jc/quote-path-cleanup'Junio C Hamano1-24/+13
2020-09-10wt-status: consistently quote paths in "status --short" outputJunio C Hamano1-2/+2
2020-09-10quote_path: optionally allow quoting a path with SP in itJunio C Hamano1-12/+3
2020-09-10quote_path: give flags parameter to quote_path()Junio C Hamano1-12/+12
2020-09-10quote_path: rename quote_path_relative() to quote_path()Junio C Hamano1-2/+0
2020-09-09Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano1-1/+1
2020-09-02wt-status: tolerate dangling marksJonathan Tan1-1/+1
2020-08-31Merge branch 'hn/refs-pseudorefs'Junio C Hamano1-3/+3
2020-08-21sequencer: treat REVERT_HEAD as a pseudo refHan-Wen Nienhuys1-1/+1
2020-08-21sequencer: treat CHERRY_PICK_HEAD as a pseudo refHan-Wen Nienhuys1-2/+2
2020-08-18dir: fix problematic API to avoid memory leaksElijah Newren1-2/+2
2020-08-18dir: make clear_directory() free all relevant memoryElijah Newren1-4/+0
2020-08-10Merge branch 'jk/strvec'Junio C Hamano1-10/+9
2020-07-28strvec: fix indentation in renamed callsJeff King1-2/+1
2020-07-28strvec: convert remaining callers away from argv_array nameJeff King1-8/+8
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-07-28Remove doubled words in various commentsElijah Newren1-1/+1
2020-06-18wt-status: show sparse checkout status as wellElijah Newren1-0/+41
2020-04-01Fix error-prone fill_directory() API; make it only return matchesElijah Newren1-4/+2
2019-10-11Merge branch 'bc/object-id-part17'Junio C Hamano1-1/+1
2019-08-27status: mention --skip for revert and cherry-pickDenton Liu1-0/+4
2019-08-19wt-status: convert struct wt_status to object_idbrian m. carlson1-1/+1
2019-07-19Merge branch 'jl/status-reduce-vertical-blank'Junio C Hamano1-4/+0
2019-07-09Merge branch 'jh/status-aheadbehind'Junio C Hamano1-0/+17
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano1-7/+19
2019-07-09Merge branch 'md/sort-detached-head-first'Junio C Hamano1-2/+2
2019-06-21status: warn when a/b calculation takes too longJeff Hostetler1-0/+17
2019-06-21status: remove the empty line after hintsJohn Lin1-4/+0
2019-06-19ref-filter: sort detached HEAD lines firstlyMatthew DeVore1-2/+2
2019-06-13Merge branch 'jk/unused-params-final-batch'Junio C Hamano1-4/+2
2019-05-19Merge branch 'js/rebase-i-label-shown-in-status-fix'Junio C Hamano1-1/+3
2019-05-13Merge branch 'pw/clean-sequencer-state-upon-final-commit'Junio C Hamano1-5/+34
2019-05-13status: fix display of rebase -ir's `label` commandJohannes Schindelin1-1/+3
2019-05-13wt-status: drop unused status parameterJeff King1-4/+2
2019-05-09Merge branch 'dr/ref-filter-push-track-fix'Junio C Hamano1-2/+2
2019-05-07doc: promote "git restore"Nguyễn Thái Ngọc Duy1-7/+19
2019-04-18merge: cleanup messages like commitDenton Liu1-3/+9
2019-04-18ref-filter: use correct branch for %(push:track)Damien Robert1-2/+2
2019-04-17fix cherry-pick/revert status after commitPhillip Wood1-5/+34
2019-02-22trace2:data: add trace2 regions to wt-statusJeff Hostetler1-2/+22
2019-01-14read-cache.c: replace update_index_if_able with repo_&Nguyễn Thái Ngọc Duy1-1/+1
2019-01-14repository.c: replace hold_locked_index() with repo_hold_locked_index()Nguyễn Thái Ngọc Duy1-1/+1
2019-01-04Merge branch 'nd/the-index'Junio C Hamano1-41/+53
2018-11-13status: rebase and merge can be in progress at the same timeJohannes Schindelin1-2/+7
2018-11-12wt-status.c: remove implicit dependency the_repositoryNguyễn Thái Ngọc Duy1-8/+10
2018-11-12wt-status.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-33/+43
2018-10-19Merge branch 'ss/wt-status-committable'Junio C Hamano1-89/+82
2018-10-19Merge branch 'nd/the-index'Junio C Hamano1-5/+5
2018-10-03roll wt_status_state into wt_status and populate in the collect phaseStephen P. Smith1-75/+59
2018-09-21revision.c: remove implicit dependency on the_indexNguyễn Thái Ngọc Duy1-5/+5
2018-09-07wt-status.c: set the committable flag in the collect phaseStephen P. Smith1-2/+11
2018-09-07wt-status: rename commitable to committableStephen P. Smith1-5/+5
2018-09-07wt-status.c: move has_unmerged earlier in the fileStephen P. Smith1-13/+13
2018-08-29convert "oidcmp() == 0" to oideq()Jeff King1-5/+5
2018-08-13dir.c: remove an implicit dependency on the_index in pathspec codeNguyễn Thái Ngọc Duy1-3/+3
2018-08-02Merge branch 'sb/object-store-lookup'Junio C Hamano1-2/+2
2018-08-02Merge branch 'jk/has-uncommitted-changes-fix'Junio C Hamano1-0/+10
2018-07-18Merge branch 'sb/object-store-grafts'Junio C Hamano1-4/+4
2018-07-11has_uncommitted_changes(): fall back to empty treeJeff King1-0/+10
2018-06-29commit: add repository argument to lookup_commit_reference_gentlyStefan Beller1-1/+1
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano1-4/+4
2018-05-30Merge branch 'bc/object-id'Junio C Hamano1-2/+2
2018-05-30Merge branch 'bp/status-rename-config'Junio C Hamano1-0/+12
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano1-10/+10
2018-05-18path.c: migrate global git_path_* to take a repository argumentStefan Beller1-4/+4
2018-05-13add status config and command line options for rename detectionBen Peart1-0/+12
2018-05-06Replace all die("BUG: ...") calls by BUG() onesJohannes Schindelin1-10/+10
2018-05-06wt-status: use settings from git_diff_ui_configEckhard S. Maaß1-4/+0
2018-05-02wt-status: convert two uses of EMPTY_TREE_SHA1_HEXbrian m. carlson1-2/+2
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson1-3/+3
2018-03-14wt-status: convert struct wt_status_state to object_idbrian m. carlson1-6/+6
2018-03-14strbuf: convert strbuf_add_unique_abbrev to use struct object_idbrian m. carlson1-3/+3
2018-03-08Merge branch 'jh/status-no-ahead-behind'Junio C Hamano1-12/+29
2018-02-27Merge branch 'nd/ita-wt-renames-in-status' into maintJunio C Hamano1-30/+53
2018-01-24status: support --no-ahead-behind in long formatJeff Hostetler1-1/+1
2018-01-24status: update short status to respect --no-ahead-behindJeff Hostetler1-4/+7
2018-01-24status: add --[no-]ahead-behind to status and commit for V2 format.Jeff Hostetler1-9/+21
2018-01-24stat_tracking_info: return +1 when branches not equalJeff Hostetler1-2/+4
2018-01-23Merge branch 'nd/ita-wt-renames-in-status'Junio C Hamano1-30/+53
2017-12-27wt-status.c: handle worktree renamesNguyễn Thái Ngọc Duy1-3/+19
2017-12-27wt-status.c: rename rename-related fields in wt_status_change_dataNguyễn Thái Ngọc Duy1-24/+26
2017-12-27wt-status.c: catch unhandled diff status codesNguyễn Thái Ngọc Duy1-2/+6
2017-12-27wt-status.c: coding style fixNguyễn Thái Ngọc Duy1-1/+2
2017-12-27Use DIFF_DETECT_RENAME for detect_rename assignmentsNguyễn Thái Ngọc Duy1-2/+2
2017-11-15Merge branch 'bw/rebase-i-ignored-submodule-fix'Junio C Hamano1-1/+3
2017-11-13Merge branch 'jm/status-ignored-files-list'Junio C Hamano1-3/+8
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano1-9/+9
2017-11-07wt-status: actually ignore submodules when requestedBrandon Williams1-1/+3
2017-11-06Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2017-11-06Merge branch 'ma/lockfile-fixes'Junio C Hamano1-4/+4
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams1-9/+9
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams1-9/+9
2017-10-31status: add option to show ignored files differentlyJameson Miller1-3/+8
2017-10-16refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson1-1/+1
2017-10-06treewide: prefer lockfiles on the stackMartin Ågren1-4/+4
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano1-3/+1
2017-10-01refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe1-3/+1
2017-09-25Merge branch 'ks/commit-do-not-touch-cut-line'Junio C Hamano1-1/+1
2017-09-15commit-template: change a message to be more intuitiveKaartic Sivaraam1-1/+1
2017-09-10wt-status: release strbuf after use in wt_longstatus_print_tracking()Rene Scharfe1-0/+1
2017-09-07wt-status: release strbuf after use in read_rebase_todolist()Rene Scharfe1-0/+1
2017-07-12Merge branch 'rs/wt-status-cleanup'Junio C Hamano1-3/+4
2017-07-10wt-status: use separate variable for result of shorten_unambiguous_refRené Scharfe1-3/+4
2017-06-30Merge branch 'ks/status-initial-commit'Junio C Hamano1-2/+5
2017-06-21status: contextually notify user about an initial commitKaartic Sivaraam1-2/+5
2017-06-18status: add optional stash count informationLiam Beguin1-0/+24
2017-06-13Merge branch 'nd/fopen-errors'Junio C Hamano1-1/+2
2017-06-05Merge branch 'bm/interpret-trailers-cut-line-is-eom' into maintJunio C Hamano1-5/+6
2017-05-29Merge branch 'bm/interpret-trailers-cut-line-is-eom'Junio C Hamano1-5/+6
2017-05-29Merge branch 'js/plug-leaks'Junio C Hamano1-14/+15
2017-05-29Merge branch 'bc/object-id'Junio C Hamano1-1/+1
2017-05-29Merge branch 'bw/dir-c-stops-relying-on-the-index'Junio C Hamano1-1/+1
2017-05-26wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy1-1/+2
2017-05-18interpret-trailers: honor the cut lineBrian Malehorn1-5/+6
2017-05-16Merge branch 'js/larger-timestamps'Junio C Hamano1-1/+1
2017-05-08Convert lookup_commit* to struct object_idbrian m. carlson1-1/+1
2017-05-08split_commit_in_progress(): simplify & fix memory leakJohannes Schindelin1-14/+14