@matheusbsbs / matheus-bagliano / commits / e11d7b5969

Fork 0

"reset --merge": fix unmerged case

Commit 9e8ecea (Add 'merge' mode to 'git reset', 2008-12-01) disallowed "git reset --merge" when there was unmerged entries. But it wished if unmerged entries were reset as if --hard (instead of --merge) has been used. This makes sense because all "mergy" operations makes sure that any path involved in the merge does not have local modifications before starting, so resetting such a path away won't lose any information. The previous commit changed the behavior of --merge to accept resetting unmerged entries if they are reset to a different state than HEAD, but it did not reset the changes in the work tree, leaving the conflict markers in the resulting file in the work tree. Fix it by doing three things: - Update the documentation to match the wish of original "reset --merge" better, namely, "An unmerged entry is a sign that the path didn't have any local modification and can be safely resetted to whatever the new HEAD records"; - Update read_index_unmerged(), which reads the index file into the cache while dropping any higher-stage entries down to stage #0, not to copy the object name from the higher stage entry. The code used to take the object name from the a stage entry ("base" if you happened to have stage #1, or "ours" if both sides added, etc.), which essentially meant that you are getting random results depending on what the merge did. The _only_ reason we want to keep a previously unmerged entry in the index at stage #0 is so that we don't forget the fact that we have corresponding file in the work tree in order to be able to remove it when the tree we are resetting to does not have the path. In order to differentiate such an entry from ordinary cache entry, the cache entry added by read_index_unmerged() is marked as CE_CONFLICTED. - Update merged_entry() and deleted_entry() so that they pay attention to cache entries marked as CE_CONFLICTED. They are previously unmerged entries, and the files in the work tree that correspond to them are resetted away by oneway_merge() to the version from the tree we are resetting to. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Dec 31, 2009 at 23:04 UTC e11d7b5969704cd5ce39d053414d905bb203886b

5 files changed +49 -20

Documentation/git-reset.txt

+2 -2

@@ -122,14 +122,14 @@ entries:

122 X U A B --soft (disallowed)

123 --mixed X B B

124 --hard B B B

125 - --merge X B B

125 + --merge B B B

126

127 working index HEAD target working index HEAD

128 ----------------------------------------------------

129 X U A A --soft (disallowed)

130 --mixed X A A

131 --hard A A A

132 - --merge (disallowed)

132 + --merge A A A

133

134 X means any state and U means an unmerged index.

135

cache.h

@@ -177,6 +177,7 @@ struct cache_entry {

177

178 #define CE_HASHED (0x100000)

179 #define CE_UNHASHED (0x200000)

180 +#define CE_CONFLICTED (0x400000)

181

182 /*

183 * Extended on-disk flags

read-cache.c

+1 -2

@@ -1606,9 +1606,8 @@ int read_index_unmerged(struct index_state *istate)

1606 len = strlen(ce->name);

1607 size = cache_entry_size(len);

1608 new_ce = xcalloc(1, size);

1609 - hashcpy(new_ce->sha1, ce->sha1);

1609 memcpy(new_ce->name, ce->name, len);

1611 - new_ce->ce_flags = create_ce_flags(len, 0);

1610 + new_ce->ce_flags = create_ce_flags(len, 0) | CE_CONFLICTED;

1611 new_ce->ce_mode = ce->ce_mode;

1612 if (add_index_entry(istate, new_ce, 0))

1613 return error("%s: cannot drop to stage #0",

t/t7110-reset-merge.sh

+31 -9

@@ -116,10 +116,11 @@ test_expect_success 'reset --merge fails with changes in file it touches' '

116 grep file1 err.log | grep "not uptodate"

117 '

118

119 -test_expect_success 'setup 2 different branches' '

119 +test_expect_success 'setup 3 different branches' '

120 git reset --hard second &&

121 git branch branch1 &&

122 git branch branch2 &&

123 + git branch branch3 &&

124 git checkout branch1 &&

125 echo "line 5 in branch1" >> file1 &&

126 test_tick &&

@@ -128,34 +129,55 @@ test_expect_success 'setup 2 different branches' '

129 echo "line 5 in branch2" >> file1 &&

130 test_tick &&

131 git commit -a -m "change in branch2" &&

131 - git tag third

132 + git tag third &&

133 + git checkout branch3 &&

134 + echo a new file >file3 &&

135 + rm -f file1 &&

136 + git add file3 &&

137 + test_tick &&

138 + git commit -a -m "change in branch3"

139 '

140

141 # The next test will test the following:

142 #

143 # working index HEAD target working index HEAD

144 # ----------------------------------------------------

138 -# file1: X U B C --merge X C C

145 +# file1: X U B C --merge C C C

146 test_expect_success '"reset --merge HEAD^" is ok with pending merge' '

147 + git checkout third &&

148 test_must_fail git merge branch1 &&

141 - cat file1 >orig_file1 &&

149 git reset --merge HEAD^ &&

150 test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&

151 test -z "$(git diff --cached)" &&

145 - test_cmp file1 orig_file1

152 + test -z "$(git diff)"

153 '

154

155 # The next test will test the following:

156 #

157 # working index HEAD target working index HEAD

158 # ----------------------------------------------------

152 -# file1: X U B B --merge (disallowed)

153 -test_expect_success '"reset --merge HEAD" fails with pending merge' '

159 +# file1: X U B B --merge B B B

160 +test_expect_success '"reset --merge HEAD" is ok with pending merge' '

161 git reset --hard third &&

162 test_must_fail git merge branch1 &&

156 - test_must_fail git reset --merge HEAD &&

163 + git reset --merge HEAD &&

164 test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&

158 - test -n "$(git diff --cached)"

165 + test -z "$(git diff --cached)" &&

166 + test -z "$(git diff)"

167 +'

168 +

169 +test_expect_success '--merge with added/deleted' '

170 + git reset --hard third &&

171 + rm -f file2 &&

172 + test_must_fail git merge branch3 &&

173 + ! test -f file2 &&

174 + test -f file3 &&

175 + git diff --exit-code file3 &&

176 + git diff --exit-code branch3 file3 &&

177 + git reset --merge HEAD &&

178 + ! test -f file3 &&

179 + ! test -f file2 &&

180 + git diff --exit-code --cached

181 '

182

183 test_done

unpack-trees.c

+14 -7

@@ -436,6 +436,8 @@ static int same(struct cache_entry *a, struct cache_entry *b)

436 return 0;

437 if (!a && !b)

438 return 1;

439 + if ((a->ce_flags | b->ce_flags) & CE_CONFLICTED)

440 + return 0;

441 return a->ce_mode == b->ce_mode &&

442 !hashcmp(a->sha1, b->sha1);

443 }

@@ -666,7 +668,11 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,

668 {

669 int update = CE_UPDATE;

670

669 - if (old) {

671 + if (!old) {

672 + if (verify_absent(merge, "overwritten", o))

673 + return -1;

674 + invalidate_ce_path(merge, o);

675 + } else if (!(old->ce_flags & CE_CONFLICTED)) {

676 /*

677 * See if we can re-use the old CE directly?

678 * That way we get the uptodate stat info.

@@ -682,11 +688,12 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old,

688 return -1;

689 invalidate_ce_path(old, o);

690 }

685 - }

686 - else {

687 - if (verify_absent(merge, "overwritten", o))

688 - return -1;

689 - invalidate_ce_path(merge, o);

691 + } else {

692 + /*

693 + * Previously unmerged entry left as an existence

694 + * marker by read_index_unmerged();

695 + */

696 + invalidate_ce_path(old, o);

697 }

698

699 add_entry(o, merge, update, CE_STAGEMASK);

@@ -702,7 +709,7 @@ static int deleted_entry(struct cache_entry *ce, struct cache_entry *old,

709 return -1;

710 return 0;

711 }

705 - if (verify_uptodate(old, o))

712 + if (!(old->ce_flags & CE_CONFLICTED) && verify_uptodate(old, o))

713 return -1;

714 add_entry(o, ce, CE_REMOVE, 0);

715 invalidate_ce_path(ce, o);