* [PATCH] update-cache --remove marks the path merged.
@ 2005-04-17 6:00 Junio C Hamano
0 siblings, 0 replies; only message in thread
From: Junio C Hamano @ 2005-04-17 6:00 UTC (permalink / raw
To: Linus Torvalds; +Cc: git
When update-cache --remove is run, resolve unmerged state for
the path. This is consistent with the update-cache --add
behaviour. Essentially, the user is telling us how he wants to
resolve the merge by running update-cache.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
read-cache.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletion(-)
read-cache.c: e16c37403092e1e94c50b04685b6417405ffc724
--- read-cache.c
+++ read-cache.c 2005-04-16 22:43:55.000000000 -0700
@@ -368,7 +368,9 @@
int remove_file_from_cache(char *path)
{
int pos = cache_name_pos(path, strlen(path));
- if (pos >= 0)
+ if (pos < 0)
+ pos = -pos-1;
+ while (! strcmp(active_cache[pos]->name, path))
remove_entry_at(pos);
return 0;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2005-04-17 5:56 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-04-17 6:00 [PATCH] update-cache --remove marks the path merged Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).