path: root/strbuf.c
diff options
authorJunio C Hamano <>2018-05-23 05:38:19 (GMT)
committerJunio C Hamano <>2018-05-23 05:38:19 (GMT)
commitc67de747f44c149747f1f4ce5f6d5d6659ba0fbc (patch)
tree18ae89ec778e7f727b459466886d034324b3f3f0 /strbuf.c
parentc9aac55c4e99302e1e365e480eb52c3da2d7c853 (diff)
parent1de70dbd1ada0069d1b6cd6345323906cc9a9ed3 (diff)
Merge branch 'en/rename-directory-detection-reboot'
Rename detection logic in "diff" family that is used in "merge" has learned to guess when all of x/a, x/b and x/c have moved to z/a, z/b and z/c, it is likely that x/d added in the meantime would also want to move to z/d by taking the hint that the entire directory 'x' moved to 'z'. A bug causing dirty files involved in a rename to be overwritten during merge has also been fixed as part of this work. Incidentally, this also avoids updating a file in the working tree after a (non-trivial) merge whose result matches what our side originally had. * en/rename-directory-detection-reboot: (36 commits) merge-recursive: fix check for skipability of working tree updates merge-recursive: make "Auto-merging" comment show for other merges merge-recursive: fix remainder of was_dirty() to use original index merge-recursive: fix was_tracked() to quit lying with some renamed paths t6046: testcases checking whether updates can be skipped in a merge merge-recursive: avoid triggering add_cacheinfo error with dirty mod merge-recursive: move more is_dirty handling to merge_content merge-recursive: improve add_cacheinfo error handling merge-recursive: avoid spurious rename/rename conflict from dir renames directory rename detection: new testcases showcasing a pair of bugs merge-recursive: fix remaining directory rename + dirty overwrite cases merge-recursive: fix overwriting dirty files involved in renames merge-recursive: avoid clobbering untracked files with directory renames merge-recursive: apply necessary modifications for directory renames merge-recursive: when comparing files, don't include trees merge-recursive: check for file level conflicts then get new name merge-recursive: add computation of collisions due to dir rename & merging merge-recursive: check for directory level conflicts merge-recursive: add get_directory_renames() merge-recursive: make a helper function for cleanup for handle_renames ...
Diffstat (limited to 'strbuf.c')
1 files changed, 16 insertions, 0 deletions
diff --git a/strbuf.c b/strbuf.c
index 622c462..75d0c2d 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -1,5 +1,6 @@
#include "cache.h"
#include "refs.h"
+#include "string-list.h"
#include "utf8.h"
int starts_with(const char *str, const char *prefix)
@@ -180,6 +181,21 @@ struct strbuf **strbuf_split_buf(const char *str, size_t slen,
return ret;
+void strbuf_add_separated_string_list(struct strbuf *str,
+ const char *sep,
+ struct string_list *slist)
+ struct string_list_item *item;
+ int sep_needed = 0;
+ for_each_string_list_item(item, slist) {
+ if (sep_needed)
+ strbuf_addstr(str, sep);
+ strbuf_addstr(str, item->string);
+ sep_needed = 1;
+ }
void strbuf_list_free(struct strbuf **sbs)
struct strbuf **s = sbs;