git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v4 0/6] Pull out require_clean_work_tree() functionality from builtin/pull.c

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 7, 2016, 16:08 UTC
Message-ID
<cover.1475856491.git.johannes.schindelin@gmx.de>
In-Reply-To
<cover.1475586229.git.johannes.schindelin@gmx.de>

This is the 5th last patch series of my work to accelerate interactive rebases in particular on Windows.

Basically, all it does is to make reusable some functions that were ported over from git-pull.sh but made private to builtin/pull.c.

Changes since v3:
- reworded 3/5's commit message according to Junio's suggestion.
- fixed a tyop in 4/5's commit message, pointed out by Jakub.
- marked the hint "please commit or stash them" (reintroduced from the
  original git-pull.sh script) as translatable.
- changed the exit code to 128 (emulating a die()) if
  require_clean_work-tree() was asked to be non-gentle.
- fixed a tyop in 3/6 (which was replaced in 4/6, but it is good not to
  introduce bugs only to fix them right away).
- prefixed the commit message of 4/6 with the "wt-status:" prefix,
  replicating Junio's commit message in the `pu` branch.
Johannes Schindelin (6):
  pull: drop confusing prefix parameter of die_on_unclean_work_tree()
  pull: make code more similar to the shell script again
  wt-status: make the require_clean_work_tree() function reusable
  wt-status: export also the has_un{staged,committed}_changes()
    functions
  wt-status: teach has_{unstaged,uncommitted}_changes() about submodules
  wt-status: begin error messages with lower-case
 builtin/pull.c | 71 +++-------------------------------------------------
 wt-status.c    | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 wt-status.h    |  6 +++++
 3 files changed, 87 insertions(+), 68 deletions(-)
Published-As: https://github.com/dscho/git/releases/tag/require-clean-work-tree-v4
Fetch-It-Via: git fetch https://github.com/dscho/git require-clean-work-tree-v4
Interdiff vs v3:
 diff --git a/builtin/pull.c b/builtin/pull.c
 index 0bf9802..d6e46ee 100644
 --- a/builtin/pull.c
 +++ b/builtin/pull.c
 @@ -810,7 +810,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
  
  		if (!autostash)
  			require_clean_work_tree(N_("pull with rebase"),
 -				"please commit or stash them.", 1, 0);
 +				_("please commit or stash them."), 1, 0);
  
  		if (get_rebase_fork_point(rebase_fork_point, repo, *refspecs))
  			hashclr(rebase_fork_point);
 diff --git a/wt-status.c b/wt-status.c
 index ef67593..e8e5de4 100644
 --- a/wt-status.c
 +++ b/wt-status.c
 @@ -2281,7 +2281,7 @@ int require_clean_work_tree(const char *action, const char *hint, int ignore_sub
  		if (hint)
  			error("%s", hint);
  		if (!gently)
 -			exit(err);
 +			exit(128);
  	}
  
  	return err;
-- 
2.10.0.windows.1.325.ge6089c1

base-commit: a23ca1b8dc42ffd4de2ef30d67ce1e21ded29886
Previous: Johannes SchindelinNext: Johannes Schindelin
Message 44 of 52 in “Pull out require_clean_work_tree() functionality from builtin/pull.c”
  1. 0/6 Pull out require_clean_work_tree() functionality from builtin/pull.cJohannes Schindelin, Aug 25, 2016
  2. 1/6 pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin, Aug 25, 2016
  3. Junio C HamanoAug 29, 2016
  4. 3/6 Make the require_clean_work_tree() function truly reusableJohannes Schindelin, Aug 25, 2016
  5. 2/6 pull: make code more similar to the shell script againJohannes Schindelin, Aug 25, 2016
  6. Junio C HamanoAug 29, 2016
  7. Johannes SchindelinAug 30, 2016
  8. Johannes SchindelinSep 9, 2016
  9. 4/6 require_clean_work_tree: ensure that the index was readJohannes Schindelin, Aug 25, 2016
  10. Junio C HamanoAug 29, 2016
  11. Junio C HamanoAug 30, 2016
  12. Johannes SchindelinAug 30, 2016
  13. Johannes SchindelinAug 30, 2016
  14. Junio C HamanoAug 30, 2016
  15. Johannes SchindelinAug 30, 2016
  16. 5/6 Export also the has_un{staged,committed}_changed() functionsJohannes Schindelin, Aug 25, 2016
  17. Junio C HamanoAug 29, 2016
  18. 6/6 wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin, Aug 25, 2016
  19. 0/5 Pull out require_clean_work_tree() functionality from builtin/pull.cJohannes Schindelin, Sep 11, 2016
  20. 1/5 pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin, Sep 11, 2016
  21. 2/5 pull: make code more similar to the shell script againJohannes Schindelin, Sep 11, 2016
  22. Junio C HamanoSep 12, 2016
  23. 3/5 Make the require_clean_work_tree() function truly reusableJohannes Schindelin, Sep 11, 2016
  24. Junio C HamanoSep 12, 2016
  25. 4/5 Export also the has_un{staged,committed}_changed() functionsJohannes Schindelin, Sep 11, 2016
  26. 5/5 wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin, Sep 11, 2016
  27. Junio C HamanoSep 12, 2016
  28. 0/6 Pull out require_clean_work_tree() functionality from builtin/pull.cJohannes Schindelin, Oct 4, 2016
  29. 1/6 pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin, Oct 4, 2016
  30. 2/6 pull: make code more similar to the shell script againJohannes Schindelin, Oct 4, 2016
  31. 3/6 Make the require_clean_work_tree() function reusableJohannes Schindelin, Oct 4, 2016
  32. Junio C HamanoOct 4, 2016
  33. Johannes SchindelinOct 5, 2016
  34. Junio C HamanoOct 5, 2016
  35. 4/6 Export also the has_un{staged,committed}_changed() functionsJohannes Schindelin, Oct 4, 2016
  36. Junio C HamanoOct 4, 2016
  37. Jakub NarębskiOct 5, 2016
  38. 5/6 wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin, Oct 4, 2016
  39. 6/6 wt-status: begin error messages with lower-caseJohannes Schindelin, Oct 4, 2016
  40. Jakub NarębskiOct 5, 2016
  41. Johannes SchindelinOct 6, 2016
  42. Junio C HamanoOct 4, 2016
  43. Johannes SchindelinOct 5, 2016
  44. 0/6 Pull out require_clean_work_tree() functionality from builtin/pull.cJohannes Schindelin, Oct 7, 2016
  45. 1/6 pull: drop confusing prefix parameter of die_on_unclean_work_tree()Johannes Schindelin, Oct 7, 2016
  46. 2/6 pull: make code more similar to the shell script againJohannes Schindelin, Oct 7, 2016
  47. 3/6 wt-status: make the require_clean_work_tree() function reusableJohannes Schindelin, Oct 7, 2016
  48. 4/6 wt-status: export also the has_un{staged,committed}_changes() functionsJohannes Schindelin, Oct 7, 2016
  49. 5/6 wt-status: teach has_{unstaged,uncommitted}_changes() about submodulesJohannes Schindelin, Oct 7, 2016
  50. 6/6 wt-status: begin error messages with lower-caseJohannes Schindelin, Oct 7, 2016
  51. Junio C HamanoOct 7, 2016
  52. Jakub NarębskiOct 7, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.