aboutsummaryrefslogtreecommitdiffstats
path: root/builtin/stash.c
AgeCommit message (Expand)AuthorFilesLines
2025-09-29Merge branch 'dk/stash-apply-index'Junio C Hamano1-6/+11
2025-09-29Merge branch 'jk/setup-revisions-freefix'Junio C Hamano1-2/+2
2025-09-23Merge branch 'rs/get-oid-with-flags-cleanup'Junio C Hamano1-9/+5
2025-09-23Merge branch 'jk/add-i-color'Junio C Hamano1-1/+4
2025-09-22revision: add wrapper to setup_revisions() from a strvecJeff King1-3/+2
2025-09-22stash: tell setup_revisions() to free our allocated stringsJeff King1-1/+2
2025-09-21stash: honor stash.index in apply, pop modesD. Ben Knoble1-2/+7
2025-09-21stash: refactor private config globalsD. Ben Knoble1-4/+4
2025-09-10use repo_get_oid_with_flags()René Scharfe1-9/+5
2025-09-08stash: pass --no-color to diff plumbing child processesJeff King1-1/+4
2025-08-21Merge branch 'ps/remote-rename-fix'Junio C Hamano1-2/+4
2025-08-06refs: pass refname when invoking reflog entry callbackPatrick Steinhardt1-2/+4
2025-08-04Merge branch 'lm/add-p-context'Junio C Hamano1-11/+45
2025-07-29add-patch: add diff.context command line overridesLeon Michalak1-11/+45
2025-07-23config: drop `git_config()` wrapperPatrick Steinhardt1-2/+2
2025-06-30Merge branch 'bc/stash-export-import'Junio C Hamano1-11/+449
2025-06-24Merge branch 'kj/stash-onbranch-submodule-fix'Junio C Hamano1-2/+8
2025-06-12builtin/stash: provide a way to import stashes from a refbrian m. carlson1-0/+167
2025-06-12builtin/stash: provide a way to export stashes to a refbrian m. carlson1-0/+260
2025-06-12builtin/stash: factor out revision parsing into a functionbrian m. carlson1-11/+22
2025-06-11stash: fix incorrect branch name in stash messageK Jayatheerth1-2/+8
2025-06-07stash: allow "git stash [<options>] --patch <pathspec>" to assume pushPhillip Wood1-3/+7
2025-06-07stash: allow "git stash -p <pathspec>" to assume push againPhillip Wood1-1/+1
2025-03-17stash: remove merge-recursive.h includeElijah Newren1-1/+0
2024-12-06global: trivial conversions to fix `-Wsign-compare` warningsPatrick Steinhardt1-5/+2
2024-12-06global: mark code units that generate warnings with `-Wsign-compare`Patrick Steinhardt1-0/+2
2024-11-26builtin: pass repository to sub commandsKarthik Nayak1-14/+25
2024-09-30builtin/stash: fix leaking `pathspec_from_file`Patrick Steinhardt1-1/+3
2024-09-23Merge branch 'jc/pass-repo-to-builtins'Junio C Hamano1-1/+5
2024-09-23Merge branch 'ps/environ-wo-the-repository'Junio C Hamano1-8/+9
2024-09-16Merge branch 'jc/range-diff-lazy-setup'Junio C Hamano1-3/+3
2024-09-13builtin: remove USE_THE_REPOSITORY_VARIABLE from builtin.hJohn Cai1-0/+1
2024-09-13builtin: add a repository parameter for builtin functionsJohn Cai1-1/+4
2024-09-12environment: make `get_git_work_tree()` accept a repositoryPatrick Steinhardt1-1/+1
2024-09-12environment: make `get_index_file()` accept a repositoryPatrick Steinhardt1-6/+6
2024-09-12environment: make `get_git_dir()` accept a repositoryPatrick Steinhardt1-1/+2
2024-09-05drop trailing newline from warning/error/die messagesJeff King1-1/+1
2024-08-23Merge branch 'ps/stash-keep-untrack-empty-fix'Junio C Hamano1-1/+22
2024-08-16builtin/stash: fix `--keep-index --include-untracked` with empty HEADPatrick Steinhardt1-1/+22
2024-08-14Merge branch 'ps/leakfixes-part-3'Junio C Hamano1-2/+16
2024-08-09remerge-diff: clean up temporary objdir at a central placeJunio C Hamano1-3/+3
2024-08-01builtin/stash: fix various trivial memory leaksPatrick Steinhardt1-2/+16
2024-07-13merge-recursive: honor diff.algorithmAntonin Delpeuch1-1/+1
2024-06-11commit: fix leaking parents when calling `commit_tree_extended()`Patrick Steinhardt1-5/+4
2024-06-11builtin/stash: fix leak in `show_stash()`Patrick Steinhardt1-0/+2
2024-06-11object-name: free leaking object contextsPatrick Steinhardt1-3/+9
2024-05-16Merge branch 'ps/refs-without-the-repository'Junio C Hamano1-10/+13
2024-05-08Merge branch 'ps/the-index-is-no-more'Junio C Hamano1-23/+22
2024-05-07cocci: apply rules to rewrite callers of "refs" interfacesPatrick Steinhardt1-10/+13
2024-04-30Merge branch 'aj/stash-staged-fix'Junio C Hamano1-2/+2
2024-04-22stash: fix "--staged" with binary filesAdam Johnson1-2/+2
2024-04-18builtin: stop using `the_index`Patrick Steinhardt1-23/+22
2024-03-28Merge branch 'eb/hash-transition'Junio C Hamano1-2/+3
2024-02-13Merge branch 'ps/report-failure-from-git-stash' into maint-2.43Junio C Hamano1-4/+4
2024-02-12Merge branch 'ps/report-failure-from-git-stash'Junio C Hamano1-4/+4
2024-02-06builtin/stash: report failure to write to indexPatrick Steinhardt1-4/+4
2023-12-26treewide: remove unnecessary includes in source filesElijah Newren1-1/+0
2023-10-23Merge branch 'jc/fail-stash-to-store-non-stash'Junio C Hamano1-0/+6
2023-10-11stash: be careful what we storeJunio C Hamano1-0/+6
2023-10-02tree-walk: init_tree_desc take an oid to get the hash algorithmEric W. Biederman1-2/+3
2023-09-07Merge branch 'jk/unused-post-2.42'Junio C Hamano1-1/+1
2023-08-29stash: mark unused parameter in diff callbackJeff King1-1/+1
2023-08-21diff: drop useless "status" parameter from diff_result_code()Jeff King1-3/+3
2023-08-21diff: drop useless return from run_diff_{files,index} functionsJeff King1-9/+5
2023-08-21diff: spell DIFF_INDEX_CACHED out when calling run_diff_index()Junio C Hamano1-1/+1
2023-07-06Merge branch 'gc/config-context'Junio C Hamano1-2/+3
2023-06-28config: add ctx arg to config_fn_tGlen Choo1-2/+3
2023-06-21diff.h: remove unnecessary include of oidset.hElijah Newren1-0/+1
2023-06-21read-cache*.h: move declarations for read-cache.c functions from cache.hElijah Newren1-0/+1
2023-06-21preload-index.h: move declarations for preload-index.c from elsewhereElijah Newren1-0/+1
2023-06-21sparse-index.h: move declarations for sparse-index.c from cache.hElijah Newren1-0/+1
2023-04-25Merge branch 'en/header-split-cache-h'Junio C Hamano1-0/+1
2023-04-11object-name.h: move declarations for object-name.c functions from cache.hElijah Newren1-0/+1
2023-04-06Merge branch 'en/header-split-cleanup'Junio C Hamano1-0/+4
2023-04-06Merge branch 'ab/remove-implicit-use-of-the-repository'Junio C Hamano1-12/+14
2023-04-04Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-...Junio C Hamano1-12/+14
2023-03-28builtins: mark unused prefix parametersJeff King1-1/+1
2023-03-28cocci: apply the "revision.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-3/+3
2023-03-28cocci: apply the "rerere.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "refs.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+2
2023-03-28cocci: apply the "diff.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-1/+1
2023-03-28cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason1-6/+7
2023-03-21setup.h: move declarations for setup.c functions from cache.hElijah Newren1-0/+1
2023-03-21environment.h: move declarations for environment.c functions from cache.hElijah Newren1-0/+1
2023-03-21abspath.h: move absolute path functions 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
2023-02-22Merge branch 'ab/various-leak-fixes'Junio C Hamano1-2/+5
2023-02-22Merge branch 'ab/the-index-compatibility'Junio C Hamano1-4/+7
2023-02-10cocci & cache-tree.h: migrate "write_cache_as_tree" to "*_index_*"Ævar Arnfjörð Bjarmason1-4/+7
2023-02-06various: add missing clear_pathspec(), fix leaksÆvar Arnfjörð Bjarmason1-2/+5
2023-02-06add API: remove run_add_interactive() wrapper functionÆvar Arnfjörð Bjarmason1-1/+2
2023-01-17treewide: always have a valid "index_state.repo" memberÆvar Arnfjörð Bjarmason1-4/+4
2023-01-16cache API: add a "INDEX_STATE_INIT" macro/function, add release_index()Ævar Arnfjörð Bjarmason1-8/+8
2022-12-14Merge branch 'ab/various-leak-fixes'Junio C Hamano1-0/+2
2022-11-21built-ins & libs & helpers: add/move destructors, fix leaksÆvar Arnfjörð Bjarmason1-0/+2
2022-11-21cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason1-16/+19
2022-11-21cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason1-4/+4
2022-10-28Merge branch 'ab/doc-synopsis-and-cmd-usage'Junio C Hamano1-25/+48
2022-10-13doc txt & -h consistency: make "stash" consistentÆvar Arnfjörð Bjarmason1-25/+48
2022-10-13doc txt & -h consistency: fix mismatching labelsÆvar Arnfjörð Bjarmason1-1/+1
2022-10-13stash doc SYNOPSIS & -h: correct padding around "[]()"Ævar Arnfjörð Bjarmason1-14/+14
2022-10-13doc txt & -h consistency: fix incorrect alternates syntaxÆvar Arnfjörð Bjarmason1-3/+3
2022-09-14Merge branch 'ab/unused-annotation'Junio C Hamano1-6/+6
2022-09-14Merge branch 'jk/unused-annotation'Junio C Hamano1-3/+6
2022-09-01git-compat-util.h: use "UNUSED", not "UNUSED(var)"Ævar Arnfjörð Bjarmason1-6/+6
2022-08-19refs: mark unused reflog callback parametersJeff King1-3/+6
2022-08-19builtin/stash.c: let parse-options parse subcommandsSZEDER Gábor1-29/+24
2022-08-19parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --optionsSZEDER Gábor1-4/+4
2022-06-10Merge branch 'ab/env-array'Junio C Hamano1-8/+8
2022-06-07Merge branch 'ab/plug-leak-in-revisions'Junio C Hamano1-53/+62
2022-06-02run-command API: rename "env_array" to "env"Ævar Arnfjörð Bjarmason1-8/+8
2022-05-10stash: apply stash using 'merge_ort_nonrecursive()'Victoria Dye1-6/+24
2022-05-10stash: integrate with sparse indexVictoria Dye1-0/+3
2022-04-13revisions API: have release_revisions() release "prune_data"Ævar Arnfjörð Bjarmason1-2/+0
2022-04-13revisions API users: add "goto cleanup" for release_revisions()Ævar Arnfjörð Bjarmason1-0/+1
2022-04-13stash: always have the owner of "stash_info" free itÆvar Arnfjörð Bjarmason1-48/+59
2022-04-13revision.[ch]: provide and start using a release_revisions()Ævar Arnfjörð Bjarmason1-3/+2
2022-03-30Merge branch 'vd/stash-silence-reset'Junio C Hamano1-2/+3
2022-03-23Merge branch 'ep/remove-duplicated-includes'Junio C Hamano1-1/+0
2022-03-16Merge branch 'jc/stash-drop'Junio C Hamano1-14/+4
2022-03-14stash: make internal resets quiet and refresh indexVictoria Dye1-2/+3
2022-03-13builtin/stash.c: delete duplicate includeElia Pinto1-1/+0
2022-03-02stash: call reflog_delete() in reflog.cJohn Cai1-14/+4
2022-02-24stash: strip "refs/heads/" with skip_prefixGlen Choo1-1/+1
2022-02-16Merge branch 'js/no-more-legacy-stash'Junio C Hamano1-10/+0
2022-02-05Merge branch 'ab/cat-file'Junio C Hamano1-2/+2
2022-01-28Merge branch 'en/keep-cwd' into maintJunio C Hamano1-1/+5
2022-01-27stash: stop warning about the obsolete `stash.useBuiltin` config settingJohannes Schindelin1-10/+0
2022-01-26Merge branch 'en/keep-cwd'Junio C Hamano1-1/+5
2022-01-26sequencer, stash: fix running from worktree subdirElijah Newren1-1/+5
2022-01-10Merge branch 'en/stash-df-fix'Junio C Hamano1-4/+5
2022-01-10Merge branch 'ja/i18n-similar-messages'Junio C Hamano1-4/+4
2022-01-10Merge branch 'ab/do-not-limit-stash-help-to-push'Junio C Hamano1-0/+1
2022-01-05Merge branch 'en/keep-cwd'Junio C Hamano1-1/+3
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila1-1/+1
2022-01-05i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila1-1/+1
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila1-2/+2
2022-01-04stash: do not return before restoring untracked filesElijah Newren1-4/+5
2021-12-30parse-options API: add a usage_msg_optf()Ævar Arnfjörð Bjarmason1-2/+2
2021-12-16stash: don't show "git stash push" usage on bad "git stash" usageÆvar Arnfjörð Bjarmason1-0/+1
2021-12-09stash: do not attempt to remove startup_info->original_cwdElijah Newren1-1/+3
2021-10-28stash: get rid of unused argument in stash_staged()Sergey Organov1-3/+3
2021-10-18stash: implement '--staged' option for 'push' and 'save'Sergey Organov1-9/+71
2021-10-13Merge branch 'ab/align-parse-options-help'Junio C Hamano1-1/+1
2021-10-13Merge branch 'en/removing-untracked-fixes'Junio C Hamano1-1/+4
2021-09-27Comment important codepaths regarding nuking untracked files/dirsElijah Newren1-0/+1
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren1-2/+2
2021-09-27Remove ignored files by default when they are in the wayElijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren1-0/+3
2021-09-12parse-options API users: align usage output in C-stringsÆvar Arnfjörð Bjarmason1-1/+1
2021-09-10stash: restore untracked files AFTER restoring tracked filesElijah Newren1-3/+3
2021-09-10stash: avoid feeding directories to update-indexElijah Newren1-0/+14
2021-07-16Merge branch 'ab/struct-init'Junio C Hamano1-2/+1
2021-07-01dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason1-2/+1
2021-06-14Merge branch 'so/log-m-implies-p'Junio C Hamano1-1/+1
2021-06-10Merge branch 'ah/stash-usage-i18n-fix'Junio C Hamano1-2/+2
2021-05-22Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano1-4/+1
2021-05-22stash show: use stash.showIncludeUntracked even when diff options givenDenton Liu1-4/+1
2021-05-21stash list: stop passing "-m" to "git log"Sergey Organov1-1/+1
2021-05-17stash: don't translate literal commandsAlex Henrie1-2/+2
2021-05-16Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano1-2/+6
2021-05-13stash show: fix segfault with --{include,only}-untrackedDenton Liu1-2/+6
2021-04-30Merge branch 'ds/sparse-index-protections'Junio C Hamano1-0/+2
2021-04-14stash: ensure full indexDerrick Stolee1-0/+2
2021-04-02Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano1-0/+2
2021-03-23entry: extract a header file for entry.c functionsMatheus Tavares1-0/+1
2021-03-22Merge branch 'dl/stash-show-untracked'Junio C Hamano1-1/+61
2021-03-05stash show: learn stash.showIncludeUntrackedDenton Liu1-0/+8
2021-03-05stash show: teach --include-untracked and --only-untrackedDenton Liu1-1/+53
2021-02-25Merge branch 'js/params-vs-args'Junio C Hamano1-1/+1
2021-02-23replace "parameters" by "arguments" in error messagesJohannes Sixt1-1/+1
2021-02-11stash: declare ref_stash as an arrayDenton Liu1-1/+1
2021-02-05Merge branch 'en/stash-apply-sparse-checkout' into maintJunio C Hamano1-49/+116
2021-01-15Merge branch 'en/stash-apply-sparse-checkout'Junio C Hamano1-49/+116
2020-12-01stash: fix stash application in sparse-checkoutsElijah Newren1-2/+48
2020-12-01stash: remove unnecessary process forkingElijah Newren1-49/+70
2020-11-30Merge branch 'km/stash-error-message-fix'Junio C Hamano1-1/+1
2020-11-24stash: add missing space to an error messageKyle Meyer1-1/+1
2020-11-01stash: simplify reflog emptiness checkRené Scharfe1-14/+13
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-18dir: fix problematic API to avoid memory leaksElijah Newren1-2/+2
2020-08-18dir: make clear_directory() free all relevant memoryElijah Newren1-3/+0
2020-07-30strvec: rename struct fieldsJeff King1-4/+4
2020-07-28strvec: fix indentation in renamed callsJeff King1-19/+19
2020-07-28strvec: convert builtin/ callers away from argv_array nameJeff King1-57/+57
2020-07-28strvec: rename files from argv-array to strvecJeff King1-1/+1
2020-04-29Merge branch 'en/fill-directory-exponential'Junio C Hamano1-12/+5
2020-04-28Merge branch 'js/stash-p-fix'Junio C Hamano1-1/+1
2020-04-08stash -p: (partially) fix bug concerning split hunksJohannes Schindelin1-1/+1
2020-04-01Fix error-prone fill_directory() API; make it only return matchesElijah Newren1-12/+5
2020-03-26Merge branch 'tg/retire-scripted-stash'Junio C Hamano1-39/+11
2020-03-09Merge branch 'am/pathspec-f-f-more'Junio C Hamano1-38/+41
2020-03-05stash: remove the stash.useBuiltin settingThomas Gummerer1-37/+10
2020-03-03stash: get git_stash_config at the top levelThomas Gummerer1-3/+2
2020-02-19stash push: support the --pathspec-from-file optionAlexandr Miloslavskiy1-0/+20
2020-02-19stash: eliminate crude option parsingAlexandr Miloslavskiy1-38/+21
2020-02-05Merge branch 'js/patch-mode-in-others-in-c'Junio C Hamano1-11/+14
2019-12-21built-in stash: use the built-in `git add -p` if so configuredJohannes Schindelin1-11/+14