hold_locked_index(): move from lockfile.c to read-cache.c

mhagger · gitster · commit 216aab1e3d8e · 2014-10-01T13:54:31.000-07:00
lockfile.c contains the general API for locking any file. Code
specifically about the index file doesn't belong here.

Signed-off-by: Michael Haggerty &lt;mhagger@alum.mit.edu&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/lockfile.c b/lockfile.c
@@ -340,14 +340,6 @@ int commit_lock_file(struct lock_file *lk)
 	return err;
 }
 
-int hold_locked_index(struct lock_file *lk, int die_on_error)
-{
-	return hold_lock_file_for_update(lk, get_index_file(),
-					 die_on_error
-					 ? LOCK_DIE_ON_ERROR
-					 : 0);
-}
-
 void rollback_lock_file(struct lock_file *lk)
 {
 	if (!lk->active)
diff --git a/read-cache.c b/read-cache.c
@@ -1367,6 +1367,14 @@ static int read_index_extension(struct index_state *istate,
 	return 0;
 }
 
+int hold_locked_index(struct lock_file *lk, int die_on_error)
+{
+	return hold_lock_file_for_update(lk, get_index_file(),
+					 die_on_error
+					 ? LOCK_DIE_ON_ERROR
+					 : 0);
+}
+
 int read_index(struct index_state *istate)
 {
 	return read_index_from(istate, get_index_file());

Original file line number	Diff line number	Diff line change
`@@ -340,14 +340,6 @@ int commit_lock_file(struct lock_file *lk)`
`340`	`340`	`return err;`
`341`	`341`	`}`
`342`	`342`
`343`		`-int hold_locked_index(struct lock_file *lk, int die_on_error)`
`344`		`-{`
`345`		`- return hold_lock_file_for_update(lk, get_index_file(),`
`346`		`- die_on_error`
`347`		`- ? LOCK_DIE_ON_ERROR`
`348`		`- : 0);`
`349`		`-}`
`350`		`-`
`351`	`343`	`void rollback_lock_file(struct lock_file *lk)`
`352`	`344`	`{`
`353`	`345`	`if (!lk->active)`
Original file line number	Diff line number	Diff line change
`@@ -1367,6 +1367,14 @@ static int read_index_extension(struct index_state *istate,`
`1367`	`1367`	`return 0;`
`1368`	`1368`	`}`
`1369`	`1369`
	`1370`	`+int hold_locked_index(struct lock_file *lk, int die_on_error)`
	`1371`	`+{`
	`1372`	`+ return hold_lock_file_for_update(lk, get_index_file(),`
	`1373`	`+ die_on_error`
	`1374`	`+ ? LOCK_DIE_ON_ERROR`
	`1375`	`+ : 0);`
	`1376`	`+}`
	`1377`	`+`
`1370`	`1378`	`int read_index(struct index_state *istate)`
`1371`	`1379`	`{`
`1372`	`1380`	`return read_index_from(istate, get_index_file());`